From 9e625712c459127c00c7bb4b7f9e8df9f5de8ca6 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Wed, 11 Jan 2012 17:31:11 +0000 Subject: [PATCH] Fix unpack phase Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- app-office/libreoffice-l10n/ChangeLog | 6 +++- app-office/libreoffice-l10n/Manifest | 30 +++++++++---------- .../libreoffice-l10n-3.4.5-r1.ebuild | 7 ++--- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog index be27840798d3..a09a77f9240a 100644 --- a/app-office/libreoffice-l10n/ChangeLog +++ b/app-office/libreoffice-l10n/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-l10n # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.27 2012/01/11 12:06:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.28 2012/01/11 17:31:11 scarabeus Exp $ + + 11 Jan 2012; Tomáš Chvátal + libreoffice-l10n-3.4.5-r1.ebuild: + Fix unpack phase *libreoffice-l10n-3.5.0-r2 (11 Jan 2012) *libreoffice-l10n-3.4.5-r1 (11 Jan 2012) diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index b2029193444b..b22cc3579d65 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -482,24 +482,24 @@ DIST LibO_3.4.5rc2_Linux_x86_langpack-rpm_zu.tar.gz 1720207 RMD160 3353fb3c51ea8 DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859 DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4 EBUILD libreoffice-l10n-3.4.3-r3.ebuild 3888 RMD160 9240dcd63246a6cb1ded275adbd865dfb2d8d6ce SHA1 e4daa4748250b26aa2274e2bc0b806cbd4b0a454 SHA256 b2feb0fade7fed18c19ab3d7c533d99c9f09376be21338c5c0382e918fe96ad4 -EBUILD libreoffice-l10n-3.4.5-r1.ebuild 5037 RMD160 1f97b26dc9a7d210710cddafa72052d73e247ead SHA1 dd083c714fd794aa694d3ef7977f46e0fee06ca1 SHA256 8463f3b0c264861cc9141f84ad13c010f26fee9fac7bcad57333bf2070a1e80e +EBUILD libreoffice-l10n-3.4.5-r1.ebuild 4966 RMD160 208a2cf2b6372fe1748728f7b8b0d8b3bf7900d2 SHA1 64d12f47ad1a5bee0d323a4e9163e6149f1e3139 SHA256 38c0d49d570bb08db4571cebee63198cea5cf4cb967e0242f2c7a41bf06a04fb EBUILD libreoffice-l10n-3.5.0-r2.ebuild 4827 RMD160 ec51dd253400638266a73899a709bd03772d2c7b SHA1 0e39ff6928521cd30e97a8939333f2f300427846 SHA256 1c6c61f47522550c3267c74b6b78e3007bf0597bfc832ce19c66d1698d14cccb -MISC ChangeLog 5430 RMD160 023adc2291b51fa3d5ff6c26102082dabc0b35d2 SHA1 c6fc35e401fb2ff5f59def769875c443d850f078 SHA256 c883dcba0207c32126514acb2ba3692ab255e85e1fde5f0e30c06d6f63fa8781 +MISC ChangeLog 5541 RMD160 97330ef8795da352ff4521b033081e9be047713a SHA1 9e6e9f64083cf3227738e7a7c5a61792d41b6f8a SHA256 ce1e51816d6696478987d84f774acb386a6d6d179a0c9114cca6fd3c17a5b870 MISC metadata.xml 347 RMD160 9f877917cd81032044930b5585910cacd590ea41 SHA1 71e2840a19fab2cf3a6f1c32e305e457cdb29ba3 SHA256 8b80b71771e14ffebe84e2537b6207a459d1160b4d0880773657ce2f082eae0b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBAgAGBQJPDXtNAAoJEOSiRoyO7jvoA3IP/2q2uTwh2IZAiMOsL7c3ZTOC -38OIsTvm3cnouQOisxJGf4fRLni5MBNRWRqsF2wzBUgGSY2wPsp6ouHhVdOPIiiF -stiD62uAsMAp7ZQ+kvC9nFtGafOYQOuxtNRUfZnObb67Lf5UL4h/hZIqj1c85D0L -m9pq7ExNAT2xpjhqv4YsvIMdox3OPc4ZNdOtm4NaxzkVELpZi7BoY2RiZKHG3Yuc -C9SZ46o3s21Wr6sZYgqL0+F3Qd8fWbBmmu+iMKr06FkLPCkxXoR5gg7Wlk8Evnqb -xk/TKwZfSWBHs6P/ZkzLVb/stOqLi+LmXwVpQ9MRC366N2Ts5PlTjMVITqhWyHUP -QEelWN9qkfoLAZFSPhPHmH3gw7R43MAwe1FA0xosAUtBdWr3DVtiOxdiTR0G8tCs -YTjbOqcccsLmKv6CZniopG6tAuDLfZzKjzAloZ+gl5TX6Vxdfcfze+fGh3sFQIsZ -L+bqmy12MyMBV9yyNnHSCy4h9hE7FJZf0GTmsjl1PdEfTkHmZKekvy+ptlmzwDJY -uGlT7NYjiO/TCIfbYxNKGLI3ypipcfRkMLy3q9/23DFA44fq9cfcpk5OqzXVN3/+ -Hs/Q6+OH/U5qjdNUhEpNHpOP+czQj5VB3rSnAXBzAy1xWOw8w43rEYrvA6tn5+Yr -sVoK/WWXumCrnzzRWYSD -=auoA +iQIcBAEBAgAGBQJPDceqAAoJEOSiRoyO7jvoE5EP/1P/l9pn6Cz7fujwVQpet2Nk +B/ApNA+IjcVgQZuZ5q2UrNBgKdZGu/Ji1lAdGjQ94J6FKE3oXehar/Dd1SLnAOLK +MBYX9LJQ1DD3mSJbCf0xKz/fDD8SCK4Qii/Ypk0BTKvj46R0j4iEhyfL7duiH3T9 +BokRDlymB+b8LRGVyURDUo9TlHOrKkMA88bw+CjDtXqSAG7lbkBLt3o65gJ+RJiR +K+1JLPjsBKa+eF+rWTa34RM6PuWAVsRcbwuq88lZ9VfIdne8ljyKO5HAznjzGDJA +xjsYTucTJpHgBdZ6SvCaaelC4MU/17xZlva06d6plQLtASMvfABaYJY8dtG6FdEO +K+JC6ZGdXVnoMHcg8sO+c+9vukktBVAOY9tG6h4B/X5Ck4cp/tYouy48/JINWzPq +C5D36NB8u88T+ku2RxWLH2jFdnItaOj+ImfT7ttQ1wULXKOJ5P3YK10C5sSauGNT +9iv6xgvkvEwa7JFXyaympkg/K38QJHXqRScLrMdzUqNQjQROtGJiUvJSwUYO6Tqn +VtRYefgr65hcZ294qLVfAZv9QIFJD/cqtU3UegzasfPkFRy6WqJjbhb31yNdWtlF +dcax3dWHNmnPKPuTFbHCzOg/HrE9beaAk40IvIpn6t357BsZ2IzNMS1Pcj5qAy/E ++UqBhTHZymlYKEfxgVv/ +=Xs0k -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild index 60536e6b73dc..bbd49fb547f6 100644 --- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild +++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild @@ -1,12 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild,v 1.1 2012/01/11 12:06:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.5-r1.ebuild,v 1.2 2012/01/11 17:31:11 scarabeus Exp $ EAPI=4 MY_PV="3.4.5rc2" -RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP! BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/testing/3.4.5-rc2/rpm/" OO_EXTENSIONS=( @@ -104,7 +103,7 @@ src_unpack() { # for english we provide just helppack, as translation is always there if [[ ${lang} != en ]]; then - rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/" + rpmdir="LibO_${MY_PV}_Linux_x86_langpack-rpm_${dir}/RPMS/" [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\"" # First remove dictionaries, we want to use system ones. rm -rf "${S}/${rpmdir}/"*dict*.rpm @@ -112,7 +111,7 @@ src_unpack() { fi if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then [[ ${lang} == en ]] && dir="en-US" - rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/" + rpmdir="LibO_${MY_PV}_Linux_x86_helppack-rpm_${dir}/RPMS/" [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\"" rpm_unpack ./"${rpmdir}/"*.rpm fi -- 2.26.2