Version bump, clean up ebuild slightly. Clean out older versions.

(Portage version: 2.2_rc5/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 22 insertions, 79 deletions

diff --git a/net-www/nspluginwrapper/ChangeLog b/net-www/nspluginwrapper/ChangeLog
index 9befe7ae54b8..7af4b9c69178 100644
--- a/net-www/nspluginwrapper/ChangeLog
+++ b/net-www/nspluginwrapper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/nspluginwrapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.17 2008/07/05 23:52:53 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/ChangeLog,v 1.18 2008/07/30 19:46:54 chutzpah Exp $
+
+*nspluginwrapper-1.1.0 (30 Jul 2008)
+
+  30 Jul 2008; Patrick McLean <chutzpah@gentoo.org>
+  -nspluginwrapper-0.9.91.4.ebuild, -nspluginwrapper-0.9.91.5.ebuild,
+  +nspluginwrapper-1.1.0.ebuild:
+  Version bump, clean up ebuild slightly. Clean out older versions.
 
 *nspluginwrapper-1.0.0 (05 Jul 2008)
 
diff --git a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild b/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild
deleted file mode 100644
index fdae16cadaf9..000000000000
--- a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-0.9.91.4.ebuild,v 1.3 2007/08/28 13:33:48 chutzpah Exp $
-
-inherit nsplugins flag-o-matic multilib
-
-DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser"
-HOMEPAGE="http://www.gibix.net/projects/nspluginwrapper/"
-SRC_URI="http://www.gibix.net/projects/nspluginwrapper/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-gtklibs
-	|| ( >=sys-apps/util-linux-2.13 sys-apps/setarch )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf --with-biarch \
-		--with-lib32=$(ABI=x86 get_libdir) \
-		--with-lib64=$(get_libdir) \
-		--pkglibdir=/usr/$(get_libdir)/${PN} || die
-	emake || die
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" DONT_STRIP=yes install || die
-
-	inst_plugin /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npwrapper.so
-	dosym /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npconfig /usr/bin/nspluginwrapper
-
-	dodoc NEWS README TODO ChangeLog
-}
-
-pkg_postinst() {
-	einfo "Auto installing 32bit plugins..."
-	nspluginwrapper -a -i
-	elog "Any 32bit plugins you currently have installed have now been"
-	elog "configured to work in a 64bit browser. Any plugins you install in"
-	elog "the future will first need to be setup with:"
-	elog "  \"nspluginwrapper -i <path-to-32bit-plugin>\""
-	elog "before they will function in a 64bit browser"
-	elog
-}
-
-# this is terribly ugly, but without a way to query portage as to whether
-# we are upgrading/reinstalling a package versus unmerging, I can't think of
-# a better way
-
-pkg_prerm() {
-	einfo "Removing wrapper plugins..."
-	nspluginwrapper -a -r
-}
-
-pkg_postrm() {
-	if [[ -x /usr/bin/nspluginwrapper ]]; then
-		einfo "Auto installing 32bit plugins..."
-		nspluginwrapper -a -i
-	fi
-}
diff --git a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5.ebuild b/net-www/nspluginwrapper/nspluginwrapper-1.1.0.ebuild
index fa4731b6dc0a..2e8414030aeb 100644
--- a/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5.ebuild
+++ b/net-www/nspluginwrapper/nspluginwrapper-1.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-0.9.91.5.ebuild,v 1.1 2007/08/28 13:33:48 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/nspluginwrapper/nspluginwrapper-1.1.0.ebuild,v 1.1 2008/07/30 19:46:54 chutzpah Exp $
 
-inherit nsplugins flag-o-matic multilib
+inherit eutils nsplugins multilib
 
 DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser"
 HOMEPAGE="http://www.gibix.net/projects/nspluginwrapper/"
-SRC_URI="http://www.gibix.net/projects/nspluginwrapper/files/${P}.tar.bz2"
+SRC_URI="http://www.gibix.net/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,22 +24,23 @@ src_compile() {
 	econf --with-biarch \
 		--with-lib32=$(ABI=x86 get_libdir) \
 		--with-lib64=$(get_libdir) \
-		--pkglibdir=/usr/$(get_libdir)/${PN} || die
-	emake || die
+		--pkglibdir=/usr/$(get_libdir)/${PN}
+
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" DONT_STRIP=yes install || die
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
-	inst_plugin /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npwrapper.so
-	dosym /usr/$(get_libdir)/nspluginwrapper/x86_64/linux/npconfig /usr/bin/nspluginwrapper
+	inst_plugin "/usr/$(get_libdir)/${PN}/x86_64/linux/npwrapper.so"
+	dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}"
 
 	dodoc NEWS README TODO ChangeLog
 }
 
 pkg_postinst() {
 	einfo "Auto installing 32bit plugins..."
-	nspluginwrapper -a -i
+	${PN} -a -i
 	elog "Any 32bit plugins you currently have installed have now been"
 	elog "configured to work in a 64bit browser. Any plugins you install in"
 	elog "the future will first need to be setup with:"
@@ -54,12 +55,12 @@ pkg_postinst() {
 
 pkg_prerm() {
 	einfo "Removing wrapper plugins..."
-	nspluginwrapper -a -r
+	${PN} --auto --remove
 }
 
 pkg_postrm() {
-	if [[ -x /usr/bin/nspluginwrapper ]]; then
+	if [[ -x /usr/bin/${PN} ]]; then
 		einfo "Auto installing 32bit plugins..."
-		nspluginwrapper -a -i
+		${PN} --auto --install
 	fi
 }