Fix intltool files making LINGUAS to be honored, bug #408103 by Piotr Szymaniak, drop old

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

4 files changed, 15 insertions, 64 deletions

diff --git a/net-print/libgnomecups/ChangeLog b/net-print/libgnomecups/ChangeLog
index df4dd7a584ec..4e7d708eeaa0 100644
--- a/net-print/libgnomecups/ChangeLog
+++ b/net-print/libgnomecups/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/libgnomecups
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/ChangeLog,v 1.96 2013/04/10 20:22:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/ChangeLog,v 1.97 2013/12/24 12:46:31 pacho Exp $
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> -libgnomecups-0.2.3-r2.ebuild,
+  libgnomecups-0.2.3-r3.ebuild:
+  Fix intltool files making LINGUAS to be honored, bug #408103 by  Piotr
+  Szymaniak, drop old
 
   10 Apr 2013; Agostino Sarubbo <ago@gentoo.org> libgnomecups-0.2.3-r3.ebuild:
   Stable for hppa, wrt bug #458984
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index bbfe89c73856..f042bab892cd 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -7,24 +7,13 @@ AUX libgnomecups-0.2.3-g_list_find_custom.patch 3300 SHA256 8242cca424d91560dbc7
 AUX libgnomecups-0.2.3-glib.h.patch 1017 SHA256 647f51deae54fbca376ad9febdb9047d4bc4f1f80be76abc671297e76176c3f5 SHA512 111082722396a40b7a249d088cf60bdd7c21a62aa89df6b84d0ae6d38e0175e7a5a07f701660964c1fac0b413f68398e023bf02eacc7b0b1e963f805390c579e WHIRLPOOL a7453c9187fdfc93ca8b1bef8d65fe0bd93903830c73bfeb59c108b7140ad58edea8087bd4d6cebfc6cc5fb5a89c3b847ca8889711ab548d63bcaa736772490c
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 SHA256 ac43b6c676659605911437a30c31bd30af869798dddae8f22ac6e485344cdff3 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8 WHIRLPOOL 862adfead1ad09e2f6e30f7bb8500fdf5fc4c9871cdd56665e44b1984951c3e9950d813526fc8dbbd06699706e23ba3917ca9b459cc8c8c77e01d66e10595019
 DIST libgnomecups-0.2.3.tar.bz2 357129 SHA256 e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75 WHIRLPOOL 1bc4693d039d1e51853af74e6928f363ed0d9b29cf9260de162054d0ad84de645ff34d452b8865440d3a3eaf91ae0c3952363c4f4f405f1a023fe227bccd8f78
-EBUILD libgnomecups-0.2.3-r2.ebuild 1119 SHA256 dee344c9c53df065023957ffb2ee684214aadecb497918cc767bf2529c681c74 SHA512 f3a5a1c5a76aaaff3832c6f44a3d6ed945acbe2867e6e2404c4e5bd4bbb1e16739b405d16448748013fed5b19c409c4ab3a7265e829be810f103a611bb7e1e58 WHIRLPOOL 221c27521b0da25085c234b4c2e600b04aeb1513129b58c26ce4ca26128516c0bf305b32c89a09b443f0c7ca737872cb669f1af1fb62096cc8412ada39240ef4
-EBUILD libgnomecups-0.2.3-r3.ebuild 1190 SHA256 634c1e5c8292550e83263665866c3c9d1bbf2154cb463ed71f02b5e14816918b SHA512 96a5903584fd8a9786cff548167d4874556d9bd3c1824a816e144f979e850a78fc9a41c0fefd237a32c52b35a5632085e9ece40db93d6b6fb2da76412e1a710a WHIRLPOOL b08af5a034c0e0de2b87bd34f91b14c1f6cf832a4ebc99e23fd4d4ccb4f105a94290cc5a5cdca43b7d634be8d674a03ff841bc33926d74c8cd6703e99ad50c47
-MISC ChangeLog 11963 SHA256 32c53461f26d0f42690dbff9ec20adb1970c9fa0b49683d67108b0962bb5aaeb SHA512 9a668de7f36f5ae5b4c0faf6a4c51dd4db4808db110e18b1c9af71adb8921225161aa888651845f25299694f57daf60d5d10280a2fecb9f0fccb1be2a8a907c5 WHIRLPOOL defbeea0ba1a923c9f2de0b9f54e2d07ef0c2789522fd4ab242ee48f98fbdfc769db574a9453769a6e4ef4f1a10b3c47162e4bdca71f6a33c23ad420d60bb119
+EBUILD libgnomecups-0.2.3-r3.ebuild 1268 SHA256 dfd19d22b6524ab46c577456967a08ce7e5fd53898a115d4d03aabf14e64a818 SHA512 27677f673b61dc67cae7c97a0cca59c03625141817386cfa3ed417c3ef7f2a82ff5d8e44320b1d08f09ab965303f8b588fea2a5ba809ccaa68d53d22cf0afa26 WHIRLPOOL fe1b483cc7a2082831474263dfc45129f2df7c27363c1329eb9eaac27822feab34a2db218fc84e8f709c142b45f00f93e30c56260433bbff1238c53593722a90
+MISC ChangeLog 12170 SHA256 645b753a98cd47539fabf7eab2bf84ec1675194227bb5338abb971e77d4e95ef SHA512 fb9e02a6dbf508290d52f5e42361c1630bd0ff5c0136c730efed54b810c78bbf6ac6c10b001961a702f71005478a6116def172e26a6fe4262f5202bdba30f3be WHIRLPOOL 3b375bc4dd615a4c54a477ad976cc9c9290e0de26cdc79e623ee644429c0058cb451e321380210bd13396c2a0df574efad94246e5c1aae793b38aad956933626
 MISC metadata.xml 180 SHA256 21576b6f9d195cfd7a7f38ef661ffad9e39e979c1c98c9af12ce85398fc133a9 SHA512 6c9bcd0a445c41f440e7ca252f5e292c034304236fb53e02c9bc7c793b6f24043e5b18a7c02b55229bd389e9770d70c6a21f66631aa29443810e08a28e2d57b8 WHIRLPOOL 7c0b3785b28b00032ff13394e7ec17cec0ac1f7cb65ad8d5b47d452a8c6cea3880ab3fb62491338515eb9214b335a75a8488e6dc5af02bc16c01b1cb6b043cb1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRZcn3AAoJELp701BxlEWf9+oP/3yhxACcGYAAj0twcy9IYMu3
-AInFMijOmPJ7cGcavgS8GqPLnXJw2NLoRdoaxY7ILwyM9DURkzlySIe/HbvT8n+a
-wRt3upapYh38KAbJfYXbxaLP1l3MzU2OVfi9PlQO3PO7piwraVfF47ckvSWotnFZ
-W2d97xL+OMcl7oc+4pW9SMV7fuIAr5hoW24/USQvd+EFvIq0A75Y2nRCWG48s78p
-BAll1c1mBls/DJRscE52npL56f+gPIRdH7PkXUXS1TKhS8Ehx0IHgCU+0x0yVBkU
-6QZUaLEp7P5J4fmqqkDMdJzLr6lpw766o4VsvvSaefs98+zWbUKLicMTpANlrmO6
-MwQvBGbUa7LT+8AzVmq8z2fnhMNM5I/kigDd3GuuW1ECEXVBpOdezVp/mOhKvn2e
-7QxuhyU/uNi+vBpAEn9ptPeCKZGpvEAybhlonC/hDaBtqL24dH3OY1qCBBsdUZ5m
-aKnwGgSgB5+2G+kYPENqd7xQoBov/8iTFIHtBlX/sXcNRqNurH2E6FelC0CSiUiP
-edj8oZF2X8yQScD7cY6V6W1gleq+GSDx0UsOnj9S1KQ35aO5UZhyDEgiOoThF04+
-6Ps/VOoRaRdnQRzV+VDkjgaq1uC5Nj7cI5VF8g0o7pkEKIsUHu88wbeLObRz7WNm
-dZUr7XY9PNPcLPLvwX/3
-=W/9c
+iEYEAREIAAYFAlK5gigACgkQCaWpQKGI+9Q/LgCfVkdcySZ5qu4nVS2UbUFX0mRF
+7C0AmwQ1cOAfpCEAFS9qIZvHfTp5EsNC
+=lyrP
 -----END PGP SIGNATURE-----
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild
deleted file mode 100644
index 5b4df6188292..000000000000
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r2.ebuild,v 1.10 2012/07/15 18:22:40 armin76 Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME cups library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2:2
-	>=net-print/cups-1.3.8"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.28"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-static"
-	DOCS="AUTHORS ChangeLog NEWS"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/enablenet.patch
-
-	# Fix .pc file per bug #235013
-	epatch "${FILESDIR}"/${P}-pkgconfig.patch
-
-	# Upstream fix for g_list_find_custom() argument order
-	epatch "${FILESDIR}/${P}-g_list_find_custom.patch"
-
-	# >=glib-2.31 compat, bug #400789, https://bugzilla.gnome.org/show_bug.cgi?id=664930
-	epatch "${FILESDIR}/${P}-glib.h.patch"
-
-	gnome2_src_prepare
-}
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
index b1ab1f077e30..ade0ee0f6d6e 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild,v 1.11 2013/04/10 20:22:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild,v 1.12 2013/12/24 12:46:31 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME cups library"
 HOMEPAGE="http://www.gnome.org/"
@@ -43,5 +43,6 @@ src_prepare() {
 	# cups-1.6 compat, bug #428812
 	epatch "${FILESDIR}/${P}-cups-1.6.patch"
 
+	eautoreconf # To fix intltool files making LINGUAS to be honored
 	gnome2_src_prepare
 }