update to EAPI 4. fixes bug #379005.

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 86 insertions, 128 deletions

diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index 0df33cff2503..b556175af3ed 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/qdbm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.131 2010/11/25 09:51:32 hattya Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.132 2011/11/03 08:25:33 hattya Exp $
+
+*qdbm-1.8.78-r1 (03 Nov 2011)
+
+  03 Nov 2011; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.77.ebuild,
+  -qdbm-1.8.78.ebuild, +qdbm-1.8.78-r1.ebuild:
+  update to EAPI 4. fixes bug #379005.
 
 *qdbm-1.8.78 (25 Nov 2010)
 
diff --git a/dev-db/qdbm/qdbm-1.8.77.ebuild b/dev-db/qdbm/qdbm-1.8.77.ebuild
index 5d745ea844e6..80281c5928b6 100644
--- a/dev-db/qdbm/qdbm-1.8.77.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.77.ebuild
@@ -1,120 +1,98 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.11 2010/07/31 10:28:55 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.77.ebuild,v 1.12 2011/11/03 08:25:33 hattya Exp $
 
-inherit eutils java-pkg-opt-2 multilib
+EAPI="4"
 
-IUSE="debug java perl ruby zlib"
+inherit eutils java-pkg-opt-2 multilib
 
 DESCRIPTION="Quick Database Manager"
-HOMEPAGE="http://qdbm.sourceforge.net/"
+HOMEPAGE="http://fallabs.com/qdbm/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="debug java perl ruby zlib"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	perl? ( dev-lang/perl )
-	ruby? ( dev-lang/ruby )
+	ruby? ( dev-lang/ruby:1.8 )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )"
 
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/${PN}-runpath.diff
 	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
-
-	sed -i "/^CFLAGS/s/$/ ${CFLAGS}/" Makefile.in || die
-	sed -i "/^JAVACFLAGS/s/$/ ${JAVACFLAGS}/" java/Makefile.in || die
-
+	# apply flags
+	sed -i "/^CFLAGS/s|$| ${CFLAGS}|" Makefile.in
+	sed -i "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" java/Makefile.in
 	# replace make -> $(MAKE)
 	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" \
 		Makefile.in \
-		{cgi,java,perl,plus,ruby}/Makefile.in \
-		|| die
-
+		{cgi,java,perl,plus,ruby}/Makefile.in
 }
 
-src_compile() {
-
-	econf \
-		$(use_enable debug) \
-		$(use_enable zlib) \
-		--enable-pthread \
-		--enable-iconv \
-		|| die
-	emake || die
-
+qdbm_api_for() {
 	local u
-
 	for u in java perl ruby; do
-		if ! use ${u}; then
+		if ! use "${u}"; then
 			continue
 		fi
-
-		cd ${u}
-		econf || die
-		emake || die
+		cd "${u}"
+		case "${EBUILD_PHASE}" in
+		configure)
+			econf
+			;;
+		compile)
+			emake
+			;;
+		test)
+			emake -j1 check
+			;;
+		install)
+			emake DESTDIR="${D}" MYDATADIR=/usr/share/doc/${P}/html install
+		esac
 		cd -
 	done
-
 }
 
-src_test() {
-
-	emake -j1 check || die
-
-	local u
-
-	for u in java perl ruby; do
-		if ! use ${u}; then
-			continue
-		fi
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable zlib) \
+		--enable-pthread \
+		--enable-iconv
+	qdbm_api_for # configure
+}
 
-		cd ${u}
-		emake -j1 check || die
-		cd -
-	done
+src_compile() {
+	emake
+	qdbm_api_for # compile
+}
 
+src_test() {
+	emake -j1 check
+	qdbm_api_for # test
 }
 
 src_install() {
-
-	emake DESTDIR="${D}" install || die
-
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog NEWS README THANKS
 	dohtml *.html
+	rm -rf "${ED}"/usr/share/${PN}
 
-	rm -rf "${D}"/usr/share/${PN}
-
-	local u mydatadir=/usr/share/doc/${P}/html
-
-	for u in java perl ruby; do
-		if ! use ${u}; then
-			continue
-		fi
-
-		cd ${u}
-		emake DESTDIR="${D}" MYDATADIR=${mydatadir}/${u} install || die
-
-		case ${u} in
-			java)
-				java-pkg_dojar "${D}"/usr/$(get_libdir)/*.jar
-				rm -f "${D}"/usr/$(get_libdir)/*.jar
-				;;
-			perl)
-				rm -f "${D}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
-				find "${D}" -name .packlist -print0 | xargs -0 rm -f
-				;;
-		esac
-		cd -
-	done
+	qdbm_api_for # install
 
-	rm -f "${D}"/usr/bin/*test
+	if use java; then
+		java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
+		rm -f "${ED}"/usr/$(get_libdir)/*.jar
+	fi
+	if use perl; then
+		rm -f "${ED}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
+		find "${ED}" -name .packlist -print0 | xargs -0 rm -f
+	fi
 
+	rm -f "${ED}"/usr/bin/*test
 }
diff --git a/dev-db/qdbm/qdbm-1.8.78.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
index 1a519c3d9f3a..7167f91be4fb 100644
--- a/dev-db/qdbm/qdbm-1.8.78.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78.ebuild,v 1.1 2010/11/25 09:51:32 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.78-r1.ebuild,v 1.1 2011/11/03 08:25:33 hattya Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils java-pkg-opt-2 multilib
 
-IUSE="cxx debug java perl ruby zlib"
-
 DESCRIPTION="Quick Database Manager"
 HOMEPAGE="http://fallabs.com/qdbm/"
 SRC_URI="http://fallabs.com/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cxx debug java perl ruby zlib"
 
 RDEPEND="java? ( >=virtual/jre-1.4 )
 	perl? ( dev-lang/perl )
@@ -24,92 +23,69 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )"
 
 src_prepare() {
-
 	epatch "${FILESDIR}"/${PN}-runpath.diff
 	epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff
-
 	# apply flags
-	sed -i "/^CFLAGS/s/$/ ${CFLAGS}/" Makefile.in || die
-	sed -i "/^CXXFLAGS/s/$/ ${CXXFLAGS}/" plus/Makefile.in || die
-	sed -i "/^JAVACFLAGS/s/$/ ${JAVACFLAGS}/" java/Makefile.in || die
-
+	sed -i "/^CFLAGS/s|$| ${CFLAGS}|" Makefile.in
+	sed -i "/^OPTIMIZE/s|$| ${CFLAGS}|" perl/Makefile.in
+	sed -i "/^CXXFLAGS/s|$| ${CXXFLAGS}|" plus/Makefile.in
+	sed -i "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" java/Makefile.in
 	# replace make -> $(MAKE)
 	sed -i "s/make\( \|$\)/\$(MAKE)\1/g" \
 		Makefile.in \
-		{cgi,java,perl,plus,ruby}/Makefile.in \
-		|| die
-
+		{cgi,java,perl,plus,ruby}/Makefile.in
 }
 
 qdbm_api_for() {
-
 	local u
-
 	for u in cxx java perl ruby; do
 		if ! use "${u}"; then
 			continue
 		fi
-
 		if [ "${u}" = "cxx" ]; then
 			u="plus"
 		fi
-
 		cd "${u}"
 		case "${EBUILD_PHASE}" in
 		configure)
-			econf || die
+			econf
 			;;
 		compile)
-			emake || die
+			emake
 			;;
 		test)
-			emake -j1 check || die
+			emake -j1 check
 			;;
 		install)
-			emake \
-				DESTDIR="${ED}" \
-				MYDATADIR=/usr/share/doc/${P}/html \
-				install \
-				|| die
+			emake DESTDIR="${D}" MYDATADIR=/usr/share/doc/${P}/html install
 		esac
 		cd -
 	done
-
 }
 
 src_configure() {
-
 	econf \
 		$(use_enable debug) \
 		$(use_enable zlib) \
 		--enable-pthread \
-		--enable-iconv \
-		|| die
+		--enable-iconv
 	qdbm_api_for # configure
-
 }
 
 src_compile() {
-
-	emake || die
+	emake
 	qdbm_api_for # compile
-
 }
 
 src_test() {
-
-	emake -j1 check || die
+	emake -j1 check
 	qdbm_api_for # test
-
 }
 
 src_install() {
-
-	emake DESTDIR="${ED}" install || die
-
+	emake DESTDIR="${D}" install
 	dodoc ChangeLog NEWS README THANKS
 	dohtml -r doc/
-
 	rm -rf "${ED}"/usr/share/${PN}
 
 	qdbm_api_for # install
@@ -117,14 +93,12 @@ src_install() {
 	if use java; then
 		java-pkg_dojar "${ED}"/usr/$(get_libdir)/*.jar
 		rm -f "${ED}"/usr/$(get_libdir)/*.jar
-
-	elif use perl; then
+	fi
+	if use perl; then
 		rm -f "${ED}"/$(perl -V:installarchlib | cut -d\' -f2)/*.pod
 		find "${ED}" -name .packlist -print0 | xargs -0 rm -f
-
 	fi
 
-	rm -f "${D}"/usr/bin/*test
-	rm -f "${D}"/usr/share/man/man1/*test.1*
-
+	rm -f "${ED}"/usr/bin/*test
+	rm -f "${ED}"/usr/share/man/man1/*test.1*
 }