sci-biology/gbrowse: Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits

(Portage version: 2.2.0_alpha107/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

4 files changed, 35 insertions, 25 deletions

diff --git a/sci-biology/gbrowse/ChangeLog b/sci-biology/gbrowse/ChangeLog
index b0949c5bf..934324252 100644
--- a/sci-biology/gbrowse/ChangeLog
+++ b/sci-biology/gbrowse/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sci-biology/generic-genome-browser/ChangeLog,v 1.10 2007/07/29 17:07:38 phreak Exp $
 
+  22 May 2012; Justin Lecher <jlec@gentoo.org> gbrowse-2.39.ebuild,
+  gbrowse-2.45.ebuild, gbrowse-2.48.ebuild:
+  Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
+
 *gbrowse-2.48 (28 Feb 2012)
 
   28 Feb 2012; Martin Mokrejs <mmokrejs@fold.natur.cuni.cz>
diff --git a/sci-biology/gbrowse/gbrowse-2.39.ebuild b/sci-biology/gbrowse/gbrowse-2.39.ebuild
index 7f8ab9b0a..47d02f98b 100644
--- a/sci-biology/gbrowse/gbrowse-2.39.ebuild
+++ b/sci-biology/gbrowse/gbrowse-2.39.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI="2"
 
-inherit perl-module webapp
+EAPI=4
+
+inherit eutils perl-module webapp
 
 MY_P="GBrowse-${PV}"
 
@@ -91,12 +92,13 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	sed -i 's/return unless -t STDIN/return/' install_util/GBrowseInstall.pm || die
 	sed -i 's/process_/bp_process_/g' INSTALL || die
-	epatch "${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch || die "Failed to apply GBrowseInstall.pm-"${PV}".patch"
-	epatch "${FILESDIR}"/destdir.patch || die "Failed to apply destdir.patch"
-	epatch "${FILESDIR}"/fix-PNG-export.patch || die "Failed to apply fix-PNG-export.patch"
-	epatch "${FILESDIR}"/symlink.patch || die "Failed to apply symlink.patch"
-	epatch "${FILESDIR}"/gbrowse_metadb_config.pl.patch || die "Failed to apply gbrowse_metadb_config.pl.patch"
-	epatch "${FILESDIR}"/disable-gbrowse_metadb_config.pl.patch || die "Failed to apply disable-gbrowse_metadb_config.pl.patch"
+	epatch \
+		"${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch \
+		"${FILESDIR}"/destdir.patch \
+		"${FILESDIR}"/fix-PNG-export.patch \
+		"${FILESDIR}"/symlink.patch \
+		"${FILESDIR}"/gbrowse_metadb_config.pl.patch \
+		"${FILESDIR}"/disable-gbrowse_metadb_config.pl.patch
 }
 
 src_configure() {
@@ -143,7 +145,7 @@ src_install() {
 	einfo "Make sure you compiled apache with +cgi and copy ${FILESDIR}/gbrowse.conf.vhosts.d to /etc/apache2/vhosts.d/"
 
 	sed -i "s#"${D}"##g" "${S}"/install_util/GBrowseInstall.pm || die
-	sed -i "s#"${D}"##" "${S}"/blib/conf/GBrowse.conf*
+	sed -i "s#"${D}"##" "${S}"/blib/conf/GBrowse.conf* || die
 	sed -i 's#DBI:SQLite:'${D}'/var/www/gbrowse2/databases/#DBI:SQLite:/var/www/gbrowse2/databases/#' "${S}"/install_util/GBrowseInstall.pm || die
 }
 
diff --git a/sci-biology/gbrowse/gbrowse-2.45.ebuild b/sci-biology/gbrowse/gbrowse-2.45.ebuild
index 4b3f3b38a..f1b510fcf 100644
--- a/sci-biology/gbrowse/gbrowse-2.45.ebuild
+++ b/sci-biology/gbrowse/gbrowse-2.45.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI="2"
 
-inherit perl-module webapp
+EAPI=4
+
+inherit eutils perl-module webapp
 
 MY_P="GBrowse-${PV}"
 
@@ -91,12 +92,13 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	sed -i 's/return unless -t STDIN/return/' install_util/GBrowseInstall.pm || die "Failed to kill the interactive behavior of install_util/GBrowseInstall.pm"
 	sed -i 's/process_/bp_process_/g' INSTALL || die "Failed to prepend bp_ prefix to INSTALL file"
-	epatch "${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch || die "Failed to apply GBrowseInstall.pm-"${PV}".patch"
-	epatch "${FILESDIR}"/destdir.patch || die "Failed to apply destdir.patch"
-	epatch "${FILESDIR}"/fix-PNG-export.patch || die "Failed to apply fix-PNG-export.patch"
-	epatch "${FILESDIR}"/symlink.patch || die "Failed to apply symlink.patch"
-	epatch "${FILESDIR}"/gbrowse_metadb_config.pl.patch || die "Failed to apply gbrowse_metadb_config.pl.patch"
-	epatch "${FILESDIR}"/disable-gbrowse_metadb_config.pl.patch || die "Failed to apply disable-gbrowse_metadb_config.pl.patch"
+	epatch \
+		"${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch \
+		"${FILESDIR}"/destdir.patch \
+		"${FILESDIR}"/fix-PNG-export.patch \
+		"${FILESDIR}"/symlink.patch \
+		"${FILESDIR}"/gbrowse_metadb_config.pl.patch \
+		"${FILESDIR}"/disable-gbrowse_metadb_config.pl.patch
 	for f in conf/synteny/wild_rice_synteny.conf conf/synteny/rice_synteny.conf conf/GBrowse.conf \
 			htdocs/tutorial/tutorial.html htdocs/index.html lib/Bio/Graphics/Browser2/Action.pm \
 			Changes; do
diff --git a/sci-biology/gbrowse/gbrowse-2.48.ebuild b/sci-biology/gbrowse/gbrowse-2.48.ebuild
index 754cc9e5e..20987d9bb 100644
--- a/sci-biology/gbrowse/gbrowse-2.48.ebuild
+++ b/sci-biology/gbrowse/gbrowse-2.48.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
-EAPI="2"
 
-inherit perl-module webapp
+EAPI=4
+
+inherit eutils perl-module webapp
 
 MY_P="GBrowse-${PV}"
 
@@ -92,12 +93,13 @@ RDEPEND="${DEPEND}
 src_prepare() {
 	sed -i 's/return unless -t STDIN/return/' install_util/GBrowseInstall.pm || die "Failed to kill the interactive behavior of install_util/GBrowseInstall.pm"
 	sed -i 's/process_/bp_process_/g' INSTALL || die "Failed to prepend bp_ prefix to INSTALL file"
-	epatch "${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch || die "Failed to apply GBrowseInstall.pm-"${PV}".patch"
-	epatch "${FILESDIR}"/destdir.patch || die "Failed to apply destdir.patch"
-	epatch "${FILESDIR}"/fix-PNG-export.patch || die "Failed to apply fix-PNG-export.patch"
-	epatch "${FILESDIR}"/symlink.patch || die "Failed to apply symlink.patch"
-	epatch "${FILESDIR}"/gbrowse_metadb_config.pl.patch || die "Failed to apply gbrowse_metadb_config.pl.patch"
-	epatch "${FILESDIR}"/disable-gbrowse_metadb_config.pl.patch || die "Failed to apply disable-gbrowse_metadb_config.pl.patch"
+	epatch \
+		"${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch \
+		"${FILESDIR}"/destdir.patch \
+		"${FILESDIR}"/fix-PNG-export.patch \
+		"${FILESDIR}"/symlink.patch \
+		"${FILESDIR}"/gbrowse_metadb_config.pl.patch \
+		"${FILESDIR}"/disable-gbrowse_metadb_config.pl.patch
 	for f in conf/synteny/wild_rice_synteny.conf conf/synteny/rice_synteny.conf conf/GBrowse.conf \
 			htdocs/tutorial/tutorial.html htdocs/index.html lib/Bio/Graphics/Browser2/Action.pm \
 			Changes; do