Install scalable icon for better fit in gnome-shell, use eapi5 and gnome2.eclass

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 67 insertions, 15 deletions

diff --git a/x11-misc/gcolor2/ChangeLog b/x11-misc/gcolor2/ChangeLog
index af1e3ab0310e..e770bce8d67d 100644
--- a/x11-misc/gcolor2/ChangeLog
+++ b/x11-misc/gcolor2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/gcolor2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.33 2012/06/08 13:07:10 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.34 2013/07/20 21:47:36 pacho Exp $
+
+*gcolor2-0.4-r4 (20 Jul 2013)
+
+  20 Jul 2013; Pacho Ramos <pacho@gentoo.org> +gcolor2-0.4-r4.ebuild:
+  Install scalable icon for better fit in gnome-shell, use eapi5 and
+  gnome2.eclass
 
   08 Jun 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer from metadata as talked with him, bug #90641.
@@ -122,4 +128,3 @@
 
   25 Sep 2004; Brad Laue <brad@gentoo.org> +metadata.xml, +gcolor2-0.1.ebuild:
   Initial import of gcolor2, a GTK+2 rewrite of the 'gcolor' utility.
-
diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest
index b00abd5c2d96..d45e9d4a8e53 100644
--- a/x11-misc/gcolor2/Manifest
+++ b/x11-misc/gcolor2/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gcolor2-0.4-amd64.patch 1484 RMD160 6ece617db1254b30b9d5352382a41b73de089e96 SHA1 000905f7b086ac8f7f0a97e49a4e636ad541de80 SHA256 93b3218de6d522017cb2d14cb94cfe523100234a45fe9b46cee2274612887195
-AUX gcolor2-0.4-pkg-config-macro.patch 240 RMD160 0ffcf18905351249934a8ea706a40c5def32d81f SHA1 33f8942ec57a41bab911a2f6be4cad2d2da08631 SHA256 1b5aaf3ddec8c827738500160765d7602dd974cc8335befa3f6eaf76673edc8d
-AUX modular-rgb.patch 800 RMD160 96b48bdc243f7a1206cfaa5a31625909dd15c1da SHA1 6b219bd38b61c809bd674fdca7ba4120b3fbc456 SHA256 931a56b8f37071d48307f781dd3f164573a913686af3e43bfec1e3530bb5089e
-DIST gcolor2-0.4.tar.gz 375217 RMD160 d31dd5d19720a8888be269778d2be6715849c506 SHA1 7cfa173825d486c54a5358b6f41e679d8a2cd5b6 SHA256 89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23
-EBUILD gcolor2-0.4-r3.ebuild 1124 RMD160 a8982abcd7cd5028d171d4d103a628e340789edc SHA1 7bd467e62123417416ddd6fa107342335d94725f SHA256 40c78499c8ac448a9187a9d386d9b30ff356190718162789dca7f71c0f0b6335
-MISC ChangeLog 4260 RMD160 3d20e4e6d20558811b55bdea0e2db799d1a55640 SHA1 a7cf6996f37c073255b5b296b0240cfc93a86d80 SHA256 8febd5af896fcdb801cce5e17ff94876af5f8e062bda7352ec3cdd79b10ec809
-MISC metadata.xml 159 RMD160 488f58f504e5c2e7b10e253fd9db5f1e6f9d3a21 SHA1 16c86b590ee3d78c8ccd5b5044835ed4a4038d93 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b
+AUX gcolor2-0.4-amd64.patch 1484 SHA256 93b3218de6d522017cb2d14cb94cfe523100234a45fe9b46cee2274612887195 SHA512 1b114e31a0a0fd4d500ea992616e72c8b0f1cd3442130f1955acd2d17c7a0239f6036986e9e3297182245ee7846fb9e72394acae72c88ccb2cfcf8049d105077 WHIRLPOOL c42f0184a7e765a03f591633818b3abe4e2e473154dd190be595d89eb5bc66c92d862f96e3bcf22b5d600d2d2ab75fbc56b3a2aa9c4c0fa44570929b90dfd6e7
+AUX gcolor2-0.4-pkg-config-macro.patch 240 SHA256 1b5aaf3ddec8c827738500160765d7602dd974cc8335befa3f6eaf76673edc8d SHA512 e86fc73aee59d73e19d5c841169b4e4941aba78e206be67c86b45bddcdf51f86e7ad0dbfbbeafe98c6bf056a314940e27f02087224f271b085154636fbc2983a WHIRLPOOL f8af2b94a15359d7f72594ffa87c41913c5f755528622d81c57d95c6a983082f81c3d888ffb868245cbd438142a366ff23c5b5892e0c57cbc6a72768ec500751
+AUX modular-rgb.patch 800 SHA256 931a56b8f37071d48307f781dd3f164573a913686af3e43bfec1e3530bb5089e SHA512 bf2ffe9bb489869e67b8b595fba649d3a8e0fe6dd168156c61f2a1165d865ac15199e03896c9b8e6a65d6cf84e8445f303f9b8eb190c60478e1334b60716572f WHIRLPOOL 6fb41ad7b2dbcfad1dc3831c4c3692e50ce49637e51ba8629a1f0621a20ec12202a53f999bfbc5a2440d53043e26422213c8f7a5ab0c682f0b2e7191c0b75ab9
+DIST gcolor2-0.4.tar.gz 375217 SHA256 89bd6c6d27ba5a679ec60057de8497855072f520515b490e5986fc3509774f23 SHA512 9b9677b4be8797c9b03deef9bf1b96e6497d2adf85f74d01f1b478f04d92cb912790c4d5fb74f403295219cac6c0d3fcabaa7de340975bbcdb68b0347f6042a3 WHIRLPOOL a0ae359ec66c50cd0386bbf4448ad32947e976012089d16f8f0ada71e27a375da6185ba4096c29c57f1cc980992aa050647e75bf6eec6839bc32a56e4cae1876
+DIST gcolor2.svg 12742 SHA256 df70b5fc937db1940fc1dacf51ec72006352e7597ec52e8815ac6a860a96ff07 SHA512 377dbd494e5a3f881df65415ee66310cd96b4e4ac668101aa068bfe6f575b694c930817cec942e885f93465d05ccc604950f2154e26be95618d6f272d81ffe1b WHIRLPOOL 64d3034595ef5fdafe8f3960d6b16f3aea3c02e56b3b475f9745b7862523c248c65e9ecb36cbe479d2b34032d1178d19630a4806fb1ac7ebf3e101fbd1e6c886
+EBUILD gcolor2-0.4-r3.ebuild 1124 SHA256 40c78499c8ac448a9187a9d386d9b30ff356190718162789dca7f71c0f0b6335 SHA512 448438ecf6e4f8aa5caf6129eeb8683879f8cfde787d2ffe2195351dbde273a456faa8d394628ef35f137f06c8fa9fd5fea390b04c8241f479974e507e19af5d WHIRLPOOL 911f7e460103a916e760ded5b6b5f32379c05e053f936f8ec3c08fa225e8391394e65b648dd00f05ed36e26bcd973dfbab55acf9b7aecdaf6ee672e30267ebe3
+EBUILD gcolor2-0.4-r4.ebuild 1152 SHA256 363b4cfe843cf3a9ac0337b55ed65aa1b4f8853b74172d45dcfc122fc6df4152 SHA512 375e2dcd41be3f3239478de037df8e1984fb50f60a35e4de0db12019efee1a4c9d914e372561e82ece90643d6da00716754a60d0d7e67c02a458f0b2d1d1ce3c WHIRLPOOL 6d3ed6babd0df971146a57c10e41e460690a107dfd61c895d071e33613928d336787e10f4a6dee368f4a01fcc531b890c7884de56918eef57c7e5d4300d21ef5
+MISC ChangeLog 4446 SHA256 d744d1dcf74331345116ea0893dbf6c757419d0b418892683eb570f11e44d122 SHA512 9119fedc333172f02a2194ce95ab16907bb7cac698d9958b81788908ef7ca6e6bd8795adb85458189bcf2772543455c2728707aebf7efe9cbca73bb3cf4da2ca WHIRLPOOL b91f33b2d80ea250dd26aed94d69fc3e275317b0ef33a61d8871a0c3efb19f79d5a30fffc37eff2cb99e48365df1adc6c8351ef78b5c12e4148e45a28f0462cb
+MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEARECAAYFAk/R+QMACgkQCaWpQKGI+9ToIACePtdogjBhPrYS9ZHLMhTA240V
-YN4AnRc470JtP8CHkcbpurw1F3fIkGis
-=veTB
+iEYEAREIAAYFAlHrBXoACgkQCaWpQKGI+9QeQACfdXpPeSDewukTQ9D0QP+rka0j
+RN4An297ZfU3UMR2DJlv4fU6y6A2DcOO
+=4IYV
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
new file mode 100644
index 000000000000..632d288a703e
--- /dev/null
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild,v 1.1 2013/07/20 21:47:36 pacho Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A GTK+ color selector"
+HOMEPAGE="http://gcolor2.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~pacho/gnome/${PN}.svg"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.4:2"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.27
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/modular-rgb.patch
+	epatch "${FILESDIR}"/${P}-amd64.patch
+	epatch "${FILESDIR}"/${P}-pkg-config-macro.patch
+
+	# To check at each bump.
+	sed "s/^#.*/[encoding: UTF-8]/" -i po/POTFILES.in || die "sed failed"
+	echo "gcolor2.glade" >> po/POTFILES.in
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Icon from http://sourceforge.net/p/gcolor2/patches/5/
+	doicon -s scalable "${DISTDIR}/${PN}.svg"
+	make_desktop_entry ${PN} Gcolor2 ${PN} Graphics
+}