x11-misc/gcolor2: add patch to fix missing pkg-config macro (should fix bug #204598)

(Portage version: 2.1.4_rc14)

6 files changed, 60 insertions, 9 deletions

diff --git a/x11-misc/gcolor2/ChangeLog b/x11-misc/gcolor2/ChangeLog
index 8d9aec9e9bd2..f9b09751cc8d 100644
--- a/x11-misc/gcolor2/ChangeLog
+++ b/x11-misc/gcolor2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/gcolor2
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.22 2007/07/24 14:04:35 dang Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.23 2008/01/08 09:11:39 remi Exp $
+
+*gcolor2-0.4-r3 (08 Jan 2008)
+
+  08 Jan 2008; Rémi Cardona <remi@gentoo.org>
+  +files/gcolor2-0.4-pkg-config-macro.patch, files/modular-rgb.patch,
+  gcolor2-0.4-r2.ebuild, +gcolor2-0.4-r3.ebuild:
+  add patch to fix missing pkg-config macro (should fix bug #204598)
 
   24 Jul 2007; Daniel Gryniewicz <dang@gentoo.org> gcolor2-0.4-r2.ebuild:
   Marked stable on amd64 for bug #186470
diff --git a/x11-misc/gcolor2/files/digest-gcolor2-0.4-r3 b/x11-misc/gcolor2/files/digest-gcolor2-0.4-r3
new file mode 100644
index 000000000000..ddb4af16f5d6
--- /dev/null
+++ b/x11-misc/gcolor2/files/digest-gcolor2-0.4-r3
@@ -0,0 +1,3 @@
+MD5 02de9d925ad5921522685f402caec3ec gcolor2-0.4.tar.gz 375217
+RMD160 d31dd5d19720a8888be269778d2be6715849c506 gcolor2-0.4.tar.gz 375217
+SHA256 89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23 gcolor2-0.4.tar.gz 375217
diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
new file mode 100644
index 000000000000..ee904746f147
--- /dev/null
+++ b/x11-misc/gcolor2/files/gcolor2-0.4-pkg-config-macro.patch
@@ -0,0 +1,10 @@
+--- configure.ac.old	2008-01-08 09:36:24.000000000 +0100
++++ configure.ac	2008-01-08 09:37:06.000000000 +0100
+@@ -26,6 +26,7 @@
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ AC_PROG_INTLTOOL([0.27])
++PKG_PROG_PKG_CONFIG
+ 
+ 
+ GETTEXT_PACKAGE=gcolor2
diff --git a/x11-misc/gcolor2/files/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch
index d7a1e7a6e24b..eec5668c2bc7 100644
--- a/x11-misc/gcolor2/files/modular-rgb.patch
+++ b/x11-misc/gcolor2/files/modular-rgb.patch
@@ -1,5 +1,5 @@
---- callbacks.h.orig	2006-01-10 21:26:19.000000000 -0500
-+++ callbacks.h	2006-01-10 21:26:44.000000000 -0500
+--- src/callbacks.h.orig	2006-01-10 21:26:19.000000000 -0500
++++ src/callbacks.h	2006-01-10 21:26:44.000000000 -0500
 @@ -12,6 +12,7 @@
  #define SYSTEM_FILE_2      "/usr/lib/X11/rgb.txt"
  #define SYSTEM_FILE_3      "/etc/X11/rgb.txt"
@@ -8,8 +8,8 @@
  
  /* about dialog text */
  #define ABOUT_CREDITS_TEXT "Developer:\n" \
---- main.c.orig	2006-01-10 21:43:20.000000000 -0500
-+++ main.c	2006-01-10 21:42:14.000000000 -0500
+--- src/main.c.orig	2006-01-10 21:43:20.000000000 -0500
++++ src/main.c	2006-01-10 21:42:14.000000000 -0500
 @@ -36,6 +36,8 @@
  		sys_filename = SYSTEM_FILE_3;
  	else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS))
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild
index be7c41bc4214..39348dd6ef01 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r2.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/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild,v 1.7 2007/07/24 14:04:35 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild,v 1.8 2008/01/08 09:11:39 remi Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ DEPEND=">=x11-libs/gtk+-2.4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd ${S}
 	epatch ${FILESDIR}/modular-rgb.patch
 	epatch ${FILESDIR}/${P}-amd64.patch
 }
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r3.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r3.ebuild
new file mode 100644
index 000000000000..d2ff8c874dac
--- /dev/null
+++ b/x11-misc/gcolor2/gcolor2-0.4-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/gcolor2-0.4-r3.ebuild,v 1.1 2008/01/08 09:11:39 remi Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A simple GTK+2 color selector."
+HOMEPAGE="http://gcolor2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2.4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/modular-rgb.patch"
+	epatch "${FILESDIR}/${P}-amd64.patch"
+	epatch "${FILESDIR}/${P}-pkg-config-macro.patch"
+	eautoreconf
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc INSTALL AUTHORS
+	make_desktop_entry gcolor2 gcolor2 /usr/share/pixmaps/gcolor2/icon.png Graphics
+}