From: Christian Faulhammer Date: Sat, 18 Nov 2006 12:32:47 +0000 (+0000) Subject: ready for modular X.org server, see bug #118604 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=36d4f07280afff7628871cd581fc8df4378c2b11;p=gentoo.git ready for modular X.org server, see bug #118604 Package-Manager: portage-2.1.1-r2 --- diff --git a/x11-misc/gcolor2/ChangeLog b/x11-misc/gcolor2/ChangeLog index 29b01282fa07..1a7e9815e3f3 100644 --- a/x11-misc/gcolor2/ChangeLog +++ b/x11-misc/gcolor2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-misc/gcolor2 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.14 2006/10/14 16:44:43 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.15 2006/11/18 12:32:47 opfer Exp $ + +*gcolor2-0.4-r2 (18 Nov 2006) + + 18 Nov 2006; Christian Faulhammer + +files/modular-rgb.patch, +gcolor2-0.4-r2.ebuild: + ready for modular X.org server, see bug #118604 14 Oct 2006; Krzysiek Pawlik -gcolor2-0.3.ebuild: Remove old version. diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest index 5ca6be339dd5..0f144d738919 100644 --- a/x11-misc/gcolor2/Manifest +++ b/x11-misc/gcolor2/Manifest @@ -1,15 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +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 DIST gcolor2-0.4.tar.gz 375217 RMD160 d31dd5d19720a8888be269778d2be6715849c506 SHA1 7cfa173825d486c54a5358b6f41e679d8a2cd5b6 SHA256 89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23 EBUILD gcolor2-0.4-r1.ebuild 650 RMD160 14447b388924411e03dbf5abecddf979659f8d95 SHA1 6e1b5ffc4ce5d23ac9efb76e3381b513d3140343 SHA256 b221ff991228be46a33364056c0bc7ce068513ae5981c23995c774dc6c04520f MD5 cfbb6684d1129df23d45bdc28d87a49f gcolor2-0.4-r1.ebuild 650 RMD160 14447b388924411e03dbf5abecddf979659f8d95 gcolor2-0.4-r1.ebuild 650 SHA256 b221ff991228be46a33364056c0bc7ce068513ae5981c23995c774dc6c04520f gcolor2-0.4-r1.ebuild 650 -MISC ChangeLog 1844 RMD160 9f107d163594569f1dab268f5ba7bf27d9f9847d SHA1 29128a8ad3844228f2ffaae9c3b44b6957e08042 SHA256 0c5962692e3883a024fc511cd29ed234b45c65de6915e1e85a92e70a67f25fac -MD5 d0c0e2b57902c679551a449a6e1ad29e ChangeLog 1844 -RMD160 9f107d163594569f1dab268f5ba7bf27d9f9847d ChangeLog 1844 -SHA256 0c5962692e3883a024fc511cd29ed234b45c65de6915e1e85a92e70a67f25fac ChangeLog 1844 +EBUILD gcolor2-0.4-r2.ebuild 734 RMD160 2780cb32700cef11151979c0d1687d64e9f5c67e SHA1 d9db0e944c505586772fdf0b03fc1a6f633e3062 SHA256 f22fd430f1ce56ec2f3047ee4bbf1e42cf716aa5ed6dfd626e1ec26761b2037e +MD5 210ee2aaf98620249649d772729f1042 gcolor2-0.4-r2.ebuild 734 +RMD160 2780cb32700cef11151979c0d1687d64e9f5c67e gcolor2-0.4-r2.ebuild 734 +SHA256 f22fd430f1ce56ec2f3047ee4bbf1e42cf716aa5ed6dfd626e1ec26761b2037e gcolor2-0.4-r2.ebuild 734 +MISC ChangeLog 2030 RMD160 d35de164a4577d6b042608da20321dfd265deb76 SHA1 a02733d0d3505cb5005e6a0652c9888310551ef5 SHA256 bb4801e95fc70b5b0a5bcf0597a59af0425709608e06ea0a29a1d57342022c34 +MD5 7cb0efcda0a580dd8403902988c209db ChangeLog 2030 +RMD160 d35de164a4577d6b042608da20321dfd265deb76 ChangeLog 2030 +SHA256 bb4801e95fc70b5b0a5bcf0597a59af0425709608e06ea0a29a1d57342022c34 ChangeLog 2030 MISC metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d SHA1 2d72cad2ed2c3fce67f5ae575a00c3a3ee4e1604 SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254 RMD160 2a9e181efd140c3c1a2136376000c63f7459246d metadata.xml 254 @@ -17,10 +25,13 @@ SHA256 ddd8e09da8727f957651a073ae2b61e4a381ee69ab83c93a3077a653743b887f metadata MD5 8f89bda67f3b458a38fd9986c991a69e files/digest-gcolor2-0.4-r1 235 RMD160 992968f659a77feb1497ef30b500c1259b1356ff files/digest-gcolor2-0.4-r1 235 SHA256 173d193cecfa1d9c3596b12b340a71a0a8108a9fc0126191550413226f002dc1 files/digest-gcolor2-0.4-r1 235 +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 v1.4.5 (GNU/Linux) -iD8DBQFFMRQhgo/w9rxVVVERAjqeAKCl26QYbCH1YSm7cRiBeTh/bSv46gCdHqO0 -dBy3hMNFglAj4jGsaqP7iLQ= -=hjm9 +iD8DBQFFXv16NQqtfCuFneMRAucLAJ49QtGeMDeZCFtEopxKFvXVeVHOTwCePOXz +6rZZnm3H4h9gisLXdPaHP7E= +=CRfA -----END PGP SIGNATURE----- diff --git a/x11-misc/gcolor2/files/digest-gcolor2-0.4-r2 b/x11-misc/gcolor2/files/digest-gcolor2-0.4-r2 new file mode 100644 index 000000000000..ddb4af16f5d6 --- /dev/null +++ b/x11-misc/gcolor2/files/digest-gcolor2-0.4-r2 @@ -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/modular-rgb.patch b/x11-misc/gcolor2/files/modular-rgb.patch new file mode 100644 index 000000000000..d7a1e7a6e24b --- /dev/null +++ b/x11-misc/gcolor2/files/modular-rgb.patch @@ -0,0 +1,21 @@ +--- callbacks.h.orig 2006-01-10 21:26:19.000000000 -0500 ++++ 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" + #define SYSTEM_FILE_4 "/usr/openwin/lib/X11/rgb.txt" ++#define SYSTEM_FILE_5 "/usr/share/X11/rgb.txt" + + /* 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 +@@ -36,6 +36,8 @@ + sys_filename = SYSTEM_FILE_3; + else if (g_file_test (SYSTEM_FILE_4, G_FILE_TEST_EXISTS)) + sys_filename = SYSTEM_FILE_4; ++ else if (g_file_test (SYSTEM_FILE_5, G_FILE_TEST_EXISTS)) ++ sys_filename = SYSTEM_FILE_5; + else + return FALSE; + return TRUE; diff --git a/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild new file mode 100644 index 000000000000..d03574932784 --- /dev/null +++ b/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2006 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.1 2006/11/18 12:32:47 opfer Exp $ + +inherit eutils + +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="~ppc ~ppc64 ~x86" +IUSE="" + +DEPEND=">=x11-libs/gtk+-2.4" + +src_unpack() { + unpack ${A} + cd ${S}/src + epatch ${FILESDIR}/modular-rgb.patch +} + +src_install() { + make DESTDIR=${D} install || die "make install failed" + dodoc INSTALL AUTHORS COPYING + make_desktop_entry gcolor2 gcolor2 /usr/share/pixmaps/gcolor2/icon.png Graphics +}