Re-add translation data that got lost from 1.5.0 to 1.5.2, bug 415455

Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64

3 files changed, 28 insertions, 19 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 441dca8d3fd9..46f531e228ce 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.475 2012/05/08 23:00:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.476 2012/05/11 08:49:11 dilfridge Exp $
+
+*cups-1.5.2-r21 (11 May 2012)
+
+  11 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -cups-1.5.2-r20.ebuild, +cups-1.5.2-r21.ebuild:
+  Re-add translation data that got lost from 1.5.0 to 1.5.2, bug 415455
 
   08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   +files/cups-1.6.0-dont-compress-manpages.patch,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 97d03b147991..b5d02700ab85 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -24,28 +24,29 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH
 DIST cups-1.4.8-source.tar.bz2 4547162 RMD160 ee80e8d0b56dc0e2edf2a9aa9a43c4b92619f741 SHA1 9167f556e78e0bc075f1eb2f695d79cc1f334007 SHA256 6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
 DIST cups-1.5.2-avahi.patch.bz2 17252 RMD160 40c7165de7f23e01aa3edf3968406e69fd0280f7 SHA1 e69c9b62b2773431dd7bb86573255d7c39fc2012 SHA256 6100029c6eec05729b6ef49f743876b9bf4d67f7b20b624be98372f4fb3e1ede
 DIST cups-1.5.2-ipp-r8950.patch.bz2 19525 RMD160 346a3141ae445dc9f17c7fbc0a467aea4910f10b SHA1 4bc3b40771261c37b63cbe4f65213b5db6c66534 SHA256 1a2d36136fc66b5f53e7cfb3e5d815e62cc3a6b4cc61d678f29d8a0bb748572a
+DIST cups-1.5.2-locales.patch.xz 313616 RMD160 2346f911910c19364fc67c67c22b4d7583efe616 SHA1 b3f2660affd00d6a505beeccfb1280275197bd49 SHA256 273f3583882533ce995a0d3380d6db1b5aedb88790def799c38a3454c84357eb
 DIST cups-1.5.2-source.tar.bz2 9595665 RMD160 98181e2ee8c6e574fb6d405f688f52c9b61a2355 SHA1 56fdb4f58e676607845321c0296c1e90e416883f SHA256 b150aa108c631f4f07e92cb13c01263a67170e5ac8383c5548ef8f8473a187fb
 EBUILD cups-1.4.8-r1.ebuild 7238 RMD160 bcaea5c73607b67db0ddf167028e478e570bb1d2 SHA1 90cea0976ff93ffe3a92e45a028325fe07d34a7d SHA256 36349d5f86ca76fe70935acf172bb166515b4f56d403f39dd3016c49b25ed862
 EBUILD cups-1.4.8-r23.ebuild 8848 RMD160 0346363cf60979a04b7e626c396b8f558c47e868 SHA1 85dea1ec0d908183257675ac4748ceec57f7f72b SHA256 767556a6135e68aeaff967599dab0a6716c1d8cd0d1309ac8d8f12eadd118646
-EBUILD cups-1.5.2-r20.ebuild 8669 RMD160 a74d38a2fac85be7aeaf01f8cedc1518a3cfeb0b SHA1 386ef3ff391c4f567e356398ce5c15310dfdb25e SHA256 85891a3351dbd78ddbff19c82d05f59c387f3ee0902f2673cc5b70c66ba1e552
+EBUILD cups-1.5.2-r21.ebuild 8807 RMD160 e46b4a56b0974a7e0826253e8853aecb74430b2f SHA1 e4e8a7b091ecf19df6fa10da64da310bc9076ccd SHA256 f123e5c60ae21206dc7862976cfa4008c5b983386d78794a0b9a671ff251c6ce
 EBUILD cups-1.5.2-r4.ebuild 8314 RMD160 ca98a87bce824f4fa1cf347ce53c485f8068f416 SHA1 fdd41190e50c2f1356acf0094813fa092b9af6b9 SHA256 0a5b2af35abc1680d405d2134e74a251748d314ccd8415c71a304193ae73cb50
 EBUILD cups-9999.ebuild 7807 RMD160 ac3e841edeec89193a1703eb8423072a2a9fb90a SHA1 8da56eb0e1d2c7500f75ea4509fc7721033c94f9 SHA256 f320677d3e8b484d6c2e39113e62739ea01302e0bc6dbe49cba82050aef6f3e6
-MISC ChangeLog 72353 RMD160 ac546d50287e25fa1d2fb26b2460cd1909a8a5dd SHA1 939dcf8a347a8aff4d0aa04dc8e799c9b7805aba SHA256 04a4de679123fbd0ab3a6c16b608baf8f9d65b7db2f3aae739867b7712f1a164
+MISC ChangeLog 72564 RMD160 acfbc42a019e7c726327ec3b78f90b7ac268e5f1 SHA1 6cdb57355beb1426cd8730fb763ffbf6f063addc SHA256 d86d732426ca741d33b2d67c752da2a9fb87d18d204619cf5afd776761da669b
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPqaW5AAoJENwGBM22xffeShgP/RJX5piE75YfhiCwobu2YSR5
-U6+jnGd5+rZzjPIfcvZNWdIhMfxd+ucEwGLupSziOnW9uczt8JBW12JAqRHsICkY
-42nRIt5zEuUVE7DNb1IHCrsh0cywFvalv46DMC07qOxAPuILFG1izLVS2g9qk+Td
-gfhsGWYh/bZRjYrRBDCgvTgsVQQh8B59lItzP8GCdK8pa6stjlKeJPBHQJxwAhc+
-FxpH5W4BrirCC4mC/UK8tznqNzBXAoJBp8H0xm1iblvwsANzmTJ/F5L5MxAnS4jO
-pAnzdnQKThQf2/CQmF4jiu6VlhZoKg+TOXdARTzhNkdSZYskum18DBj3GlyAaH2i
-3YaveytLfScEcfNScChDSl+9oTKz1kv/+Gb3zrl+TX2s7c/8h/3xA6SMPIgYs++N
-bFkhzTBNs0E4YiQASRHvgCuuyRrbMnneglEHTJAM9d+FvZO97/Jkapd1NJg7CMNB
-kLU5yjOeAauRB+6cWFY3B3mL3idRh110MxmP9mll6xt6GGGdBC9oyXoOjR0rRaNm
-3R+Aom35yBKFqE73phicN6MjuYEKynbexOTo4mymg/Wa0xLIg30riwoIbRdtg4gA
-CuAqLp56Fc9tZLwj35Da7uS95tpOuUmW+GafLcGxcHwbV4tixebMzHYEjcriiyvN
-RiyEoXfozTNAE5S5QA/d
-=WRyy
+iQIcBAEBCgAGBQJPrNK5AAoJEEb+UGWnxTyHsZIP/1cWHs/ELlMlQuvIkxIrUlGW
+J1Q1yLlX1z00Fn18mFlSGFcUnhOLJjKaikHxQa9Ny6sSVJGjNTAbEgwS70Ko/fq7
+hTfv2BVf2h++/fxVfojKtcEodHtQXNO1zR2I2SfxNK1ak2HqYpAxYjc4rf+Ol77s
+s3oIsAuoaF48M/0RluLUwnlmklpJgqPVRH9m5Nb0Q1WWhN0ArCy7xRhM91v3R2L8
+UQEO35aOaqrGYEDJZWikEol/PUDKX7FJtRiNQGsJzWdQbHBzw49czwqFj8SH3rLS
+/cYWTG/UwFK9VzpKs/KnHzbn6QcexIqOlagni/KQhxr9LxIO3413YEjkcrRNSk78
+/D9zEpg+flDe6wkAbWeru695usd7h0MDINqDFLLV+Zqy+NsLQzsFHEF2hFCs1yNE
+nRcCjkqGaTELhbApXWty7nPHRvrW7IsFBtKI6Owss33thOBn/kc3VwOsHckA4H2l
+oMCdEI5wm9lOvqDOiF2Cz0jJ3BJNt8BeaPdB0ZyQ+jeKIwjqDPYZ58s/Zni4ZQ/t
+tw/lfs3mzNWw6TAwfLcYmAs5BmrZe4icXqu/KwYcVGC85bgjF+iMLYrnFwSXHgNE
+YIjYHq/qkwv0E4VZVLqlNQPaA69hnJDTi4MdrgUemyFD6sEuvl//5fjtUcTr5T3U
+H1ejJp3tCJgiCpznHWP4
+=aASt
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.2-r20.ebuild b/net-print/cups/cups-1.5.2-r21.ebuild
index f7fd1d5f3acf..4349a35cae53 100644
--- a/net-print/cups/cups-1.5.2-r20.ebuild
+++ b/net-print/cups/cups-1.5.2-r21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r20.ebuild,v 1.5 2012/05/08 22:24:12 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.1 2012/05/11 08:49:11 dilfridge Exp $
 
 EAPI=4
 
@@ -14,6 +14,7 @@ if [[ "${PV}" != "9999" ]]; then
 	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
 		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
+		http://dev.gentoo.org/~dilfridge/distfiles/${P}-locales.patch.xz
 	"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
 else
@@ -94,9 +95,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.5.2-threads.patch"
 	"${FILESDIR}/${PN}-1.5.2-threads2.patch"
 	"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch"		# systemd support
-	"${DISTDIR}/${PN}-1.5.2-ipp-r8950.patch.bz2"		# revert ipp backend to 1.4 state
-	"${DISTDIR}/${PN}-1.5.2-avahi.patch.bz2"		# avahi support from debian
+	"${WORKDIR}/${PN}-1.5.2-ipp-r8950.patch"		# revert ipp backend to 1.4 state
+	"${WORKDIR}/${PN}-1.5.2-avahi.patch"			# avahi support from debian
 	"${FILESDIR}/${PN}-1.5.2-browsing.patch"		# browsing off by default
+	"${WORKDIR}/${PN}-1.5.2-locales.patch"			# patch locales back into existence
 )
 
 pkg_setup() {