Some ebuild changes to be more in line with openoffice-bin

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

3 files changed, 25 insertions, 20 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/Manifest b/app-office/libreoffice-bin/Manifest
index 128d774d828c..c0a374475312 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -416,6 +416,6 @@ DIST LibO_3.3.1_Linux_x86_langpack-rpm_xh.tar.gz 8407431 RMD160 c987aa66eeeaee49
 DIST LibO_3.3.1_Linux_x86_langpack-rpm_zh-CN.tar.gz 1980108 RMD160 849680b34cc974f7c5ede61e6a23c23984e3092b SHA1 943aa9c1536fe040fd3bfb7c13aacd12d45ade49 SHA256 6cc292b717e60e0dc689fb19ef3da7d1aa72cc70c2cabb84a93aa10740ce8f64
 DIST LibO_3.3.1_Linux_x86_langpack-rpm_zh-TW.tar.gz 1968034 RMD160 f39ee245750fcf995a19e679fd3cdfb23be22a2c SHA1 55ae4023c5948495d155b4c61c57739df11ceb5a SHA256 1b175bada7d334ae04bb6544c062fb0d5e127119809bafbe125d20dc4e51d7f1
 DIST LibO_3.3.1_Linux_x86_langpack-rpm_zu.tar.gz 1907400 RMD160 5a8e5d40601323339540371cd41c7c4193f1bde9 SHA1 6d11c3aa382efda130609fef23d6d6c04d90467c SHA256 a5f382dd804bc9d39a23b3c7f443398c6c041ddf56c8b836fa2bf37f8b8da0a7
-EBUILD libreoffice-bin-3.3.1.ebuild 6955 RMD160 d258d3511fce45bea154cf9a1cdafc687e2778a0 SHA1 83326b964cf8b2eb2f94e24aacd7616ee6f4f4ae SHA256 5c397c305c81f49cccd994041f4e06a93e90e4bb613573e9ed6785ea41adae48
-MISC ChangeLog 3119 RMD160 bfd35f027e1d4bcf2a080b259683ab26bf971d30 SHA1 0037a05fd85528c7655572b6d2b81019addfe720 SHA256 bf7d73b6626d9ae531ff2399e5138ca3dc026d6873658980d3c242e0797d229d
+EBUILD libreoffice-bin-3.3.1.ebuild 6955 RMD160 d0ed770bb0a8c4a9aec3cfa06307a5c028f4ab00 SHA1 b1b758a8501bad388791e9c772e149f19b6d8bc8 SHA256 b47f64aaf1a5636ded7694cef5e73e7655153ea1ff3f45c970d1ede8573a30f8
+MISC ChangeLog 3266 RMD160 99b057f71f7b1bc7d840233d77e332deac555b70 SHA1 5d2222177ff82a1314766fdefe7308c02415438b SHA256 ef7c22e568add93fa4ac4bc5edc5a54c3ef3c9d89b453d996c8f94f55f014d4b
 MISC metadata.xml 470 RMD160 252033a0fe2dea9ea521587808f2403870f961c0 SHA1 8dd15d8cb9fa113656a5f77de79d9fbee5fe58ed SHA256 d455809468711d16b0a1401b67b676876f5f7b6cc59affbc63c0a889a4ba103e
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
 
 }