Some cleanups to the ebuild, also switching to EAPI=2, mostly the work of Peter Volkov

<pva@gentoo.org>
Package-Manager: portage-2.2_rc23/cvs/Linux i686

3 files changed, 52 insertions, 62 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 35ec3d28bb11..176b0a12b4ff 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.448 2009/02/15 11:24:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.449 2009/03/05 18:20:25 suka Exp $
+
+  05 Mar 2009; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-3.0.1.ebuild:
+  Some cleanups to the ebuild, also switching to EAPI=2, mostly the work of
+  Peter Volkov <pva@gentoo.org>
 
   15 Feb 2009; Andreas Proschofsky <suka@gentoo.org> Manifest:
   Update the manifest, seems like the upstream packages changed without
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index ff9609f1a68b..84255fac6dc2 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -57,6 +57,6 @@ DIST ooo300-m9-writer.tar.bz2 8364085 RMD160 92ac8eada6e2983e78d1ec02b48791f66a2
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD openoffice-3.0.0.ebuild 12683 RMD160 367cd617d5c4d1fede5572aff9244e9ae3fc1e61 SHA1 78c6022c37b8d422ee8566bce7ba6a01ae35dde3 SHA256 d78ad3b55e805f65c9b8aacd6238bd1e96315247ae7d4ab702ae8f4c2479a31c
-EBUILD openoffice-3.0.1.ebuild 12604 RMD160 9bcaffac6e0d5af6f931d2e87d492018b535d634 SHA1 6d4ac318a8d4cb63a84d0169374e64107c85e610 SHA256 65d8b110886a9acbfbb6284164a9e2443b4e767dd9ca7991ca37fea242701164
-MISC ChangeLog 93515 RMD160 0fba9b4b03c37d363175715ece2afa564ce1b03b SHA1 e4235f5e253aeec17a260d9a385d011a693df6e1 SHA256 0b8a9997e422ba5d739760bbcd3575f7166f951fa427429ed4a7d6199b437fd7
+EBUILD openoffice-3.0.1.ebuild 12206 RMD160 91eb5a3895e747de5a1abe6fb7d6a7e580e1685c SHA1 8179b235f8f71f2e7046b24bf9aee384f4aac38e SHA256 9d1d9b3a63470a458ffcb12bc7d4cc16f1408c5aac84ff2052f9ba5ddba65695
+MISC ChangeLog 93704 RMD160 509a62f46d844ef4f36be0597eb8fd527dcb3e70 SHA1 0e973b97fc2144950a51a946f1a9e8c0255c8024 SHA256 1ade70dd0e704a0b8da85cab1d377e6a8fb87dad404d448eff265b6187b35eea
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index cc12cad86e5f..5502b894735b 100644
--- a/app-office/openoffice/openoffice-3.0.1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.1.ebuild
@@ -1,23 +1,22 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.3 2009/01/31 15:21:03 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.4 2009/03/05 18:20:26 suka Exp $
 
-WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
-EAPI="1"
+EAPI="2"
 
-inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
+inherit check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
 
 IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
 
-MY_PV="3.0.1.2"
-PATCHLEVEL="OOO300"
-SRC="OOo_${PV}_src"
-MST="ooo300-m15"
-DEVPATH="http://download.go-oo.org/${PATCHLEVEL}/${MST}"
-S="${WORKDIR}/ooo"
-S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
+MY_PV=3.0.1.2
+PATCHLEVEL=OOO300
+SRC=OOo_${PV}_src
+MST=ooo300-m15
+DEVPATH=http://download.go-oo.org/${PATCHLEVEL}/${MST}
+S=${WORKDIR}/ooo
+S_OLD=${WORKDIR}/ooo-build-${MY_PV}
+CONFFILE=${S}/distro-configs/Gentoo.conf.in
 DESCRIPTION="OpenOffice.org, a full office productivity suite."
 
 SRC_URI="${DEVPATH}-artwork.tar.bz2
@@ -131,8 +130,9 @@ DEPEND="${COMMON_DEPEND}
 	>=net-misc/curl-7.12
 	sys-libs/zlib
 	sys-apps/coreutils
-	pam? ( sys-libs/pam )
-	>=dev-lang/python-2.3.4
+	pam? ( sys-libs/pam
+		sys-apps/shadow[pam] )
+	>=dev-lang/python-2.3.4[threads]
 	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
 		>=dev-java/ant-core-1.7 )
 	ldap? ( net-nds/openldap )"
@@ -168,8 +168,7 @@ pkg_setup() {
 		ewarn " To get a localized build, set the according LINGUAS variable(s). "
 		ewarn
 	else
-		export LINGUAS_OOO=`echo ${LINGUAS} | \
-			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
+		export LINGUAS_OOO=$(echo ${LINGUAS} | sed -e 's/\ben\b/en_US/g;s/_/-/g')
 	fi
 
 	if use !java; then
@@ -195,13 +194,6 @@ pkg_setup() {
 		die
 	fi
 
-	if use pam; then
-		if ! built_with_use sys-apps/shadow pam; then
-			eerror " shadow needs to be built with pam-support. "
-			eerror " rebuild it accordingly or remove the pam use-flag "
-			die
-		fi
-	fi
 
 	if use nsplugin; then
 		if pkg-config --exists libxul; then
@@ -215,17 +207,10 @@ pkg_setup() {
 		fi
 	fi
 
-	# Check python
-	if ! built_with_use dev-lang/python threads
-	then
-	    eerror "Python needs to be built with threads."
-	    die
-	fi
-
 	java-pkg-opt-2_pkg_setup
 
 	# sys-libs/db version used
-	local db_ver="$(db_findver '>=sys-libs/db-4.3')"
+	local db_ver=$(db_findver '>=sys-libs/db-4.3')
 
 }
 
@@ -263,19 +248,19 @@ src_unpack() {
 		echo "--without-system-mozilla" >> ${CONFFILE}
 	fi
 
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-	echo "`use_enable cups`" >> ${CONFFILE}
-	echo "`use_enable dbus`" >> ${CONFFILE}
-	echo "`use_enable eds evolution2`" >> ${CONFFILE}
-	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
-	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
-	echo "`use_enable gstreamer`" >> ${CONFFILE}
-	echo "`use_enable gtk systray`" >> ${CONFFILE}
-	echo "`use_enable ldap`" >> ${CONFFILE}
-	echo "`use_enable opengl`" >> ${CONFFILE}
-	echo "`use_with ldap openldap`" >> ${CONFFILE}
-	echo "`use_enable debug crashdump`" >> ${CONFFILE}
-	echo "`use_enable debug strip-solver`" >> ${CONFFILE}
+	echo $(use_enable binfilter) >> ${CONFFILE}
+	echo $(use_enable cups) >> ${CONFFILE}
+	echo $(use_enable dbus) >> ${CONFFILE}
+	echo $(use_enable eds evolution2) >> ${CONFFILE}
+	echo $(use_enable gnome gnome-vfs) >> ${CONFFILE}
+	echo $(use_enable gnome lockdown) >> ${CONFFILE}
+	echo $(use_enable gstreamer) >> ${CONFFILE}
+	echo $(use_enable gtk systray) >> ${CONFFILE}
+	echo $(use_enable ldap) >> ${CONFFILE}
+	echo $(use_enable opengl) >> ${CONFFILE}
+	echo $(use_with ldap openldap) >> ${CONFFILE}
+	echo $(use_enable debug crashdump) >> ${CONFFILE}
+	echo $(use_enable debug strip-solver) >> ${CONFFILE}
 
 	# Extension stuff
 	echo "--with-extension-integration" >> ${CONFFILE}
@@ -286,14 +271,12 @@ src_unpack() {
 	# Use splash screen without Sun logo
 	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
 
-	eautoreconf
-
 }
 
-src_compile() {
+src_configure() {
 
 	# Use multiprocessing by default now, it gets tested by upstream
-	export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
+	export JOBS=$(echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/")
 
 	# Compile problems with these ...
 	filter-flags "-funroll-loops"
@@ -319,11 +302,10 @@ src_compile() {
 
 	# Make sure gnome-users get gtk-support
 	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
-	( use gtk || use gnome ) && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
+	{ use gtk || use gnome; } && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
 
 	cd "${S}"
-	./configure \
-		--with-distro="Gentoo" \
+	./configure --with-distro="Gentoo" \
 		--with-arch="${ARCH}" \
 		--with-srcdir="${DISTDIR}" \
 		--with-lang="${LINGUAS_OOO}" \
@@ -332,13 +314,13 @@ src_compile() {
 		--with-installed-ooo-dirname="openoffice" \
 		--with-tag="${MST}" \
 		${GTKFLAG} \
-		`use_enable mono` \
-		`use_enable kde` \
-		`use_enable !debug strip` \
-		`use_enable odk` \
-		`use_enable pam` \
-		`use_with java` \
-		`use_with templates sun-templates` \
+		$(use_enable mono) \
+		$(use_enable kde) \
+		$(use_enable !debug strip) \
+		$(use_enable odk) \
+		$(use_enable pam) \
+		$(use_with java) \
+		$(use_with templates sun-templates) \
 		--disable-access \
 		--disable-post-install-scripts \
 		--enable-extensions \
@@ -347,7 +329,10 @@ src_compile() {
 		--libdir=/usr/$(get_libdir) \
 		|| die "Configuration failed!"
 
-	einfo "Building OpenOffice.org..."
+}
+
+src_compile() {
+
 	use kde && set-kdedir 3
 	make || die "Build failed"