Change the dep to block older versions to get more meaningfull block message. Wrt bug#430464.

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

3 files changed, 9 insertions, 106 deletions

diff --git a/app-office/libreoffice-l10n/ChangeLog b/app-office/libreoffice-l10n/ChangeLog
index 146d1d978020..8e136da81ec6 100644
--- a/app-office/libreoffice-l10n/ChangeLog
+++ b/app-office/libreoffice-l10n/ChangeLog
@@ -1,6 +1,11 @@
 # 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.55 2012/08/09 09:12:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v 1.56 2012/08/10 12:03:10 scarabeus Exp $
+
+  10 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -libreoffice-l10n-3.6.0.ebuild, libreoffice-l10n-3.6.0.4.ebuild:
+  Change the dep to block older versions to get more meaningfull block message.
+  Wrt bug#430464.
 
 *libreoffice-l10n-3.6.0.4 (09 Aug 2012)
 
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.4.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.4.ebuild
index f3690032344f..51a4b601930c 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.4.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.4.ebuild
@@ -1,6 +1,6 @@
 # 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.6.0.4.ebuild,v 1.1 2012/08/09 09:12:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.4.ebuild,v 1.2 2012/08/10 12:03:10 scarabeus Exp $
 
 EAPI=4
 
@@ -41,10 +41,8 @@ unset lang helppack langpack lang2
 
 RDEPEND+="
 	app-text/hunspell
-	|| (
-		>=app-office/libreoffice-$(get_version_component_range 1-2)
-		>=app-office/libreoffice-bin-$(get_version_component_range 1-2)
-	)
+	!<app-office/libreoffice-$(get_version_component_range 1-2)
+	!<app-office/libreoffice-bin-$(get_version_component_range 1-2)
 "
 
 RESTRICT="strip"
diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.ebuild
deleted file mode 100644
index cce3af8053a3..000000000000
--- a/app-office/libreoffice-l10n/libreoffice-l10n-3.6.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.6.0.ebuild,v 1.2 2012/08/08 15:54:27 scarabeus Exp $
-
-EAPI=4
-
-MY_PV="3.6.0"
-
-RC_VERSION=".4" # CHECK ME WITH EVERY BUMP!
-BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm"
-
-inherit rpm eutils multilib versionator
-
-DESCRIPTION="Translations for the Libreoffice suite."
-HOMEPAGE="http://www.libreoffice.org"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="offlinehelp"
-
-LANGUAGES_HELP="ast bg bn_IN bn bo bs ca_XV ca cs da de dz el en_GB en en_ZA eo
-es et eu fi fr gl gu he hi hr hu id is it ja ka km ko lb mk nb ne nl nn om pl
-pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
-LANGUAGES="${LANGUAGES_HELP} af am ar as be br brx cy dgo fa ga gd kk kn kok ks
-ku lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sh sr ss
-st sw_TZ ta te th tn ts tt uz ve xh zu"
-
-for lang in ${LANGUAGES_HELP}; do
-	helppack=""
-	[[ ${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 ) "
-	SRC_URI+=" linguas_${lang}? ( ${helppack} )"
-done
-
-for lang in ${LANGUAGES}; do
-	langpack=""
-	[[ ${lang} == en ]] \
-		|| langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
-	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"
-	IUSE+=" linguas_${lang}"
-done
-unset lang helppack langpack lang2 i
-
-RDEPEND+="
-	app-text/hunspell
-	|| (
-		>=app-office/libreoffice-$(get_version_component_range 1-2 ${MY_PV})
-		>=app-office/libreoffice-bin-$(get_version_component_range 1-2 ${MY_PV})
-	)
-"
-
-RESTRICT="strip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-
-	local lang dir rpmdir i
-	local ooextused=()
-
-	for lang in ${LANGUAGES}; do
-		# break away if not enabled; paludis support
-		use_if_iuse linguas_${lang} || continue
-
-		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})/
-	# 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/}/
-		doins -r "${dir}"/*
-	fi
-	# remove extensions that are in the l10n for some weird reason
-	rm -rf "${ED}"/usr/$(get_libdir)/${PN/-l10n/}/share/extensions/
-}