some ebuild reorganization to make future maintenance easier

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

2 files changed, 58 insertions, 52 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index d1620e2cf17c..bc6cb853743a 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.16 2011/03/17 13:49:58 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.17 2011/03/18 22:54:58 suka Exp $
+
+  18 Mar 2011; Andreas Proschofsky <suka@gentoo.org>
+  libreoffice-bin-3.3.1.ebuild:
+  some ebuild reorganization to make future maintenance easier
 
   17 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 7ebb423ebb24..3ce36fbccfec 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.6 2011/03/17 13:49:58 suka Exp $
+# $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 $
 
 EAPI="3"
 
@@ -14,18 +14,22 @@ BVER="3.3.1-8"
 BVER2="3.3-8"
 UREVER="1.7.0-8"
 BASIS="libobasis3.3"
-FILEPATH="http://download.documentfoundation.org/libreoffice/stable/${PV}/rpm/"
+BASIS2="basis3.3"
+NM1="libreoffice"
+NM2="${NM1}3"
+NM3="${NM2}.3"
+FILEPATH="http://download.documentfoundation.org/${NM1}/stable/${PV}/rpm/"
 
 if [ "${ARCH}" = "amd64" ] ; then
-	LOARCH="x86_64"
-	LOARCH2="x86-64"
+	XARCH="x86_64"
+	XARCH2="x86-64"
 else
-	LOARCH="i586"
-	LOARCH2="x86"
+	XARCH="i586"
+	XARCH2="x86"
 fi
 
 S="${WORKDIR}/en-US/RPMS"
-UP="LibO_${MY_PV2}_Linux_${LOARCH2}_install-rpm_en-US/RPMS"
+UP="LibO_${MY_PV2}_Linux_${XARCH2}_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
@@ -68,52 +72,52 @@ PDEPEND="java? ( >=virtual/jre-1.5 )"
 
 RESTRICT="strip"
 
-QA_EXECSTACK="usr/$(get_libdir)/libreoffice/basis3.3/program/*
-	usr/$(get_libdir)/libreoffice/ure/lib/*"
-QA_TEXTRELS="usr/$(get_libdir)/libreoffice/ure/lib/*"
-QA_PRESTRIPPED="usr/$(get_libdir)/libreoffice/basis3.3/program/*
-	usr/$(get_libdir)/libreoffice/basis3.3/program/python-core-2.6.1/lib/lib-dynload/*
-	usr/$(get_libdir)/libreoffice/program/*
-	usr/$(get_libdir)/libreoffice/ure/bin/*
-	usr/$(get_libdir)/libreoffice/ure/lib/*"
+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/*"
 
 src_unpack() {
 
 	unpack ${A}
 
-	cp "${FILESDIR}"/{50-libreoffice-bin,wrapper.in} "${T}"
-	eprefixify "${T}"/{50-libreoffice-bin,wrapper.in}
+	cp "${FILESDIR}"/{50-${PN},wrapper.in} "${T}"
+	eprefixify "${T}"/{50-${PN},wrapper.in}
 
 	for i in base binfilter calc core01 core02 core03 core04 core05 core06 \
 		core07 draw graphicfilter images impress math ogltrans ooofonts \
 		ooolinguistic pyuno testtool writer xsltfilter ; do
-		rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${LOARCH}.rpm"
+		rpm_unpack "./${UP}/${BASIS}-${i}-${BVER}.${XARCH}.rpm"
 	done
 
-	rpm_unpack "./${UP}/libreoffice3-${BVER}.${LOARCH}.rpm"
-	rpm_unpack "./${UP}/libreoffice3-ure-${UREVER}.${LOARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-ure-${UREVER}.${XARCH}.rpm"
 
 	for j in base calc draw impress math writer; do
-		rpm_unpack "./${UP}/libreoffice3-${j}-${BVER}.${LOARCH}.rpm"
+		rpm_unpack "./${UP}/${NM2}-${j}-${BVER}.${XARCH}.rpm"
 	done
 
-	rpm_unpack "./${UP}/desktop-integration/libreoffice3.3-freedesktop-menus-${BVER2}.noarch.rpm"
+	rpm_unpack "./${UP}/desktop-integration/${NM3}-freedesktop-menus-${BVER2}.noarch.rpm"
 
-	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${LOARCH}.rpm"
-	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${LOARCH}.rpm"
+	use gnome && rpm_unpack "./${UP}/${BASIS}-gnome-integration-${BVER}.${XARCH}.rpm"
+	use java && rpm_unpack "./${UP}/${BASIS}-javafilter-${BVER}.${XARCH}.rpm"
 
 	# Extensions
 	for k in mediawiki-publisher nlpsolver pdf-import presentation-minimizer presenter-screen report-builder; do
-		rpm_unpack "./${UP}/${BASIS}-extension-${k}-${BVER}.${LOARCH}.rpm"
+		rpm_unpack "./${UP}/${BASIS}-extension-${k}-${BVER}.${XARCH}.rpm"
 	done
 
 	# English support installed by default
-	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${LOARCH}.rpm"
-	rpm_unpack "./${UP}/libreoffice3-en-US-${BVER}.${LOARCH}.rpm"
-	rpm_unpack "./${UP}/libreoffice3-dict-en-${BVER}.${LOARCH}.rpm"
-	use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${LOARCH}.rpm"
+	rpm_unpack "./${UP}/${BASIS}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-en-US-${BVER}.${XARCH}.rpm"
+	rpm_unpack "./${UP}/${NM2}-dict-en-${BVER}.${XARCH}.rpm"
+	use offlinehelp && rpm_unpack "./LibO_${MY_PV2}_Linux_${XARCH2}_helppack-rpm_en-US/RPMS//${BASIS}-en-US-help-${BVER}.${XARCH}.rpm"
 	for s in base binfilter calc math res writer ; do
-		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${LOARCH}.rpm"
+		rpm_unpack "./${UP}/${BASIS}-en-US-${s}-${BVER}.${XARCH}.rpm"
 	done
 
 	# Localization
@@ -121,25 +125,25 @@ src_unpack() {
 	for l in ${LINGUAS}; do
 		m="${l/_/-}"
 		if [[ ${m} != "en" ]] ; then
-			LANGDIR="LibO_${MY_PV2}_Linux_${LOARCH2}_langpack-rpm_${m}/RPMS/"
-			rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${BVER}.${LOARCH}.rpm"
-			rpm_unpack "./${LANGDIR}/libreoffice3-${m}-${BVER}.${LOARCH}.rpm"
+			LANGDIR="LibO_${MY_PV2}_Linux_${XARCH2}_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
-				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${LOARCH}.rpm"
+				rpm_unpack "./${LANGDIR}/${BASIS}-${m}-${n}-${BVER}.${XARCH}.rpm"
 			done
 
-			for DICT_FILE in `find "./${LANGDIR}" -name "libreoffice3-dict-*-${BVER}.${LOARCH}.rpm"`; do
-				DICT_REGEX="s/libreoffice3-dict-(.*?)-${BVER}.${LOARCH}.rpm/\1/"
+			for DICT_FILE in `find "./${LANGDIR}" -name "${NM2}-dict-*-${BVER}.${XARCH}.rpm"`; do
+				DICT_REGEX="s/${NM2}-dict-(.*?)-${BVER}.${XARCH}.rpm/\1/"
 				DICT_LOCALE=`basename "$DICT_FILE" | sed -E "${DICT_REGEX}"`
-				if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/libreoffice/share/extensions/dict-${DICT_LOCALE}" ]] ; then
+				if [[ -n "${DICT_LOCALE}" && ! -d "${WORKDIR}/opt/${NM1}/share/extensions/dict-${DICT_LOCALE}" ]] ; then
 					rpm_unpack "${DICT_FILE}"
 				fi
 			done
 
 			# Help files
 			if use offlinehelp; then
-				LANGDIR2="LibO_${MY_PV2}_Linux_${LOARCH2}_helppack-rpm_${m}/RPMS/"
-				rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${LOARCH}.rpm"
+				LANGDIR2="LibO_${MY_PV2}_Linux_${XARCH2}_helppack-rpm_${m}/RPMS/"
+				rpm_unpack "./${LANGDIR2}/${BASIS}-${m}-help-${BVER}.${XARCH}.rpm"
 			fi
 		fi
 	done
@@ -148,11 +152,9 @@ src_unpack() {
 
 src_install () {
 
-	INSTDIR="/usr/$(get_libdir)/libreoffice"
-
-	einfo "Installing OpenOffice.org into build root..."
+	INSTDIR="/usr/$(get_libdir)/${NM1}"
 	dodir ${INSTDIR}
-	mv "${WORKDIR}"/opt/libreoffice/* "${ED}${INSTDIR}" || die
+	mv "${WORKDIR}"/opt/${NM1}/* "${ED}${INSTDIR}" || die
 
 	#Menu entries, icons and mime-types
 	cd "${ED}${INSTDIR}/share/xdg/"
@@ -160,33 +162,33 @@ src_install () {
 		if [ "${desk}" = "javafilter" ] ; then
 			use java || { rm javafilter.desktop; continue; }
 		fi
-		mv ${desk}.desktop libreoffice-${desk}.desktop
-		domenu libreoffice-${desk}.desktop
+		mv ${desk}.desktop ${NM1}-${desk}.desktop
+		domenu ${NM1}-${desk}.desktop
 	done
 	insinto /usr/share
 	doins -r "${WORKDIR}"/usr/share/icons
 	doins -r "${WORKDIR}"/usr/share/mime
 
 	# Install wrapper script
-	newbin "${T}/wrapper.in" libreoffice
-	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/libreoffice" || die
+	newbin "${T}/wrapper.in" ${NM1}
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/${NM1}" || die
 
 	# Component symlinks
 	for app in base calc draw impress math writer; do
 		dosym ${INSTDIR}/program/s${app} /usr/bin/lo${app}
 	done
 
-	dosym ${INSTDIR}/program/spadmin /usr/bin/libreoffice-printeradmin
+	dosym ${INSTDIR}/program/spadmin /usr/bin/${NM1}-printeradmin
 	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
 
 	rm -f "${ED}${INSTDIR}/basis-link" || die
-	dosym ${INSTDIR}/basis3.3 ${INSTDIR}/basis-link
+	dosym ${INSTDIR}/${BASIS2} ${INSTDIR}/basis-link
 
 	# Non-java weirdness see bug #99366
 	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
 
 	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${T}/50-libreoffice-bin"
+	insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
 
 }
 
@@ -202,7 +204,7 @@ pkg_postinst() {
 	fdo-mime_mime_database_update
 	use gnome && gnome2_icon_cache_update
 
-	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/${NM1}/program/soffice.bin
 
 }