Stop using basis-link as then builds fail on collisions :/ Fixes bug #384811.

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

4 files changed, 151 insertions, 24 deletions

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index 24522dc64f7d..b29538391241 100644
--- a/app-office/libreoffice-l10n/ChangeLog
+++ b/app-office/libreoffice-l10n/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/libreoffice-l10n
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.7 2011/09/18 09:58:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.8 2011/09/30 11:45:57 scarabeus Exp $
+
+*libreoffice-l10n-9999 (30 Sep 2011)
+*libreoffice-l10n-3.4.3-r3 (30 Sep 2011)
+
+  30 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-l10n-3.4.3-r2.ebuild, +libreoffice-l10n-3.4.3-r3.ebuild,
+  +libreoffice-l10n-9999.ebuild:
+  Stop using basis-link as then builds fail on collisions :/ Fixes bug #384811.
 
 *libreoffice-l10n-3.4.3-r2 (18 Sep 2011)
 
diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest
index dd3942065736..bf0a56aefd6a 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -154,23 +154,24 @@ DIST LibO_3.4.3_Linux_x86_langpack-rpm_xh.tar.gz 8219580 RMD160 d0275c82d5078c57
 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-CN.tar.gz 1772291 RMD160 19218e0cf581a0381662008a8d48857964e9ac1d SHA1 31780f19f2ec0577a73586c5e14020e95a815ebc SHA256 5f13189f7f689e71fe2556dca8e53240af3d7df91839de368c57b330545c7033
 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-TW.tar.gz 1764731 RMD160 33de70443758e3cc38d62c254ea1bc98574f2bfc SHA1 d813ab13c16fba69e549b143d6948f08b1c0d62c SHA256 e1dcba904952b3feef0b9c3957960c49cb6d720b1d135becac1ddc71e67344a6
 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zu.tar.gz 1721114 RMD160 058a2e21902ab9312464c9976ed6fa1edb341afe SHA1 0875fd47bb40fb0875c5c492cedcca60917dcee3 SHA256 5f866e2061b9dabee78a81fe9743b539e25a725d17312a66eecfd0139eab4a65
-EBUILD libreoffice-l10n-3.4.3-r2.ebuild 3529 RMD160 fbbc7f7f3bbf897d887571e75b2d5d6033be4353 SHA1 f155fe8c1bc0ef38b2a232d07371d72b9167d5d1 SHA256 4f74fc6227b13b52f545940ac5aa5672768342773dc94b1fe0846e0e360d1422
-MISC ChangeLog 1465 RMD160 8b65ef68a6472192302440dd97db0d24dcbf90d9 SHA1 ff0fe3d5743f1fb9175dedf22c04eb4828deea31 SHA256 4e3d5bbab710dad18561a9f790ce9d9a68073a170e33f3abb713f4ab6399f07c
+EBUILD libreoffice-l10n-3.4.3-r3.ebuild 3801 RMD160 4205f32ae491a2ea0dd41805e2a82732f644301e SHA1 20406d1471afc8d082cdb01c2a50137c2edfb5dd SHA256 2c223ec5f636a9592730896186dd26eefa039d20ad7cd43687900906161655d0
+EBUILD libreoffice-l10n-9999.ebuild 3820 RMD160 0f195c68e48ec38d2b7d5aa96aae7e7ddd2a7835 SHA1 9e2532dc8b241298c2c603529fddcf1811cfb252 SHA256 4b631487278a1f7a3f77085a23e2807b4c67e6ffb35060b1547053b9a6e7c624
+MISC ChangeLog 1785 RMD160 d21823acf17e24ed98bd0b5b3cd2bc2b141a4edc SHA1 40e611815f175a0e13345b00a9bbe7bfe5270503 SHA256 3d91e6504003f4554e1b14791731d3520a02c35776e6abf1aeb47e7fc669811b
 MISC metadata.xml 280 RMD160 b78a155215ec280b8b95fd2765aec06affdeb1ea SHA1 2236557635125ec389aee93c5cb052475a1ce472 SHA256 23e40d2f7f689371ad553226289772b45b7e8063ce88025615e5d86b208173df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOdcC/AAoJEOSiRoyO7jvorbkP/ixJeZCZmQy9HIy9lFhDzLHr
-3dbFOUCfOxJnx6B/1QW65bUDv1u0gft4VasG6JxQng8tn1GfkX1s7bDm9XtT3z7a
-WVV0OG2Ycou9Z+Clh/kIqwKc0p9mpHlYjAvseJwsRCGU39eEPCOKkZkMI+feFGXP
-wrW//xry/os6VyJuSCLfg+RlIK0ds3bWZDW00GC7MtLSGhpul5ruy4W97uwPr2dQ
-hNiiJCW2Vkr7cfZRMBuoPyuw7PFGtDmFtUyv5Dj/i3xxzp4icXxh5f3PhjM5t7dR
-Vr6dGcInX1SU0ULlpRh1KhJs9k7l47XV2iLccDegdxgJpmFfhDBmKgWZiPb9/P1c
-tQNzE/QJaLJ/T4q43yt8+aHrkZ6RqSifAPcVixjS7Sifk/DXPk+xDFzd9hYaeSji
-g/JU69b0+GiU37hjhF7YZCNXxmGxGBLM78dBjt/ic+Lt0TN47479ArEDMFeEQRMc
-vZ7f77Xv4DYesAbTentiFTLVsB8efMyYL+c95Zwzp5hywaVx0lWG8ZEQTZfH2iQG
-NFzXeGN83To1zmEIszn3ADXU3sUMKumUVBzede69tK5U1yCoEJw9QyFCKSu5C3pL
-nczHfa90G/6vhFQnCmJ703mqA07LTqmIeMpb5HGdzQMYb9yjU/ASD/L/UTQ3SQY5
-zJuDF3lMtlYV/i4gPlcy
-=OpdR
+iQIcBAEBAgAGBQJOhavUAAoJEOSiRoyO7jvoWbQP/jc9FBoXXxWHWCJSKmAF6bji
+UIiX4Lyg890B0/74lJzuozQLB5cwjZL4uUnfSjsr6zzCMs8GlhXksptRtYL6K+ds
+8PI5MHqT5jAYioQk/ag8rTLfbiQFDBjt4ldoeZgKlVP1DlHWzfYDGnVK6FCfQ5gG
+uyUsV+iYRuD0MA/6jau23OHHGrlpzPFETSpHx2wwZex6IgxsTkK+ZRH+6XLP2dPH
+ndFTl0CPY5jGzRk/Yj3ZAGnlBHgW8mmJF7bKSO+YeBJyprtJztfc9j1gh+Q5kpN7
+e0a3pY/7bw9e7BGqP9Z8tiOz6t5bAmHq6IhzLGK4kbI6j6YCUBUjMz9UTAwlTlOf
+ORmh4OsQGG01s8ZNXG4kVZDBu+DSTaASZy3pcgZm64DiqGP4DnS090JYbvU7i+2o
+UalnngkVAMDfisSGW+NHUkz2KWbO/27VfnXbMwv78OjiFx9CrcZVDQ6NkYkSGogh
+1kE4n0yp/jQYmdHjCD22ECdZdLOHwp9GZV5mo/a9SFqOKq16e2p8aDUcF2sE72x8
+MsiRb+jPHlvJLuymtr+QXEZ43Su2yqsGdEL8UFuGg6sS8POKrdYaDEvmwW86U0Dn
+7sNgI0xN9zHoo3BkpIzhMmrwQqoeBpC1IKQNOjrsjHNW1UmegqscQq87ODUlMUI/
++hBdED0CRfZlEhhJxNPc
+=jKzl
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild
index 9628b5fd36d6..8a5428fc684e 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2011 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.3-r2.ebuild,v 1.1 2011/09/18 09:58:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild,v 1.1 2011/09/30 11:45:56 scarabeus Exp $
 
 EAPI=4
 
+[[ ${PV} == 9999 ]] && MY_PV="3.4.3" || MY_PV="${PV}"
+
 RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
-BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${PV}/rpm/"
+BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm/"
 inherit rpm eutils versionator
 
 DESCRIPTION="Translations for the Libreoffice suite."
@@ -31,10 +33,10 @@ for lang in ${LANGUAGES}; do
 	langpack=""
 	if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
 		[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
-		helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
+		helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
 	fi
 	[[ ${lang} == en ]] \
-		|| langpack=" ${BASE_SRC_URI}/x86/LibO_${PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
+		|| langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
 	SRC_URI+=" linguas_${lang}? (
 		${langpack}
 		${helppack}
@@ -74,7 +76,7 @@ src_unpack() {
 
 		# for english we provide just helppack, as translation is always there
 		if [[ ${lang} != en ]]; then
-			rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
+			rpmdir="LibO_${MY_PV}${RC_VERSION}_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
@@ -82,7 +84,7 @@ src_unpack() {
 		fi
 		if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
 			[[ ${lang} == en ]] && dir="en-US"
-			rpmdir="LibO_${PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
+			rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
 			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
 			rpm_unpack ./"${rpmdir}/"*.rpm
 		fi
@@ -94,11 +96,16 @@ src_configure() { :; }
 src_compile() { :; }
 
 src_install() {
-	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/basis$(get_version_component_range 1-2)/
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
 	# Condition required for people that do not install anything eg no linguas
 	# or just english with no offlinehelp.
 	if [[ -d "${dir}" ]] ; then
-		insinto /usr/$(get_libdir)/${PN/-l10n/}/basis-link/
+		if [[ ${PV} == 9999 ]]; then
+			# Bump me when it gets slotted ; also do revision bump
+			insinto /usr/$(get_libdir)/${PN/-l10n/}/basis3.5/
+		else
+			insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
+		fi
 		doins -r "${dir}"/*
 	fi
 }
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-9999.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-9999.ebuild
new file mode 100644
index 000000000000..eb4405e44cec
--- /dev/null
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-9999.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-9999.ebuild,v 1.1 2011/09/30 11:45:57 scarabeus Exp $
+
+EAPI=4
+
+[[ ${PV} == 9999 ]] && MY_PV="3.4.3" || MY_PV="${PV}"
+
+RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
+BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm/"
+inherit rpm eutils versionator
+
+DESCRIPTION="Translations for the Libreoffice suite."
+HOMEPAGE="http://www.libreoffice.org"
+
+LICENSE="LGPL-3"
+SLOT="0"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="offlinehelp"
+
+LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
+en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
+kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
+pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
+th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
+# Only some languages have the translations availible.
+# This is always subset of the above, so no need to add it again to IUSE.
+LANGUAGES_HELP="bg bn bo bs ca ca_XV cs da de dz el en en_GB en_ZA eo es et eu
+fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt pt_BR ru si
+sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
+for lang in ${LANGUAGES}; do
+	helppack=""
+	langpack=""
+	if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
+		[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
+		helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
+	fi
+	[[ ${lang} == en ]] \
+		|| langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
+	SRC_URI+=" linguas_${lang}? (
+		${langpack}
+		${helppack}
+	)"
+	IUSE+=" linguas_${lang}"
+done
+unset lang helppack langpack lang2
+
+# dictionaries
+SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
+nb nl nn pl pt ru sk sl sv tn zu"
+for X in ${SPELL_DICTS} ; do
+	SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
+done
+RDEPEND="${SPELL_DICTS_DEPEND}"
+unset X SPELL_DICTS SPELL_DICTS_DEPEND
+
+# blockers for old libreoffice with linguas bundled
+RDEPEND+="
+	!<=app-office/libreoffice-3.4.3.2
+	!=app-office/libreoffice-3.4.9999
+	!=app-office/libreoffice-9999
+	!<=app-office/libreoffice-bin-3.4.3-r1
+"
+
+RESTRICT="strip"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	default
+
+	local lang dir rpmdir
+
+	for lang in ${LINGUAS}; do
+		dir=${lang/_/-}
+
+		# 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/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+			# First remove dictionaries, we want to use system ones.
+			rm -rf "${S}/${rpmdir}/"*dict*.rpm
+			rpm_unpack "./${rpmdir}/"*.rpm
+		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/"
+			[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
+			rpm_unpack ./"${rpmdir}/"*.rpm
+		fi
+	done
+}
+
+src_prepare() { :; }
+src_configure() { :; }
+src_compile() { :; }
+
+src_install() {
+	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
+	# Condition required for people that do not install anything eg no linguas
+	# or just english with no offlinehelp.
+	if [[ -d "${dir}" ]] ; then
+		if [[ ${PV} == 9999 ]]; then
+			# Bump me when it gets slotted ; also do revision bump
+			insinto /usr/$(get_libdir)/${PN/-l10n/}/basis3.5/
+		else
+			insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
+		fi
+		doins -r "${dir}"/*
+	fi
+}