Remove the patch removal and add support for updating translations.

Package-Manager: portage-2.1_rc4

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 743144c830f741f887eb4ed43270498a60d96a16..c028f593fb460f87b3dc080b9c583d9b4c0e0a55 100644 (file)
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.361 2006/06/07 13:54:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.362 2006/06/07 19:25:15 flameeyes Exp $
+
+  07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.2_pre20060606.ebuild:
+  Remove the patch removal and add support for updating translations.
 
   07 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   xine-lib-1.1.2_pre20060328-r9.ebuild,

diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 4a1650dc3eb31c1f147f964c706c66fb1089dc4b..9681c33d9410741b7f2402eb605978cbe900782d 100644 (file)
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -7,7 +7,7 @@ DIST xine-lib-1.1.2cvs20060606.tar.bz2 6509453 RMD160 a53a32bc5df800ad2072973224
 DIST xine-lib-patches-24.tar.bz2 18687 RMD160 68bf0ae79ba27e30f7b719862fd378b1871bc661 SHA256 86367ba64e81cf75f4f877c348777c791cf372aff29043fcf838d5f23cc3175f
 DIST xine-lib-patches-43.tar.bz2 36962 RMD160 b53a603b141bfee5121809e19bf4ad618cc50412 SHA1 82a7f58d76c8685df98773c75ec4fe21c890d20b SHA256 0cb9545171e4024a8ce1b6b1e2211b06c51adfe4650b2423862355331dd3650b
 DIST xine-lib-patches-45.tar.bz2 40494 RMD160 bffb9c08ba2386fb9c33ee15cec01436c9804612 SHA1 aaca1ea745e2f8f5c886555a74479a7a62a21f4a SHA256 97cbbc99ac9999d78640bd57d24c6839c57d3761ba9124b75df41222fb3cf34b
-DIST xine-lib-patches-46.tar.bz2 29276 RMD160 bd35b4c8234cbe865817b1722c569d2e22491224 SHA1 b907b79cac75b40b0fab4188f68a02897518a042 SHA256 6dfd5d0a28b7c6a2e7ed68e8f5432b2f35880df3d590e65d4439d47e4be7bb84
+DIST xine-lib-patches-47.tar.bz2 73772 RMD160 9b19dafd094d24b47d1e20b0a58adc285199b05b SHA1 951eeb73c19c10cece34408ccc449a6806f67750 SHA256 2c5745da1cd58d9a83195163b8733f609be7549ede9f06e4a75006503fbde6cc
 EBUILD xine-lib-1.1.1-r3.ebuild 7232 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd SHA1 92c83023f1f2cf42accb15ea9a6463ca1eba2f81 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25
 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232
 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232
@@ -20,14 +20,14 @@ EBUILD xine-lib-1.1.2_pre20060328-r9.ebuild 7407 RMD160 83b13a9259130e561393405d
 MD5 b4b3e1fbb76fef104d82fbfd365f3054 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
 RMD160 83b13a9259130e561393405d494af52777f8b377 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
 SHA256 61bcc856a900fe0c1bbbc9e561d35fe7fd610c9141a534301a58b58cd4a35a63 xine-lib-1.1.2_pre20060328-r9.ebuild 7407
-EBUILD xine-lib-1.1.2_pre20060606.ebuild 7500 RMD160 ce77963e318f083746a8c9420e24b627deb4461b SHA1 95d9e30ddea3638050d7b622644e4d2d9bcff369 SHA256 624d814c24835ca2f7660b87eda0a69b299823e78c836adc3814eca5d2e255d8
-MD5 1507e301c7b95531672a711e905b043d xine-lib-1.1.2_pre20060606.ebuild 7500
-RMD160 ce77963e318f083746a8c9420e24b627deb4461b xine-lib-1.1.2_pre20060606.ebuild 7500
-SHA256 624d814c24835ca2f7660b87eda0a69b299823e78c836adc3814eca5d2e255d8 xine-lib-1.1.2_pre20060606.ebuild 7500
-MISC ChangeLog 32659 RMD160 3a069dd911965243f13ec3a1c7fe8b42ab894052 SHA1 405f30ca049caa48d196bb757062a1dbb6f146ca SHA256 32ce0dc66be2e0d9ef30b4fa5b7f2c7259ab4f48f8af2a861bc04c14b07b266b
-MD5 b743ec78b37fad64625ec9b9d3953ba7 ChangeLog 32659
-RMD160 3a069dd911965243f13ec3a1c7fe8b42ab894052 ChangeLog 32659
-SHA256 32ce0dc66be2e0d9ef30b4fa5b7f2c7259ab4f48f8af2a861bc04c14b07b266b ChangeLog 32659
+EBUILD xine-lib-1.1.2_pre20060606.ebuild 7646 RMD160 be0451d14df56b77d387be22724d4f4f2ecb143b SHA1 d6debaea25cde2c83ffbf725dff8d84f604c26cf SHA256 174201f0c819ba9755dea3b40e5581f0711cd6741898edb73c6237632d36593c
+MD5 9add35e52cd4538a70c156da3cd791b4 xine-lib-1.1.2_pre20060606.ebuild 7646
+RMD160 be0451d14df56b77d387be22724d4f4f2ecb143b xine-lib-1.1.2_pre20060606.ebuild 7646
+SHA256 174201f0c819ba9755dea3b40e5581f0711cd6741898edb73c6237632d36593c xine-lib-1.1.2_pre20060606.ebuild 7646
+MISC ChangeLog 32820 RMD160 d3dc66a79d2b9d20082187ba57971b394a6836f0 SHA1 4a15babfdb5b6fbd22c41414b8ecdf10ba64d8a5 SHA256 3ad9f0050701417678ac3c6282b64cc4184e7e090cf9b3f99b2299721b68faf1
+MD5 626c6ceead66ca208249246e4168f6fc ChangeLog 32820
+RMD160 d3dc66a79d2b9d20082187ba57971b394a6836f0 ChangeLog 32820
+SHA256 3ad9f0050701417678ac3c6282b64cc4184e7e090cf9b3f99b2299721b68faf1 ChangeLog 32820
 MISC metadata.xml 330 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 SHA1 6e47671ad5629f45f8bba068ae87a7b27b4c9750 SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92
 MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 RMD160 19830d3a2049c3ad75c580173d0436d7ec9dc8f2 metadata.xml 330
@@ -41,13 +41,13 @@ SHA256 fbc356822d9d60ecf6bb0c32bd753695b8bb78374fe40211a192b4f2f28b30cf files/di
 MD5 95279f3962ea45c87765c2a43af06b76 files/digest-xine-lib-1.1.2_pre20060328-r9 539
 RMD160 401f695b1d0d33bbe37a83da7107c4cc0a77299d files/digest-xine-lib-1.1.2_pre20060328-r9 539
 SHA256 fa56204f68229db6ab2e26b3c62f9951eea925a8299c363112cdcd4059a6b003 files/digest-xine-lib-1.1.2_pre20060328-r9 539
-MD5 bf7cc4bedf1f07aa6ebdb47df5793fb4 files/digest-xine-lib-1.1.2_pre20060606 542
-RMD160 452cbb600c6dd4af6173e1f1bd1d10d3c3c36483 files/digest-xine-lib-1.1.2_pre20060606 542
-SHA256 a8b0d4e47083e6f3f08a057909278d0adc0a2a0e2a6820eb2e87523623be47ad files/digest-xine-lib-1.1.2_pre20060606 542
+MD5 825bcfb7cf337be265e73b53235a3bcb files/digest-xine-lib-1.1.2_pre20060606 542
+RMD160 37c9823606bcf89a2c18e6b2f52647366fb15759 files/digest-xine-lib-1.1.2_pre20060606 542
+SHA256 3cefb741c82eb3fabd124fb34d4264b1189ff53afa8f9ef3d809d5232394dd85 files/digest-xine-lib-1.1.2_pre20060606 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEhtqVAiZjviIA2XgRApPrAJ93Q1wQ1hoNJ5ZiGQImC9jOxKwYVgCfc2vR
-qQTpT+UQA8S4jheHaigybuU=
-=qwOP
+iD8DBQFEhygjAiZjviIA2XgRAizjAKCjtzwfyS3VfhHTvExgE8l4S3J6bACg5juV
+7yTDmH0C+JWjvGgGOG8lcOk=
+=WRiP
 -----END PGP SIGNATURE-----

diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606 b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606
index 9def4193b5c7d781a4ceaffe0fd236901a4f5029..bae1144b4ac41b74211315453db6b110da671aa4 100644 (file)
--- a/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.2_pre20060606
@@ -1,6 +1,6 @@
 MD5 04248860a422a7fd2a050bf3333f5954 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
 RMD160 a53a32bc5df800ad2072973224fe8c426caaefa7 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
 SHA256 c00e378c87e669c60936b71aaaa6eb320dcf202835f7d7fca168efc026bcfb94 xine-lib-1.1.2cvs20060606.tar.bz2 6509453
-MD5 77c3baa2b0742db77a3662a27c38bef0 xine-lib-patches-46.tar.bz2 29276
-RMD160 bd35b4c8234cbe865817b1722c569d2e22491224 xine-lib-patches-46.tar.bz2 29276
-SHA256 6dfd5d0a28b7c6a2e7ed68e8f5432b2f35880df3d590e65d4439d47e4be7bb84 xine-lib-patches-46.tar.bz2 29276
+MD5 42ad7685fb7d45d346c0bc63fa3a2033 xine-lib-patches-47.tar.bz2 73772
+RMD160 9b19dafd094d24b47d1e20b0a58adc285199b05b xine-lib-patches-47.tar.bz2 73772
+SHA256 2c5745da1cd58d9a83195163b8733f609be7549ede9f06e4a75006503fbde6cc xine-lib-patches-47.tar.bz2 73772

diff --git a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild
index a5ed17d9433655d962545863f120e41df67bb4fb..502817c85b583137670d5140c55cf824ca998df5 100644 (file)
--- a/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild,v 1.1 2006/06/06 19:21:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.2_pre20060606.ebuild,v 1.2 2006/06/07 19:25:15 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -18,7 +18,7 @@ else
        SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 fi
 
-PATCHLEVEL="46"
+PATCHLEVEL="47"
 
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -95,9 +95,15 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       [[ -z $(test-flags -fvisibility=hidden) ]] && export EPATCH_EXCLUDE="237_all_visibility.patch"
+       EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
 
-       EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
+       if use nls && [[ -d "${WORKDIR}/patches/poupdate/" ]]; then
+               ebegin "Updating translation files"
+               cp "${WORKDIR}/patches/poupdate/"*.po "${S}/po"
+               find "${S}/po" -name '*.po' -exec basename {} .po \; \
+                       > "${S}/po/LINGUAS"
+               eend
+       fi
 
        # ffmpeg doesn'g use libtool, so the condition for PIC code
        # is __PIC__, not PIC.