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

Package-Manager: portage-2.1.4_rc14

7 files changed, 83 insertions, 31 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/Manifest b/x11-misc/gcolor2/Manifest
index 79da4ba8b4ed..af78df01e6f9 100644
--- a/x11-misc/gcolor2/Manifest
+++ b/x11-misc/gcolor2/Manifest
@@ -1,23 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gcolor2-0.4-amd64.patch 1484 RMD160 6ece617db1254b30b9d5352382a41b73de089e96 SHA1 000905f7b086ac8f7f0a97e49a4e636ad541de80 SHA256 93b3218de6d522017cb2d14cb94cfe523100234a45fe9b46cee2274612887195
 MD5 5791378f6f86dd25a302ad8586292dd6 files/gcolor2-0.4-amd64.patch 1484
 RMD160 6ece617db1254b30b9d5352382a41b73de089e96 files/gcolor2-0.4-amd64.patch 1484
 SHA256 93b3218de6d522017cb2d14cb94cfe523100234a45fe9b46cee2274612887195 files/gcolor2-0.4-amd64.patch 1484
-AUX modular-rgb.patch 784 RMD160 2b6b081b73221c6465265466d484e08a58cbe477 SHA1 e910503a792a02e3361fdb65b458ba05ced95096 SHA256 f6b8ab3fcacef9f494d97bb7cbc3950ed6015b0eb40f5771797c56ffd62a6944
-MD5 f08da6a08e5db946e319122024967035 files/modular-rgb.patch 784
-RMD160 2b6b081b73221c6465265466d484e08a58cbe477 files/modular-rgb.patch 784
-SHA256 f6b8ab3fcacef9f494d97bb7cbc3950ed6015b0eb40f5771797c56ffd62a6944 files/modular-rgb.patch 784
+AUX gcolor2-0.4-pkg-config-macro.patch 240 RMD160 0ffcf18905351249934a8ea706a40c5def32d81f SHA1 33f8942ec57a41bab911a2f6be4cad2d2da08631 SHA256 1b5aaf3ddec8c827738500160765d7602dd974cc8335befa3f6eaf76673edc8d
+MD5 da2037374aabfaeec01d2270ca49c29c files/gcolor2-0.4-pkg-config-macro.patch 240
+RMD160 0ffcf18905351249934a8ea706a40c5def32d81f files/gcolor2-0.4-pkg-config-macro.patch 240
+SHA256 1b5aaf3ddec8c827738500160765d7602dd974cc8335befa3f6eaf76673edc8d files/gcolor2-0.4-pkg-config-macro.patch 240
+AUX modular-rgb.patch 800 RMD160 96b48bdc243f7a1206cfaa5a31625909dd15c1da SHA1 6b219bd38b61c809bd674fdca7ba4120b3fbc456 SHA256 931a56b8f37071d48307f781dd3f164573a913686af3e43bfec1e3530bb5089e
+MD5 9d71c583cba9c03972036d839c694a76 files/modular-rgb.patch 800
+RMD160 96b48bdc243f7a1206cfaa5a31625909dd15c1da files/modular-rgb.patch 800
+SHA256 931a56b8f37071d48307f781dd3f164573a913686af3e43bfec1e3530bb5089e files/modular-rgb.patch 800
 DIST gcolor2-0.4.tar.gz 375217 RMD160 d31dd5d19720a8888be269778d2be6715849c506 SHA1 7cfa173825d486c54a5358b6f41e679d8a2cd5b6 SHA256 89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23
-EBUILD gcolor2-0.4-r2.ebuild 783 RMD160 d7ee548619efd6cca9af7632fc6b9b0c823a1181 SHA1 ba4a44a04e1e313fe097b9449b8d70bf01885465 SHA256 1b1640a974f40e34172c09372dd1afd09b838958a39e8c4d2cfedadbf1b53980
-MD5 2c2123fe87890a9ccd0899b7b977bd41 gcolor2-0.4-r2.ebuild 783
-RMD160 d7ee548619efd6cca9af7632fc6b9b0c823a1181 gcolor2-0.4-r2.ebuild 783
-SHA256 1b1640a974f40e34172c09372dd1afd09b838958a39e8c4d2cfedadbf1b53980 gcolor2-0.4-r2.ebuild 783
-MISC ChangeLog 2846 RMD160 b10bd53c3d28c40e32ade8ff5f6cba9b7a34c2be SHA1 3a187829a51ac642a71220bafcda744aec044ee2 SHA256 8eebbd2b314ff9a13048a4aba93eda5863f2fb5f5dedf0f09d84cdd7d9d69906
-MD5 3fcaf321bdf4ef41cce05a9116f8f434 ChangeLog 2846
-RMD160 b10bd53c3d28c40e32ade8ff5f6cba9b7a34c2be ChangeLog 2846
-SHA256 8eebbd2b314ff9a13048a4aba93eda5863f2fb5f5dedf0f09d84cdd7d9d69906 ChangeLog 2846
+EBUILD gcolor2-0.4-r2.ebuild 779 RMD160 6a3da5a013d85bd854eac8fd58ca9653c60bf226 SHA1 89f80b97bc82160cee0c39cf75f0e9be9e891894 SHA256 46afa1fe88e1fe5e5ef879c0dc019a7b1a5497efe13112ea7dcae8326e5e6c36
+MD5 8830474c71d2dc5f701254f3e7e4b1c3 gcolor2-0.4-r2.ebuild 779
+RMD160 6a3da5a013d85bd854eac8fd58ca9653c60bf226 gcolor2-0.4-r2.ebuild 779
+SHA256 46afa1fe88e1fe5e5ef879c0dc019a7b1a5497efe13112ea7dcae8326e5e6c36 gcolor2-0.4-r2.ebuild 779
+EBUILD gcolor2-0.4-r3.ebuild 856 RMD160 7c4217277fab5a02cccc112179a6f60a52b1e2af SHA1 fc33b9d905f79e41630d2e6a555f411c671df6dc SHA256 83f3c063495eed171255fc4b24826393b012a04000b3dedbf8667081903c27fa
+MD5 53fec2f339716185872d068c6c8af77a gcolor2-0.4-r3.ebuild 856
+RMD160 7c4217277fab5a02cccc112179a6f60a52b1e2af gcolor2-0.4-r3.ebuild 856
+SHA256 83f3c063495eed171255fc4b24826393b012a04000b3dedbf8667081903c27fa gcolor2-0.4-r3.ebuild 856
+MISC ChangeLog 3113 RMD160 427c66253a35dcbb79fbdb8be25ca32b16c2053b SHA1 dfbed1894c7a4d9022bf609394d3f988122f62db SHA256 b835789967e43869b9ed30064bf84fd931911e82d21006595d210a9b8a45d702
+MD5 511eead44ef28e6cd4209a5c8e85cea5 ChangeLog 3113
+RMD160 427c66253a35dcbb79fbdb8be25ca32b16c2053b ChangeLog 3113
+SHA256 b835789967e43869b9ed30064bf84fd931911e82d21006595d210a9b8a45d702 ChangeLog 3113
 MISC metadata.xml 221 RMD160 c95cc10957c55d1612d2bff624c7592212cfeaff SHA1 56bed2e0b9e3aa6a60b73a66c793767865a6e2ef SHA256 894c9d35bceb1db3047970dee6ec54835bbd08d383c6862e086f18321d24bc8f
 MD5 865112d2aa374ac197f9b8591cc421db metadata.xml 221
 RMD160 c95cc10957c55d1612d2bff624c7592212cfeaff metadata.xml 221
@@ -25,10 +30,6 @@ SHA256 894c9d35bceb1db3047970dee6ec54835bbd08d383c6862e086f18321d24bc8f metadata
 MD5 8f89bda67f3b458a38fd9986c991a69e files/digest-gcolor2-0.4-r2 235
 RMD160 992968f659a77feb1497ef30b500c1259b1356ff files/digest-gcolor2-0.4-r2 235
 SHA256 173d193cecfa1d9c3596b12b340a71a0a8108a9fc0126191550413226f002dc1 files/digest-gcolor2-0.4-r2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGpgcTomPajV0RnrERAkGJAJ9I+IfWw9ttQebEwqCT4jLPRwt7tQCdHeQJ
-NwMCFxWw3RR0C2jxaRGrch0=
-=LOyj
------END PGP SIGNATURE-----
+MD5 8f89bda67f3b458a38fd9986c991a69e files/digest-gcolor2-0.4-r3 235
+RMD160 992968f659a77feb1497ef30b500c1259b1356ff files/digest-gcolor2-0.4-r3 235
+SHA256 173d193cecfa1d9c3596b12b340a71a0a8108a9fc0126191550413226f002dc1 files/digest-gcolor2-0.4-r3 235
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
+}