Version bump, includes fix for bug #373971. Also add patch to compile on hardened (Bug #368777). Clean out some older versions.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

4 files changed, 24 insertions, 98 deletions

diff --git a/www-plugins/nspluginwrapper/ChangeLog b/www-plugins/nspluginwrapper/ChangeLog
index 2245e13de0d1..5ec0841c2cfb 100644
--- a/www-plugins/nspluginwrapper/ChangeLog
+++ b/www-plugins/nspluginwrapper/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-plugins/nspluginwrapper
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.16 2011/06/17 02:25:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/ChangeLog,v 1.17 2011/07/04 15:29:08 chutzpah Exp $
+
+*nspluginwrapper-1.4.4 (04 Jul 2011)
+
+  04 Jul 2011; Patrick McLean <chutzpah@gentoo.org>
+  -nspluginwrapper-1.4.0-r1.ebuild, -nspluginwrapper-1.4.2.ebuild,
+  +nspluginwrapper-1.4.4.ebuild,
+  +files/nspluginwrapper-1.4.4-compile-on-hardened.patch:
+  Version bump, includes fix for bug #373971. Also add patch to compile on
+  hardened (Bug #368777). Clean out some older versions.
 
 *nspluginwrapper-1.4.2 (17 Jun 2011)
 
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
new file mode 100644
index 000000000000..45d6be54e999
--- /dev/null
+++ b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.4-compile-on-hardened.patch
@@ -0,0 +1,11 @@
+--- b/Makefile	2011-06-29 02:10:27.000000000 +0200
++++ a/Makefile	2011-06-29 02:09:06.000000000 +0200
+@@ -333,7 +333,7 @@
+ 	@[ -d $(LSB_OBJ_DIR) ] || mkdir $(LSB_OBJ_DIR) > /dev/null 2>&1
+ 
+ $(LSB_OBJ_DIR)/%.o: $(LSB_SRC_DIR)/%.c
+-	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c $< -o $@
++	$(CC) $(CFLAGS_32) -nostdinc -fno-builtin -I. -I$(LSB_INC_DIR) -c -fno-stack-protector $< -o $@
+ 
+ $(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
+ 	$(AR) rc $@ $<
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild
deleted file mode 100644
index 43c345d911a9..000000000000
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.0-r1.ebuild,v 1.3 2011/05/30 14:24:04 chutzpah Exp $
-
-EAPI=2
-
-inherit eutils multilib nsplugins flag-o-matic
-
-DESCRIPTION="Netscape Plugin Wrapper - Load 32bit plugins on 64bit browser"
-HOMEPAGE="http://nspluginwrapper.davidben.net/"
-SRC_URI="http://web.mit.edu/davidben/Public/nspluginwrapper/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2:2
-	net-misc/curl
-	app-emulation/emul-linux-x86-xlibs
-	app-emulation/emul-linux-x86-gtklibs
-	>=sys-apps/util-linux-2.13"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-autoinstall() {
-	if [[ -x /usr/bin/${PN} ]]; then
-		einfo "Auto installing 32bit plugins..."
-		${PN} -a -i
-		ls /usr/$(get_libdir)/nsbrowser/plugins
-
-		# Remove wrappers if equivalent 64-bit plugins exist
-		# TODO: May be better to patch nspluginwrapper so it doesn't create
-		#       duplicate wrappers in the first place...
-		local DIR64="${ROOT}/usr/$(get_libdir)/nsbrowser/plugins/"
-		for f in "${DIR64}"/npwrapper.*.so; do
-			local PLUGIN=${f##*/npwrapper.}
-			if [[ -f ${DIR64}/${PLUGIN} ]]; then
-				einfo "  Removing duplicate wrapper for native 64-bit ${PLUGIN}"
-				${PN} -r "${f}"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-}
-
-src_configure() {
-	replace-flags -O3 -O2
-
-	./configure --enable-biarch \
-		--target-cpu=i386 \
-		--with-lib32=$(ABI=x86 get_libdir) \
-		--with-lib64=$(get_libdir) \
-		--pkglibdir=/usr/$(get_libdir)/${PN}
-}
-
-src_compile() {
-	emake LDFLAGS_32="-m32 ${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dosym "/usr/$(get_libdir)/${PN}/x86_64/linux/npconfig" "/usr/bin/${PN}"
-	keepdir "/usr/$(get_libdir)/${PLUGINS_DIR}"
-
-	dodoc NEWS README TODO
-}
-
-pkg_postinst() {
-	autoinstall
-	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..."
-	${PN} --auto --remove
-}
-
-pkg_postrm() {
-	autoinstall
-}
diff --git a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.2.ebuild b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild
index 02c6c94014e2..bb1de05bebc3 100644
--- a/www-plugins/nspluginwrapper/nspluginwrapper-1.4.2.ebuild
+++ b/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.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/www-plugins/nspluginwrapper/nspluginwrapper-1.4.2.ebuild,v 1.1 2011/06/17 02:25:58 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/nspluginwrapper/nspluginwrapper-1.4.4.ebuild,v 1.1 2011/07/04 15:29:08 chutzpah Exp $
 
 EAPI=2
 
@@ -45,7 +45,8 @@ autoinstall() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3.0-gdk-native-windows.patch"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-1.4.2-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-compile-on-hardened.patch"
 }
 
 src_configure() {