Remove old and add missing pkgconfig dep, bug 205437

(Portage version: 2.1.4_rc14)

6 files changed, 13 insertions, 109 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/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