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

(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

3 files changed, 135 insertions, 9 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/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
+}