From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R9bXe-0000VP-1s for garchives@archives.gentoo.org; Fri, 30 Sep 2011 11:46:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E14521C06D; Fri, 30 Sep 2011 11:46:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1F0E321C06D for ; Fri, 30 Sep 2011 11:46:00 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64B2264ACA for ; Fri, 30 Sep 2011 11:45:59 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2230) id 64A1120036; Fri, 30 Sep 2011 11:45:57 +0000 (UTC) From: "Tomas Chvatal (scarabeus)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, scarabeus@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice-l10n: libreoffice-l10n-3.4.3-r3.ebuild ChangeLog libreoffice-l10n-9999.ebuild libreoffice-l10n-3.4.3-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: libreoffice-l10n-3.4.3-r3.ebuild ChangeLog libreoffice-l10n-9999.ebuild libreoffice-l10n-3.4.3-r2.ebuild X-VCS-Directories: app-office/libreoffice-l10n X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal Content-Type: text/plain; charset=utf8 Message-Id: <20110930114557.64A1120036@flycatcher.gentoo.org> Date: Fri, 30 Sep 2011 11:45:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2d2e5d8dc27727adfbd500021c7409ed scarabeus 11/09/30 11:45:57 Modified: ChangeLog Added: libreoffice-l10n-3.4.3-r3.ebuild libreoffice-l10n-9999.ebuild Removed: libreoffice-l10n-3.4.3-r2.ebuild Log: Stop using basis-link as then builds fail on collisions :/ Fixes bug #3= 84811. =20 (Portage version: 2.2.0_alpha60/cvs/Linux x86_64) Revision Changes Path 1.8 app-office/libreoffice-l10n/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/ChangeLog?rev=3D1.8&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/ChangeLog?rev=3D1.8&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/ChangeLog?r1=3D1.7&r2=3D1.8 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ChangeLog 18 Sep 2011 09:58:49 -0000 1.7 +++ ChangeLog 30 Sep 2011 11:45:57 -0000 1.8 @@ -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=C3=A1=C5=A1 Chv=C3=A1tal + -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. =20 *libreoffice-l10n-3.4.3-r2 (18 Sep 2011) =20 1.1 app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r= 3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/libreoffice-l10n-3.4.3-r3.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/libreoffice-l10n-3.4.3-r3.ebuild?rev=3D1.1&content-type=3Dtext/= plain Index: libreoffice-l10n-3.4.3-r3.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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/libreoffic= e-l10n-3.4.3-r3.ebuild,v 1.1 2011/09/30 11:45:56 scarabeus Exp $ EAPI=3D4 [[ ${PV} =3D=3D 9999 ]] && MY_PV=3D"3.4.3" || MY_PV=3D"${PV}" RC_VERSION=3D"rc2" # CHECK ME WITH EVERY BUMP! BASE_SRC_URI=3D"http://download.documentfoundation.org/${PN/-l10n/}/stabl= e/${MY_PV}/rpm/" inherit rpm eutils versionator DESCRIPTION=3D"Translations for the Libreoffice suite." HOMEPAGE=3D"http://www.libreoffice.org" LICENSE=3D"LGPL-3" SLOT=3D"0" KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE=3D"offlinehelp" LANGUAGES=3D"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 k= k 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=3D"bg bn bo bs ca ca_XV cs da de dz el en en_GB en_ZA eo e= s 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_B= R ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW" for lang in ${LANGUAGES}; do helppack=3D"" langpack=3D"" if [[ "${LANGUAGES_HELP}" =3D~ "${lang}" ]]; then [[ ${lang} =3D=3D en ]] && lang2=3D${lang/en/en_US} || lang2=3D${lang} helppack=3D" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86= _helppack-rpm_${lang2/_/-}.tar.gz ) " fi [[ ${lang} =3D=3D en ]] \ || langpack=3D" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rp= m_${lang/_/-}.tar.gz " SRC_URI+=3D" linguas_${lang}? ( ${langpack} ${helppack} )" IUSE+=3D" linguas_${lang}" done unset lang helppack langpack lang2 # dictionaries SPELL_DICTS=3D"af bg ca cs cy da de el en eo es et fr ga gl he hr hu it k= u lt mk nb nl nn pl pt ru sk sl sv tn zu" for X in ${SPELL_DICTS} ; do SPELL_DICTS_DEPEND+=3D" linguas_${X}? ( app-dicts/myspell-${X} )" done RDEPEND=3D"${SPELL_DICTS_DEPEND}" unset X SPELL_DICTS SPELL_DICTS_DEPEND # blockers for old libreoffice with linguas bundled RDEPEND+=3D" !<=3Dapp-office/libreoffice-3.4.3.2 !=3Dapp-office/libreoffice-3.4.9999 !=3Dapp-office/libreoffice-9999 !<=3Dapp-office/libreoffice-bin-3.4.3-r1 " RESTRICT=3D"strip" S=3D"${WORKDIR}" src_unpack() { default local lang dir rpmdir for lang in ${LINGUAS}; do dir=3D${lang/_/-} # for english we provide just helppack, as translation is always there if [[ ${lang} !=3D en ]]; then rpmdir=3D"LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPM= S/" [[ -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}" =3D~ "${lang}" ]] && use offlinehelp; then [[ ${lang} =3D=3D en ]] && dir=3D"en-US" rpmdir=3D"LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPM= S/" [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\"" rpm_unpack ./"${rpmdir}/"*.rpm fi done } src_prepare() { :; } src_configure() { :; } src_compile() { :; } src_install() { local dir=3D"${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${M= Y_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/ # Condition required for people that do not install anything eg no lingu= as # or just english with no offlinehelp. if [[ -d "${dir}" ]] ; then if [[ ${PV} =3D=3D 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_r= ange 1-2)/ fi doins -r "${dir}"/* fi } 1.1 app-office/libreoffice-l10n/libreoffice-l10n-9999.eb= uild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/libreoffice-l10n-9999.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreof= fice-l10n/libreoffice-l10n-9999.ebuild?rev=3D1.1&content-type=3Dtext/plai= n Index: libreoffice-l10n-9999.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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/libreoffic= e-l10n-9999.ebuild,v 1.1 2011/09/30 11:45:57 scarabeus Exp $ EAPI=3D4 [[ ${PV} =3D=3D 9999 ]] && MY_PV=3D"3.4.3" || MY_PV=3D"${PV}" RC_VERSION=3D"rc2" # CHECK ME WITH EVERY BUMP! BASE_SRC_URI=3D"http://download.documentfoundation.org/${PN/-l10n/}/stabl= e/${MY_PV}/rpm/" inherit rpm eutils versionator DESCRIPTION=3D"Translations for the Libreoffice suite." HOMEPAGE=3D"http://www.libreoffice.org" LICENSE=3D"LGPL-3" SLOT=3D"0" [[ ${PV} =3D=3D 9999 ]] || KEYWORDS=3D"~amd64 ~ppc ~x86 ~amd64-linux ~x86= -linux" IUSE=3D"offlinehelp" LANGUAGES=3D"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 k= k 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=3D"bg bn bo bs ca ca_XV cs da de dz el en en_GB en_ZA eo e= s 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_B= R ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW" for lang in ${LANGUAGES}; do helppack=3D"" langpack=3D"" if [[ "${LANGUAGES_HELP}" =3D~ "${lang}" ]]; then [[ ${lang} =3D=3D en ]] && lang2=3D${lang/en/en_US} || lang2=3D${lang} helppack=3D" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86= _helppack-rpm_${lang2/_/-}.tar.gz ) " fi [[ ${lang} =3D=3D en ]] \ || langpack=3D" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rp= m_${lang/_/-}.tar.gz " SRC_URI+=3D" linguas_${lang}? ( ${langpack} ${helppack} )" IUSE+=3D" linguas_${lang}" done unset lang helppack langpack lang2 # dictionaries SPELL_DICTS=3D"af bg ca cs cy da de el en eo es et fr ga gl he hr hu it k= u lt mk nb nl nn pl pt ru sk sl sv tn zu" for X in ${SPELL_DICTS} ; do SPELL_DICTS_DEPEND+=3D" linguas_${X}? ( app-dicts/myspell-${X} )" done RDEPEND=3D"${SPELL_DICTS_DEPEND}" unset X SPELL_DICTS SPELL_DICTS_DEPEND # blockers for old libreoffice with linguas bundled RDEPEND+=3D" !<=3Dapp-office/libreoffice-3.4.3.2 !=3Dapp-office/libreoffice-3.4.9999 !=3Dapp-office/libreoffice-9999 !<=3Dapp-office/libreoffice-bin-3.4.3-r1 " RESTRICT=3D"strip" S=3D"${WORKDIR}" src_unpack() { default local lang dir rpmdir for lang in ${LINGUAS}; do dir=3D${lang/_/-} # for english we provide just helppack, as translation is always there if [[ ${lang} !=3D en ]]; then rpmdir=3D"LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPM= S/" [[ -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}" =3D~ "${lang}" ]] && use offlinehelp; then [[ ${lang} =3D=3D en ]] && dir=3D"en-US" rpmdir=3D"LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPM= S/" [[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\"" rpm_unpack ./"${rpmdir}/"*.rpm fi done } src_prepare() { :; } src_configure() { :; } src_compile() { :; } src_install() { local dir=3D"${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${M= Y_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/ # Condition required for people that do not install anything eg no lingu= as # or just english with no offlinehelp. if [[ -d "${dir}" ]] ; then if [[ ${PV} =3D=3D 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_r= ange 1-2)/ fi doins -r "${dir}"/* fi }