Remove old patches.

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

5 files changed, 11 insertions, 147 deletions

diff --git a/net-misc/remmina/ChangeLog b/net-misc/remmina/ChangeLog
index b2f4ddb55887..9d0d3f2de3d1 100644
--- a/net-misc/remmina/ChangeLog
+++ b/net-misc/remmina/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/remmina
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.40 2012/10/12 22:16:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/remmina/ChangeLog,v 1.41 2012/10/12 22:17:57 floppym Exp $
+
+  12 Oct 2012; Mike Gilbert <floppym@gentoo.org>
+  -files/remmina-1.0.0-desktop-file.patch,
+  -files/remmina-1.0.0-fix-desktop-file.patch,
+  -files/remmina-1.0.0-optional-gnome-keyring.patch:
+  Remove old patches.
 
   12 Oct 2012; Mike Gilbert <floppym@gentoo.org>
   +files/remmina-1.0.0_p20121004-avahi.patch, remmina-1.0.0_p20121004.ebuild:
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 19b1666d04cd..4b2661866346 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX remmina-1.0.0-desktop-file.patch 1514 SHA256 446fc318eb99a927ae0747e13aae8125ceb8ed449bef7eec6bae9c5972a97195 SHA512 0691f93ec68cd25c84dc31314a022e8e213361819b45b8c6d37fd65088db7f7203bbb7d79277f6fbc6573d7982587074a1f82ea6458c2c158e4ffab10b0fd3f9 WHIRLPOOL d86b656449e40be0d1981ea42d91434d8533bf7c88b1776c843736604069200a9a10dcc02a3a7a7705f264f2e858a006fe67f1c0afe90983e9c20b4426ad4a04
-AUX remmina-1.0.0-fix-desktop-file.patch 1621 SHA256 5b90530dda689c553af151cfacc2a415c695a80a7c6e0d060d9af3a713dc9997 SHA512 339b866a44f8800d1dfdeb057ec764074e6e74d00e5d3e004071095e0b72531c8de83234a81a0784b62f7307bf5fd5b16e57a210648eb33eaccb6d77f033f750 WHIRLPOOL b102327cab6cf262fe629fcd0864dcc89c9f740bb10479f041986d84f097438e1182836a563fe9bd87c96343a2fcbdc9f373a501a7a457da417adc709eb3c58a
-AUX remmina-1.0.0-optional-gnome-keyring.patch 1645 SHA256 79caf815eac40c9e015228707bb2d20db82330b61efdaa3c91e26e04440e8e64 SHA512 58fc48d1e5604221cd79f50234b7d8a706bef912653772aa70520187207fe091583d2058c6ee66007b677b0cea0b1ea27307ae42dd5b2827f84f6ecb24dff4d2 WHIRLPOOL 369173ef489dc7d313cafe893bb2540e4f1ea55fb031ae6d2c44676fcdb23635cc00069bb2ae0a064f8876082865bcbc0417c2bdfbf8bbc9b66ce9012ce1375f
 AUX remmina-1.0.0_p20121004-avahi.patch 2446 SHA256 78cbbc86a21d4f4a0becd6a607e49bf96c10e61881059c4b3ada331b1fa49c99 SHA512 2f7494d408a94b2257d49044415041d977e24d973871d5d37a42ca117799692b6794da7e407245c5fe89372fb33e499449a81ab89b880d00d375be2eee00cd15 WHIRLPOOL 0d624b2b931b4f73b59f00c2629afac33c37b3d442321ab94cfdf2594da92593ee32e424863c485cb2129a56828911cb516167656fcd6d0692aa250c161e62ab
 DIST remmina-1.0.0_p20120309.tar.gz 404797 SHA256 43ce0de9f521aedd1b6b26ff6914de827a6ad4fcef82c4d9c3ed86ed9fd8c9ae SHA512 6f1f13916e1aa1350a29ca4bed9dc289ca5307b6a6e45851f25446531d257ae6fcf3fa1f663305b6a3896ed9a137777e68e4adb67ec6730e8c0d4d55fb93979a WHIRLPOOL d47f99f1ae95bfef7ec2b38b6f434832f6fd4933187599f7a5c3bc75df0ce34d02b1b78c2bdad68abc418c3fa35c8dfa4b07b433f15a85b124098300932e3c4c
 DIST remmina-1.0.0_p20121004.tar.gz 384461 SHA256 d720546440152efd276944f53e9a275b202d521c37d150758c5a3ec1590b89bc SHA512 3b5cf29207a1adfe054b95d6af6cd861c82c171e7abcbe832243f37593508e648d04401e3c8fbcc06f1cf53ce0c3adde1f1bf555de3221a5ae27c1c18a05a7d4 WHIRLPOOL 7114f6fa46b6489575e3a3073c524d8153b5bdc0685196d312eac7d8f0590f3e0e752c67c2c799f485b6c93e651cf32eb7043d04375f1626cab824bc959dd59b
 EBUILD remmina-1.0.0_p20120309.ebuild 1872 SHA256 aa73d9520ce26128a691e8b6f330d0c5c20d08d42787bd2c8dbe82b1842c9e3b SHA512 5e6bdd83c5374e4bc385ae0b1d1056c0c29fd4c3325183eff281729c77dd43f2452d5da0838efab3d5f727ea55a3ba99c3bc3394ae51e8b80b08b4de1fa94238 WHIRLPOOL ab550e8a885b27a5e16241608f3a3e96de22f50fa72a026aab36cb5b2bd4935aadaf035115aba0f42953f23ae21294307c2ecc879f26ba7075593fdcae578000
 EBUILD remmina-1.0.0_p20121004.ebuild 1959 SHA256 3d76f49b456fb92bd406dd4dcc59f98ffe6eb0d95f971fdcd5368d36281526c1 SHA512 acd203b2ac12aa3b64f02fefeeb946cfdf4e851abf7707e96f249ff39152d332db75a20729c22a2fafc9ceb896796e3ae5b7dcc4ea520994208d6bccf73c8616 WHIRLPOOL 5428904c63fb205ef00b31b0c340c93b4bc31d67d288e0b355195f2623ef2ca4a7615d6e886754b8740adf8708b4a44e4f2be7c389b345b71edccd0e1f8ce36a
 EBUILD remmina-9999.ebuild 1906 SHA256 046e7c84e794aac72b91b4b49b43ea5954464921545b404d1230e72c8321519a SHA512 34cbf93aef79333c6f3faf9392f368b46c37f51d9382b4ac57f13edd92d2ed3bd111552887b95e832bcf308e470a99e4c93bfb70b26d3f85d6f3e5e164cb58e6 WHIRLPOOL 4876c9a7a6160819a4e05ce12d1bf65a11ea41a8db197b718ae987a33caf46932bf08242e22ffbbd53a0b64a2474883f4e87722f532d9f505f439e2485980665
-MISC ChangeLog 6257 SHA256 6cb6b85932938297f5d757141d5ddb569666db45ccb0b87d28a38c09100165ca SHA512 9aefdf4e8ed6e67033d0f64d92b431151866613414b7c84ab0793843876ea399a23d26e1fdec8496e53dba865ebe003ed35221421018018f44e2fd84fafdf886 WHIRLPOOL 83e3bd5ed8a088a323713ada810f0a3a6e72b47065988b542335ead2b79dbb4ea73bd4dfa8df93b0fee2009ab20c2bde0e3585450caad87d91e114a66623fa4b
+MISC ChangeLog 6472 SHA256 ac2055a533bd55bb02bdb626d55390eb7fe131750881a274e186321db924dc13 SHA512 280fc182c33db3459014490a79c4575dcdaddcb4f40730c337263455f3ba29edf1246cc6dcd840563ef152831bebf3603e7d0d0f8c3bfcf4a03707ee8918ef84 WHIRLPOOL 8a15e622512105412ffff343549613674d8823788d899de4d12a883e074d55d2a3a08c8c8541407f0b4c942c5dc66035f8c968562eadbffa964db5c6501e8b53
 MISC metadata.xml 645 SHA256 25fa738d8c30d64d61ce72cde08753960a3937b232d6cb37c28fd1bd31571765 SHA512 46d51f48bd5bece7999a1b173caf6a7b19cccdc977ce5025ab382d94533c97ed14c0cd40294fe58606545d2e10c729110ddc736197c4d646797b3dfce21b366c WHIRLPOOL 39bf8821e050c622dc4c0b226e304506f2b988373634285b512e325cfdc05f1ea0852da0a95b48bdf9388b6fddeb3c6b818e5ec0d5d7a8da859c056eb705f9f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB4ltUACgkQC77qH+pIQ6Sx+AD+PI7STU5GI2Fyh7xx4c5roOTh
-hpd/+DuownhP3Fwhj7kBAJH/yuzuAcysHhjerZNt1K67qP7adlanz8UfyrQPHc6f
-=oeq7
+iF4EAREIAAYFAlB4lxYACgkQC77qH+pIQ6TnBwD+OAJI4uxeoFWF+S2Z3AZgEjCV
+4OQDsWVr0wwv9j0pliEA/3eOUCz/Uu/6CHurzKYfDsPukuq2axP0oHNztOX4HEXh
+=Coq9
 -----END PGP SIGNATURE-----
diff --git a/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch b/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch
deleted file mode 100644
index e684f420413f..000000000000
--- a/net-misc/remmina/files/remmina-1.0.0-desktop-file.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit 569d9bb702d06c061dfbbf3c590d57ea83a04369
-Author: Jeremy Bicha <jbicha@ubuntu.com>
-Date:   Sat Feb 11 22:48:36 2012 -0500
-
-    remmina: install .desktop file
-
-diff --git a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt
-index c528fc5..f3b7cee 100644
---- a/remmina/desktop/CMakeLists.txt
-+++ b/remmina/desktop/CMakeLists.txt
-@@ -38,3 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION ${ICON32_DIR})
- install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR})
- install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
- 
-+install(FILES remmina.desktop DESTINATION share/applications/remmina.desktop)
-diff --git a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop
-new file mode 100644
-index 0000000..a1f6443
---- /dev/null
-+++ b/remmina/desktop/remmina.desktop
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+Version=1.0
-+_Name=Remmina Remote Desktop Client
-+_Comment=Connect to remote desktops
-+TryExec=remmina
-+Exec=remmina
-+Icon=remmina
-+Terminal=false
-+Type=Application
-+Actions=
-+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
-+
-diff --git a/remmina/desktop/remmina.desktop.in b/remmina/desktop/remmina.desktop.in
-deleted file mode 100644
-index a1f6443..0000000
---- a/remmina/desktop/remmina.desktop.in
-+++ /dev/null
-@@ -1,12 +0,0 @@
--[Desktop Entry]
--Version=1.0
--_Name=Remmina Remote Desktop Client
--_Comment=Connect to remote desktops
--TryExec=remmina
--Exec=remmina
--Icon=remmina
--Terminal=false
--Type=Application
--Actions=
--Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
--
diff --git a/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch b/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch
deleted file mode 100644
index 50d8c83313f8..000000000000
--- a/net-misc/remmina/files/remmina-1.0.0-fix-desktop-file.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit f7d1038ba358a295fb46c681db5c47e4ead97306
-Author: Mike Gilbert <floppym@gentoo.org>
-Date:   Wed Feb 15 13:36:06 2012 -0500
-
-    Fix installation of desktop file and related icons.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 465e905..13e82d1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -78,7 +78,7 @@ include_directories(.)
- include_directories(remmina/include)
- 
- set(REMMINA_VERSION "0.9.99.1")
--set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share/remmina")
-+set(REMMINA_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
- set(REMMINA_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
- set(REMMINA_PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/remmina/plugins")
- 
-diff --git a/remmina/desktop/CMakeLists.txt b/remmina/desktop/CMakeLists.txt
-index f3b7cee..103b090 100644
---- a/remmina/desktop/CMakeLists.txt
-+++ b/remmina/desktop/CMakeLists.txt
-@@ -38,4 +38,4 @@ install(FILES ${ICON32_DATA} DESTINATION ${ICON32_DIR})
- install(FILES ${ICON48_DATA} DESTINATION ${ICON48_DIR})
- install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR})
- 
--install(FILES remmina.desktop DESTINATION share/applications/remmina.desktop)
-+install(FILES remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications")
-diff --git a/remmina/desktop/remmina.desktop b/remmina/desktop/remmina.desktop
-index a1f6443..3136316 100644
---- a/remmina/desktop/remmina.desktop
-+++ b/remmina/desktop/remmina.desktop
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Version=1.0
--_Name=Remmina Remote Desktop Client
--_Comment=Connect to remote desktops
-+Name=Remmina Remote Desktop Client
-+Comment=Connect to remote desktops
- TryExec=remmina
- Exec=remmina
- Icon=remmina
diff --git a/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch b/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch
deleted file mode 100644
index 2dcc655fb13f..000000000000
--- a/net-misc/remmina/files/remmina-1.0.0-optional-gnome-keyring.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit 16e255b047e140fca29fea192792d9f3b639a607
-Author: Mike Gilbert <floppym@gentoo.org>
-Date:   Fri Feb 17 00:41:12 2012 -0500
-
-    Make Gnome Keyring an optional dependency.
-
-diff --git a/remmina-plugins-gnome/CMakeLists.txt b/remmina-plugins-gnome/CMakeLists.txt
-index a631063..4f3ce61 100644
---- a/remmina-plugins-gnome/CMakeLists.txt
-+++ b/remmina-plugins-gnome/CMakeLists.txt
-@@ -17,21 +17,20 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, 
- # Boston, MA 02111-1307, USA.
- 
--set(REMMINA_PLUGINS_GNOME_SRCS
--	src/gkeyring_plugin.c
--	)
-+find_suggested_package(GNOMEKEYRING)
-+if(GNOMEKEYRING_FOUND)
-+	set(REMMINA_PLUGINS_GNOME_SRCS
-+		src/gkeyring_plugin.c
-+		)
- 
--add_library(remmina-plugins-gnome ${REMMINA_PLUGINS_GNOME_SRCS})
--set_target_properties(remmina-plugins-gnome PROPERTIES PREFIX "")
-+	add_library(remmina-plugins-gnome ${REMMINA_PLUGINS_GNOME_SRCS})
-+	set_target_properties(remmina-plugins-gnome PROPERTIES PREFIX "")
- 
--include_directories(${GTK_INCLUDE_DIRS})
--target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS})
-+	include_directories(${GTK_INCLUDE_DIRS})
-+	target_link_libraries(remmina-plugins-gnome ${GTK_LIBRARY_DIRS})
- 
--find_required_package(GNOMEKEYRING)
--if(GNOMEKEYRING_FOUND)
--	include_directories(${GNOMEKEYRING_INCLUDE_DIRS})
--	target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES})
--endif()
--
--install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR})
-+		include_directories(${GNOMEKEYRING_INCLUDE_DIRS})
-+		target_link_libraries(remmina-plugins-gnome ${GNOMEKEYRING_LIBRARIES})
- 
-+	install(TARGETS remmina-plugins-gnome DESTINATION ${REMMINA_PLUGINDIR})
-+endif()