Remove old patches.

(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)

4 files changed, 7 insertions, 140 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/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()