fix live ebuild wrt #418361

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 29 insertions, 30 deletions

diff --git a/net-im/psi/ChangeLog b/net-im/psi/ChangeLog
index 0efa2e37641b..165b409231d7 100644
--- a/net-im/psi/ChangeLog
+++ b/net-im/psi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/psi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.235 2013/07/10 04:56:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/ChangeLog,v 1.236 2013/08/04 17:32:29 hasufell Exp $
+
+  04 Aug 2013; Julian Ospald <hasufell@gentoo.org> psi-9999.ebuild:
+  fix live ebuild wrt #418361
 
   10 Jul 2013; Patrick Lauer <patrick@gentoo.org> psi-0.14-r4.ebuild,
   psi-0.15.ebuild, psi-9999.ebuild:
diff --git a/net-im/psi/Manifest b/net-im/psi/Manifest
index d1c58fe5020a..aafbaed8b1ee 100644
--- a/net-im/psi/Manifest
+++ b/net-im/psi/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX psi-0.14-drop-debug-cflags.patch 1098 SHA256 ca7878131af3697275fe7b83ffdbd89886ba6cea27a38aff495b0eb60c5ca5e6 SHA512 56f7dc088b8a6f8d06638932c1c5f2bd08461fd87764e1690fdeea9e28f266b7a8d7860b048db56ed6f98411a9f70738e1babd54248d2a0b5f055e6efc53e6dd WHIRLPOOL 47096000792e25ec80addddccb9d104ded35296d195ebf99b72ec2dc61d391657467d8d231262e7e3f60c66079bf199540faba3671b61f6c802e75d40724b9ad
 AUX psi-0.14-input-validation.patch 7440 SHA256 4f8f52b6846b238586d8584d8ca5a62b56bd5bfad328765eb157dc95c83bf017 SHA512 e6f1676c57c71c5b43f1e913299cdd2ba5323dd39f2d255d8aee7ca63a429023f6ef477382894e4d358c08ae1b64d4ebe369aaa0c3b237fd7f6f72c508deb329 WHIRLPOOL 08bd4fd7ef168b474b5bcefb4d0bc43c85d7f9361661c445cd7203502beda4343ab45cc4f0477a00dd15d40bdf1d8c434736bb2f2fd803ed11ee3c15d60ddd14
 AUX psi-0.14-minizip-detection.patch 6587 SHA256 7aba10692d2bd371f0c009abc8e99d2267f47a1ac15765294e232bd0ecd15f31 SHA512 02d62baa6a65c99ca631deccc71beeb5cb521a457535c01e71b04e6f6eb1f58ea54d43b27b9d331731d49123d8d4681a4788c89aacb5afb84faf9a78896d2474 WHIRLPOOL b8dcd6eece7a022eb9cdd7cfd696fcf65f8672689141fec6881f7d21fa2ca016bec494c7d1672a38343827c11d82ef3fe4b07517df3969caa6d51d638429c261
@@ -22,6 +25,17 @@ DIST psi-extra-iconsets-r1428.tar.bz2 3214991 SHA256 1c7cb4a6915c43e7728b96d8ead
 DIST psi-extra-patches-r1428.tar.bz2 131700 SHA256 a458f44773c53abe369b174d220038d3b1dce6bbab981d6baf7ca48ec211cf48 SHA512 6fe55bb5c97e672c05eb125defa590cce9575be339a7366d49c2c50aff19fc7d9a5dcf7feece4781e88cd3504c8e959a637c1a4a3e571d52c42e63edc0f60a78 WHIRLPOOL 9e70a07eb8fef72606e28ae2151003aebba724f86b29f9c46f3850a77b1647d9ce5746576c3e41f79b885b162b9889f233f77c2c5766103f5add6d5bc8088b40
 EBUILD psi-0.14-r4.ebuild 4952 SHA256 0e460fe971c045ad71dec456738aaa574c12b721681b5c416f3240b55f57e0b6 SHA512 c7ca4ae3d6614de6c33322fd35ef134b614b90fd4bd0ecdec472b9f0497f469579e84f2762063f4395f2a7ba45ce57a7b61d78757f0dd0bc38d8d0f71d43454a WHIRLPOOL af74a90d3b8b49f9747f5e7ee5aefd04c4f05c83897d65463dc02717d259ae71f6dcb02e744ca47317b91710c1e21ff38e0d1d070eaeaefa3067b6aa1becaa83
 EBUILD psi-0.15.ebuild 2812 SHA256 4ad3bda723f66bc17a01c36219751de843a9f78347ecaa46e7c11b6cc00bb055 SHA512 d9309c6203f842c9bae1fad8748abb971eb045a833d8b744b24e28018a33db14049d1123f6a99e9cd0adfe20f7f103122a7f7ed024926d754c3ce8d12ec07fd8 WHIRLPOOL e89953459ed16bd9f51e262fd29c091f9c0e05317cc29faf09d9d91de6f024888368da8fe76cc356335355f431e6c9f252ed9c5c4af2d6c88846b7c2601194ac
-EBUILD psi-9999.ebuild 6320 SHA256 734f491f995a6379e686196021431b7cade2381de197df5abc9e165c353b42aa SHA512 f00da791afdcea50a7b2d373bcecb3256a1fe4f0dfe30c921b8ca988a69d7f6b016f28ac07252c44a33aafdef22640207a6545a69b7bf3beb43c70227b3d4864 WHIRLPOOL 732d7075755ab3b2ece3c87a0d6bbbffaa526e1288aa813a742c182f406983c2fca270d72a4cbbf7a5afdd2c13320ef1320d190aaf16e64ef541ff3d36d52e09
-MISC ChangeLog 34633 SHA256 097394032abcdbe6ad0f31d1ea75e934f51b8a23c9e28b87ae6e272a2afa3175 SHA512 b87a7990430d93ee4283f27027069dc4573ce48f23eb0dd40ff89a06844634a9dba6e0eb564745c0d1903b9a10d39d22ccf705ca57670b24654eacd7bd8351f3 WHIRLPOOL e9c2f7b8bf583301e9fc8be65e3b22c2e01edad37e1518bbe2f50fa1f9981b0f12c8026ff6d304a79de5ee1bd9c3bcc3ffc55773709315e217877d9fb5fcf2db
+EBUILD psi-9999.ebuild 5676 SHA256 192aee54b59ad4e988a953b658c7c980770b1a2578cdf9979fb38d57c5e7276f SHA512 2c36d91e55a4ab11ceb9d84665023993c0d31a1b55294c58ae03a6f06740928a5208e2058f06ac176dcc73e5b60c0443e9fd98919463282d591f3098c7f87bd7 WHIRLPOOL 6b8123f4f66626094d5dd6d8f393b0d29d059e4be8c9d13d1514b71f3c8432c17aa6f0f05987100420c9a3e8bbadbc2634359a2014958a5b851bf6180574d28a
+MISC ChangeLog 34733 SHA256 72aeb08666f8200e8f2a6076868960544bd7426fb51bfd581e1b2f4a3e873946 SHA512 b4c2c6371029959e8c69395a2fc48ac8a9270ff27bcab415e01fd5a3cce9226248614d82316f034a93534ba6b0f456369c86b1faa281559a0e5c7fba2f2078e0 WHIRLPOOL 07722534de1a48ba5049239c1f922ee62223c9d8b5b75a41a08c0f389de522331799d34c33a13bf1a6e902f46815337cce7f9f39213e12ebe29159b1e151197f
 MISC metadata.xml 1017 SHA256 18b09c4d915f3d518fb00c206b5d20c71a7d2b2b06c65a295d7e6bc3daeefb4c SHA512 49733b53be8e83345c641dba566a748d05618f18c32f4937eb51c020c15e1f37daafdd3d02660cf227d7ef4a7bb010cb4dbecc736e4331fdac11543d5805ed2d WHIRLPOOL df151f571bcc97cbd0dc37a5ff188754fa808aa7d62c0b4a69a9f906d4c6a1762d0dee4fca9533cee8925af4186bb7cd3caf3d8a137df3638094b416535b3590
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR/pAyAAoJEFpvPKfnPDWzHtIH/0UK2HZGp5f/AAhjomwDABzi
+YIaN4pQmy7X/WOl2b2X9tFApKxC7DJt0Dd7Irg8koiAT+lNRllZeJ+aBQy6LkwGj
+y5d8XCnbodFFF0HYvROa/0JHm18PTzIMLf+x+jYTSVzkAR1Mmj7urBvbkAgD63xX
+kUXCoZUE5MUphrDyufbisBAQcBXj9zXhMTLF6NPpXFwV7ZUVV36cmZ6z7Ez71BQf
+ipbkrQDgabDw0DU5eQq9Mwi9XejsEOXZy6CLyMewfacGjRROsE/cjC9ctpoO/wfl
+9Uu/d9gg8ty6wpIbjSyUH/1KqEiRisGW6eayB5OeRCaxvZOsKwMiJ9mEPe5NPME=
+=ESPc
+-----END PGP SIGNATURE-----
diff --git a/net-im/psi/psi-9999.ebuild b/net-im/psi/psi-9999.ebuild
index b85ffffc0828..044a472dccc6 100644
--- a/net-im/psi/psi-9999.ebuild
+++ b/net-im/psi/psi-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.18 2013/07/10 04:56:46 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/psi/psi-9999.ebuild,v 1.19 2013/08/04 17:32:29 hasufell Exp $
 
 EAPI="4"
 
-LANGS="ar be bg br ca cs da de ee el eo es et fi fr hr hu it ja mk nl pl pt pt_BR ru se sk sl sr sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
+LANGS="be bg ca cs de en eo es et fi fr hu it ja mk nl pl pt pt_BR ru sk sl sr@latin sv sw uk ur_PK vi zh_CN zh_TW"
 
 EGIT_REPO_URI="git://github.com/psi-im/psi.git"
 EGIT_HAS_SUBMODULES=1
-LANGS_URI="git://pv.et-inf.fho-emden.de/git/psi-l10n"
+LANGS_REPO_URI="git://github.com/psi-plus/psi-plus-l10n.git"
 
 PSI_PLUS_URI="git://github.com/psi-plus/main.git"
 PSI_PLUS_RESOURCES_URI="git://github.com/psi-plus/resources.git"
@@ -93,22 +93,9 @@ src_unpack() {
 
 	# fetch translations
 	mkdir "${WORKDIR}/psi-l10n"
-	for x in ${LANGS}; do
-		if use linguas_${x}; then
-			if use extras && [ "${x}" = "ru" ]; then
-				ESVN_PROJECT="psiplus/psi-l10n/${x}" \
-				S="${WORKDIR}" \
-				subversion_fetch \
-					"http://psi-ru.googlecode.com/svn/branches/psi-plus/" \
-					"psi-l10n/${x}"
-			else
-				unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT
-				EGIT_REPO_URI="${LANGS_URI}-${x}" \
-				EGIT_DIR="${EGIT_STORE_DIR}/psi-l10n/${x}" \
-				EGIT_SOURCEDIR="${WORKDIR}/psi-l10n/${x}" git-2_src_unpack
-			fi
-		fi
-	done
+	unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT
+	EGIT_REPO_URI="${LANGS_REPO_URI}" \
+	EGIT_SOURCEDIR="${WORKDIR}/psi-l10n" git-2_src_unpack
 
 	if use extras; then
 		EGIT_DIR="${EGIT_STORE_DIR}/psi-plus/main" \
@@ -137,8 +124,6 @@ src_prepare() {
 
 		qconf || die "Failed to create ./configure."
 	fi
-
-	rm -rf third-party/qca # We use system libraries. Remove after patching, some patches may affect qca.
 }
 
 src_configure() {
@@ -203,15 +188,12 @@ src_install() {
 	use doc && dohtml -r doc/api
 
 	# install translations
-	cd "${WORKDIR}/psi-l10n"
+	cd "${WORKDIR}/psi-l10n/translations"
 	insinto /usr/share/${MY_PN}
 	for x in ${LANGS}; do
 		if use linguas_${x}; then
-			lrelease "${x}/${PN}_${x}.ts" || die "lrelease ${x} failed"
-			doins "${x}/${PN}_${x}.qm"
-			[ -f "${x}/qt_${x}.qm" ] && doins "${x}/qt_${x}.qm"
-			[ -f "${x}/qt/qt_${x}.qm" ] && doins "${x}/qt/qt_${x}.qm"
-			[ -f "${x}/INFO" ] && newins "${x}/INFO" "${PN}_${x}.INFO"
+			lrelease "${PN}_${x}.ts" || die "lrelease ${x} failed"
+			doins "${PN}_${x}.qm"
 		fi
 	done
 }