diff options
author | Andreas Proschofsky <suka@gentoo.org> | 2011-03-19 00:14:02 +0000 |
---|---|---|
committer | Andreas Proschofsky <suka@gentoo.org> | 2011-03-19 00:14:02 +0000 |
commit | a9562e7b97a24aee640e9c6a0d58dabf34112e77 (patch) | |
tree | f389f39646ff8a48fc8ed55c843db51eb6dc1938 /app-office | |
parent | Minor cleanup (diff) | |
download | gentoo-2-a9562e7b97a24aee640e9c6a0d58dabf34112e77.tar.gz gentoo-2-a9562e7b97a24aee640e9c6a0d58dabf34112e77.tar.bz2 gentoo-2-a9562e7b97a24aee640e9c6a0d58dabf34112e77.zip |
Some ebuild changes to be more in line with openoffice-bin
(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/libreoffice-bin/ChangeLog | 6 | ||||
-rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild | 35 |
2 files changed, 23 insertions, 18 deletions
diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog index bc6cb853743a..536167d2bcd4 100644 --- a/app-office/libreoffice-bin/ChangeLog +++ b/app-office/libreoffice-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice-bin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.17 2011/03/18 22:54:58 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.18 2011/03/19 00:14:02 suka Exp $ + + 19 Mar 2011; Andreas Proschofsky <suka@gentoo.org> + libreoffice-bin-3.3.1.ebuild: + Some ebuild changes to be more in line with openoffice-bin 18 Mar 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-bin-3.3.1.ebuild: diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild index 3ce36fbccfec..193d64fa87d6 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.7 2011/03/18 22:54:58 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.1.ebuild,v 1.8 2011/03/19 00:14:02 suka Exp $ EAPI="3" @@ -15,21 +15,22 @@ BVER2="3.3-8" UREVER="1.7.0-8" BASIS="libobasis3.3" BASIS2="basis3.3" -NM1="libreoffice" +NM="libreoffice" +NM1="${NM}" NM2="${NM1}3" NM3="${NM2}.3" -FILEPATH="http://download.documentfoundation.org/${NM1}/stable/${PV}/rpm/" +FILEPATH="http://download.documentfoundation.org/${NM}/stable/${PV}/rpm/" if [ "${ARCH}" = "amd64" ] ; then XARCH="x86_64" - XARCH2="x86-64" + PACKED="LibO_${MY_PV2}_Linux_x86-64" else XARCH="i586" - XARCH2="x86" + PACKED="LibO_${MY_PV2}_Linux_x86" fi S="${WORKDIR}/en-US/RPMS" -UP="LibO_${MY_PV2}_Linux_${XARCH2}_install-rpm_en-US/RPMS" +UP="${PACKED}_install-rpm_en-US/RPMS" DESCRIPTION="LibreOffice productivity suite." SRC_URI="amd64? ( ${FILEPATH}/x86_64/LibO_${PV}_Linux_x86-64_install-rpm_en-US.tar.gz @@ -72,14 +73,14 @@ PDEPEND="java? ( >=virtual/jre-1.5 )" RESTRICT="strip" -QA_EXECSTACK="usr/$(get_libdir)/${NM1}/${BASIS2}/program/* - usr/$(get_libdir)/${NM1}/ure/lib/*" -QA_TEXTRELS="usr/$(get_libdir)/${NM1}/ure/lib/*" -QA_PRESTRIPPED="usr/$(get_libdir)/${NM1}/${BASIS2}/program/* - usr/$(get_libdir)/${NM1}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/* - usr/$(get_libdir)/${NM1}/program/* - usr/$(get_libdir)/${NM1}/ure/bin/* - usr/$(get_libdir)/${NM1}/ure/lib/*" +QA_EXECSTACK="usr/$(get_libdir)/${NM}/${BASIS2}/program/* + usr/$(get_libdir)/${NM}/ure/lib/*" +QA_TEXTRELS="usr/$(get_libdir)/${NM}/ure/lib/*" +QA_PRESTRIPPED="usr/$(get_libdir)/${NM}/${BASIS2}/program/* + usr/$(get_libdir)/${NM}/${BASIS2}/program/python-core-2.6.1/lib/lib-dynload/* + usr/$(get_libdir)/${NM}/program/* + usr/$(get_libdir)/${NM}/ure/bin/* + usr/$(get_libdir)/${NM}/ure/lib/*" src_unpack() { @@ -125,7 +126,7 @@ src_unpack() { for l in ${LINGUAS}; do m="${l/_/-}" if [[ ${m} != "en" ]] ; then - LANGDIR="LibO_${MY_PV2}_Linux_${XARCH2}_langpack-rpm_${m}/RPMS/" + LANGDIR="${PACKED}_langpack-rpm_${m}/RPMS/" rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${XARCH}.rpm" rpm_unpack "./${LANGDIR}/${NM2}-${m}-${BVER}.${XARCH}.rpm" for n in base binfilter calc math res writer; do @@ -152,7 +153,7 @@ src_unpack() { src_install () { - INSTDIR="/usr/$(get_libdir)/${NM1}" + INSTDIR="/usr/$(get_libdir)/${NM}" dodir ${INSTDIR} mv "${WORKDIR}"/opt/${NM1}/* "${ED}${INSTDIR}" || die @@ -204,7 +205,7 @@ pkg_postinst() { fdo-mime_mime_database_update use gnome && gnome2_icon_cache_update - pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM1}/program/soffice.bin + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM}/program/soffice.bin } |