Remove old and add missing pkgconfig dep, bug 205437

Package-Manager: portage-2.1.4_rc14

7 files changed, 31 insertions, 133 deletions

diff --git a/net-misc/grdesktop/ChangeLog b/net-misc/grdesktop/ChangeLog
index 0d8701a60841..95f3d4d48e9f 100644
--- a/net-misc/grdesktop/ChangeLog
+++ b/net-misc/grdesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/grdesktop
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/ChangeLog,v 1.24 2007/07/04 14:10:36 uberlord Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/ChangeLog,v 1.25 2008/01/12 13:22:18 leio Exp $
+
+  12 Jan 2008; Mart Raudsepp <leio@gentoo.org>
+  -files/0010_all_0.22-remove-double-makefile-syntax.patch,
+  -files/grdesktop-0.22-gcc2_fix.patch, -grdesktop-0.22-r1.ebuild,
+  grdesktop-0.23.ebuild:
+  Remove old and add missing pkgconfig dep, bug 205437
 
   04 Jul 2007; Roy Marples <uberlord@gentoo.org> grdesktop-0.23.ebuild:
   Added ~x86-fbsd keyword.
diff --git a/net-misc/grdesktop/Manifest b/net-misc/grdesktop/Manifest
index 29f4c6333cae..8a13eca8c44f 100644
--- a/net-misc/grdesktop/Manifest
+++ b/net-misc/grdesktop/Manifest
@@ -1,32 +1,26 @@
-AUX 0010_all_0.22-remove-double-makefile-syntax.patch 850 RMD160 b3fbdee62c3bd3a12ddedfe1bd1f0d7cfc7cd9cd SHA1 015fa20f3b21ecbfad9f0f8b5a120ff92c5e310b SHA256 18d175eb449feca6a68d61ea773639d08c6aa6f232ca7dbc644796fb02fe05ab
-MD5 c2269043464e0708e27a660f20f2ce66 files/0010_all_0.22-remove-double-makefile-syntax.patch 850
-RMD160 b3fbdee62c3bd3a12ddedfe1bd1f0d7cfc7cd9cd files/0010_all_0.22-remove-double-makefile-syntax.patch 850
-SHA256 18d175eb449feca6a68d61ea773639d08c6aa6f232ca7dbc644796fb02fe05ab files/0010_all_0.22-remove-double-makefile-syntax.patch 850
-AUX grdesktop-0.22-gcc2_fix.patch 681 RMD160 0f6a83777f38f1432fdcb0e6e1f10dcacab80038 SHA1 6527adb550a1514b7fa25d41598bfada461466da SHA256 d3c7a0334484ca4e1c6afd0af36553e454c809d06357c22d98d0b8202e75e560
-MD5 806d5e8650998f026e38540b9ba5b4d8 files/grdesktop-0.22-gcc2_fix.patch 681
-RMD160 0f6a83777f38f1432fdcb0e6e1f10dcacab80038 files/grdesktop-0.22-gcc2_fix.patch 681
-SHA256 d3c7a0334484ca4e1c6afd0af36553e454c809d06357c22d98d0b8202e75e560 files/grdesktop-0.22-gcc2_fix.patch 681
-DIST grdesktop-0.22.tar.gz 428426 RMD160 74fe4decafbaa054cdf16200987037d2da043e79 SHA1 14890fdb7eba19c31f49a4f4fabca82cff997fbd SHA256 6b7d62f67a552b6cc82cf2e9b624c45445092c4930ec9bf873fafd0c2a481663
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST grdesktop-0.23.tar.gz 299914 RMD160 ba24a040cfa0bc80161ad59f9c4b982fc1335c3d SHA1 99f3110212a7594bd60c6f9d05bb8afb8e0588f1 SHA256 a94632ed42273d280ad4f8eec6a803024666ed5c8737ae34585c2d9d2eed5193
-EBUILD grdesktop-0.22-r1.ebuild 1360 RMD160 1fbc869b2d065eaf0e932f30bcf0d56e544f09d8 SHA1 750ed789038ca839abe57e1963361e0719ca4782 SHA256 51a85b0d85ef6edd76e5057b5212c59c9b84a8b03ecdcf7e88b22ecadc6228a2
-MD5 5832cee89c7070bc57748873cff343d6 grdesktop-0.22-r1.ebuild 1360
-RMD160 1fbc869b2d065eaf0e932f30bcf0d56e544f09d8 grdesktop-0.22-r1.ebuild 1360
-SHA256 51a85b0d85ef6edd76e5057b5212c59c9b84a8b03ecdcf7e88b22ecadc6228a2 grdesktop-0.22-r1.ebuild 1360
-EBUILD grdesktop-0.23.ebuild 887 RMD160 43f9b148a8a492341469164586134d4cf070a08c SHA1 8a5af2f5b1c2c55d3188b1fb9ce1e40722bffbb9 SHA256 ba9f4db3f0dd1f0edfd76ac3888d9be4b929df4217a5166cd4dcb1d0db6c84f0
-MD5 2f0607c635c8f0aa6ff81483b85ecb41 grdesktop-0.23.ebuild 887
-RMD160 43f9b148a8a492341469164586134d4cf070a08c grdesktop-0.23.ebuild 887
-SHA256 ba9f4db3f0dd1f0edfd76ac3888d9be4b929df4217a5166cd4dcb1d0db6c84f0 grdesktop-0.23.ebuild 887
-MISC ChangeLog 3216 RMD160 7c0df667a6c5d52b4e8fbe513f3e4c87a1dd75b3 SHA1 babfe4fdb27e7e939e712ddf97a5b9c752ac98e9 SHA256 f5ec8c11d6972001efd5aa81cc76fb9d4dd1634f8b76bb076934b1c0c062226e
-MD5 9b8a1a66f7761a5425914d4eb77c2b7a ChangeLog 3216
-RMD160 7c0df667a6c5d52b4e8fbe513f3e4c87a1dd75b3 ChangeLog 3216
-SHA256 f5ec8c11d6972001efd5aa81cc76fb9d4dd1634f8b76bb076934b1c0c062226e ChangeLog 3216
+EBUILD grdesktop-0.23.ebuild 912 RMD160 0577691bd454062c2d475f91b14236711f6450ee SHA1 594c6ab8fbcd312db4de9d6d2f2359b92eeef7e1 SHA256 758f1a9443cfef3970ce306e259f48f3ed98fe00b78cda04f2382bb829aa0101
+MD5 5e31764a1abdde9708fc4c9f5d2ace02 grdesktop-0.23.ebuild 912
+RMD160 0577691bd454062c2d475f91b14236711f6450ee grdesktop-0.23.ebuild 912
+SHA256 758f1a9443cfef3970ce306e259f48f3ed98fe00b78cda04f2382bb829aa0101 grdesktop-0.23.ebuild 912
+MISC ChangeLog 3467 RMD160 d66f5503959fce9db02886565e27eafbc6151a44 SHA1 6f1f005ba538e14d44e024b1d8a57e87cbbf8c2b SHA256 b2308696c33b41b4d96894811c5012d12fa51df3ea831d67ebc78050a5b5836d
+MD5 59a379211f360d8dddd4a9f57cc9c06d ChangeLog 3467
+RMD160 d66f5503959fce9db02886565e27eafbc6151a44 ChangeLog 3467
+SHA256 b2308696c33b41b4d96894811c5012d12fa51df3ea831d67ebc78050a5b5836d ChangeLog 3467
 MISC metadata.xml 338 RMD160 84acc21e8b48386f337c6adeb6c03a9ba36206ea SHA1 0f7d96b98c69d2a200bc999cea0087778fc90e94 SHA256 f4b4c5bb070919f651e9f0b434689802572105410da9330048c96f13120e7bfc
 MD5 e308adbcd0595135a036d6ff373eff59 metadata.xml 338
 RMD160 84acc21e8b48386f337c6adeb6c03a9ba36206ea metadata.xml 338
 SHA256 f4b4c5bb070919f651e9f0b434689802572105410da9330048c96f13120e7bfc metadata.xml 338
-MD5 a26b1cc614e788ecf24c325ff490afa8 files/digest-grdesktop-0.22-r1 244
-RMD160 064b3a6af1c0def3d5a92cc309e4307140eb3982 files/digest-grdesktop-0.22-r1 244
-SHA256 c3f8b2b34b22ca8bda5350af5486246769cd7f960261128fcb5adf77b9374320 files/digest-grdesktop-0.22-r1 244
 MD5 24f234cd98fed2022c54bc4966e039f4 files/digest-grdesktop-0.23 244
 RMD160 ce5dfc37b4b5fca2ef7871ae80fba53ac6b9b33a files/digest-grdesktop-0.23 244
 SHA256 14dcb2c99d2baaaa3cccf1a64d04464a5a29900a9090bc1501e47251a3c8fd9e files/digest-grdesktop-0.23 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkeIvnAACgkQkeYb6olFHJfgVQCfaWaghaWgqubPtOc2AJTKVyEs
+hBMAn00zwlAB+3mHao0iddDTBeAGsY5p
+=c3lw
+-----END PGP SIGNATURE-----
diff --git a/net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch b/net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch
deleted file mode 100644
index 80db80afe006..000000000000
--- a/net-misc/grdesktop/files/0010_all_0.22-remove-double-makefile-syntax.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- help/C/Makefile.old	2004-02-22 11:07:30.758697592 +1100
-+++ help/C/Makefile	2004-02-22 11:07:43.102821000 +1100
-@@ -368,22 +368,6 @@
- 	done
- 	-rmdir $(DESTDIR)$(docdir)
- 
--omf_timestamp: $(omffile)
--	-for file in $(omffile); do \
--		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
--	done
--	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
--	done
--	touch omf_timestamp
--
--install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
--	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
--	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
--
- dist-hook: app-dist-hook
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net-misc/grdesktop/files/digest-grdesktop-0.22-r1 b/net-misc/grdesktop/files/digest-grdesktop-0.22-r1
deleted file mode 100644
index a31057e476cc..000000000000
--- a/net-misc/grdesktop/files/digest-grdesktop-0.22-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6fa64e007e2b26bfe96e2516c0d6ddf4 grdesktop-0.22.tar.gz 428426
-RMD160 74fe4decafbaa054cdf16200987037d2da043e79 grdesktop-0.22.tar.gz 428426
-SHA256 6b7d62f67a552b6cc82cf2e9b624c45445092c4930ec9bf873fafd0c2a481663 grdesktop-0.22.tar.gz 428426
diff --git a/net-misc/grdesktop/files/grdesktop-0.22-gcc2_fix.patch b/net-misc/grdesktop/files/grdesktop-0.22-gcc2_fix.patch
deleted file mode 100644
index 12a37719956b..000000000000
--- a/net-misc/grdesktop/files/grdesktop-0.22-gcc2_fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -NurdB grdesktop-0.22-orig/src/options.c grdesktop-0.22/src/options.c
---- grdesktop-0.22-orig/src/options.c	2004-06-08 23:27:14 -0500
-+++ grdesktop-0.22/src/options.c	2004-06-08 23:27:42 -0500
-@@ -487,6 +487,7 @@
- 
- 		while((entry = readdir(licence_dir)) != NULL) {
- 			gchar *fullname = NULL;
-+			char *hostname;
- 			struct stat sts;
- 
- 			fullname = g_strdup_printf("%s/%s", licence_path,
-@@ -500,7 +501,7 @@
- 			if(strlen(entry->d_name) <= strlen(prefix))
- 				continue;
- 
--			gchar *hostname = &entry->d_name[strlen(prefix)];
-+			hostname = &entry->d_name[strlen(prefix)];
- 			licence_list = g_list_append(licence_list, g_strdup(hostname));
- 		}
- 		closedir(licence_dir);
diff --git a/net-misc/grdesktop/grdesktop-0.22-r1.ebuild b/net-misc/grdesktop/grdesktop-0.22-r1.ebuild
deleted file mode 100644
index 9c3a42a64a93..000000000000
--- a/net-misc/grdesktop/grdesktop-0.22-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.22-r1.ebuild,v 1.9 2006/03/16 13:08:31 allanonjl Exp $
-
-inherit eutils
-
-DESCRIPTION="Gtk2 frontend for rdesktop"
-HOMEPAGE="http://www.nongnu.org/grdesktop/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc amd64"
-
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.0.6-r3
-	>=net-misc/rdesktop-1.1.0.19.9.0
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/gconf-2"
-
-DEPEND="${RDEPEND}
-	doc? ( app-text/docbook2X )
-	app-text/scrollkeeper"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# Fix invalid C code that breaks compilation under gcc 2.
-	epatch ${FILESDIR}/${P}-gcc2_fix.patch
-
-	# Correct icon path. See bug #50295.
-	sed -i -e 's:Icon=.*:Icon=grdesktop/icon.png:' grdesktop.desktop
-
-	gnome2_omf_fix
-}
-
-src_compile() {
-	econf \
-	    --with-keymap-path=/usr/share/rdesktop/keymaps \
-		--localstatedir=${D}/var/lib || die "./configure failed"
-
-	# For some reason we have duplicate syntax in Makefiles, removing
-	epatch ${FILESDIR}/0010_all_0.22-remove-double-makefile-syntax.patch
-
-	emake || die
-}
-
-src_install() {
-	#einstall
-	make DESTDIR=${D} install || die "couldnt install"
-
-	dodoc AUTHORS ABOUT-NLS COPYING ChangeLog INSTALL NEWS README TODO
-}
diff --git a/net-misc/grdesktop/grdesktop-0.23.ebuild b/net-misc/grdesktop/grdesktop-0.23.ebuild
index 2c2ad77f47f1..7f4729155e31 100644
--- a/net-misc/grdesktop/grdesktop-0.23.ebuild
+++ b/net-misc/grdesktop/grdesktop-0.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.23.ebuild,v 1.9 2007/07/04 14:10:36 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/grdesktop/grdesktop-0.23.ebuild,v 1.10 2008/01/12 13:22:18 leio Exp $
 
 inherit eutils gnome2
 
@@ -20,7 +20,8 @@ RDEPEND=">=x11-libs/gtk+-2
 	>=gnome-base/gconf-2"
 
 DEPEND="${RDEPEND}
-	app-text/scrollkeeper"
+	app-text/scrollkeeper
+	>=dev-util/pkgconfig-0.9"
 
 G2CONF="${G2CONF} --with-keymap-path=/usr/share/rdesktop/keymaps/"
 
@@ -28,7 +29,7 @@ docs="AUTHORS ChangeLog NEWS README TODO"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Correct icon path. See bug #50295.
 	sed -i -e 's:Icon=.*:Icon=grdesktop/icon.png:' grdesktop.desktop