Remove USE="nsplugin" wrt #388887 by Michał Górny. Support for building against net-misc/npapi-sdk is left commented out in the ebuild for example.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

3 files changed, 43 insertions, 31 deletions

diff --git a/sci-chemistry/gchemutils/ChangeLog b/sci-chemistry/gchemutils/ChangeLog
index 348ceeecc418..7d9d31111b58 100644
--- a/sci-chemistry/gchemutils/ChangeLog
+++ b/sci-chemistry/gchemutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/gchemutils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v 1.16 2011/11/01 12:24:48 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/ChangeLog,v 1.17 2012/04/18 13:21:59 ssuominen Exp $
+
+  18 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> gchemutils-0.13.1.ebuild:
+  Remove USE="nsplugin" wrt #388887 by Michał Górny. Support for building
+  against net-misc/npapi-sdk is left commented out in the ebuild for example.
 
   01 Nov 2011; Pacho Ramos <pacho@gentoo.org> gchemutils-0.13.1.ebuild:
   Drop DEPRECATED flags, bug #388509
diff --git a/sci-chemistry/gchemutils/Manifest b/sci-chemistry/gchemutils/Manifest
index a5c0c9ff3ce8..8d88830d5f80 100644
--- a/sci-chemistry/gchemutils/Manifest
+++ b/sci-chemistry/gchemutils/Manifest
@@ -5,13 +5,17 @@ AUX gchemutils-0.10.3-glibc-2.10.patch 1583 RMD160 0306a058cc3604a330e19e0b05960
 DIST gnome-chemistry-utils-0.10.12.tar.bz2 4228290 RMD160 381deb76757e1bfa686da6429032c9fa9773ffbd SHA1 a32a536c9bb8653801a58f12ae605f3b12222e4b SHA256 43cb2816b3fe175e017b00244a331bf5b98e286a71de692d65d333502ad90e92
 DIST gnome-chemistry-utils-0.13.1.tar.bz2 5024796 RMD160 a27fb614a0113365a9ee11f5e8bbf7d5cb97a445 SHA1 e7b260345c0f3b898c662077060b27689837ee42 SHA256 f8760ba4fe0d58a52a0fc790b52b4d7bd4628247afd6018481022c43a6e040c7
 EBUILD gchemutils-0.10.12.ebuild 1340 RMD160 ca0ee2396522f482e04412714a56a8c99c3e3946 SHA1 b71f805b5183e58a8a2dc6c71613d411fda48e89 SHA256 55ab6afd386785a25c339a5c2283183a4dff2c36948aed61ab54b4f311e6ba01
-EBUILD gchemutils-0.13.1.ebuild 1959 RMD160 af56043591715cd5ae25dc6eaf705d6ca87d20b5 SHA1 26e7ae46464e55a5e5b38b5faea515e4eeba8d63 SHA256 a0be7ec3899929275b8a21b7273be514257a37cc49c52a67d22eb885cb2aaebf
-MISC ChangeLog 2990 RMD160 a52e79514986089682862a40825b7870d82e057d SHA1 dd152aae4c275bac6fa1a81de9693a1761fac7db SHA256 5ac149e4bf73e7a1a368048d82a849c042bc765261980c789d844bc57f89686a
+EBUILD gchemutils-0.13.1.ebuild 2084 RMD160 904755116bc93963a4a3b9b15083b3d5798514b7 SHA1 69ff52f7e579492aa14062a0a5e8959a7612dc38 SHA256 bf6fa92bbb1c4098d02388bd09ade8cce68d68cb2e34f23d00247f350648a9c8
+MISC ChangeLog 3229 RMD160 6c18977e3f84d42b4abee74d82c2762426e90c5f SHA1 8f669d7f28e40db522fc23ea7da0c96dd024efa2 SHA256 f5609805d75312cf4e71b2141045f244fe0c9058501d7f7b22214394554b6475
 MISC metadata.xml 363 RMD160 e9bfd61261c21ae3c66702671fed61a49c45f031 SHA1 079138faa975ff2e6475f1b315fdba1ccb9d4faa SHA256 42666fb16d5d69c9e7864c2074465d53389650fece462548b0dfa8a392e12908
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk6v5RcACgkQCaWpQKGI+9Q6rACdFRNv+GAh4A1MHUeYTJV6nSEl
-dSwAn17t2uW8edC9hsyDnKTGtCTkiKgO
-=q/gN
+iQEcBAEBAgAGBQJPjr+jAAoJEEdUh39IaPFNVYkH/RfVqLqWG2U9lnrJaMxZer/H
+FU3Gn6H/528++T53WctZPGEf6dcmW1op/yRe/a6p/3o6S1nLI56EaLL3caIsuuKe
+yeDFQAQP8kRU3IoaYF75wgwyrDiegPJFqnRICSVy2mCdVPjDybhWSV0qXvwyQiQn
+wDeDPA6SzyMBX37evUPIzs32DUihuuq8apqNRECws6uX2YGB2xf2zAXzE9InLHv3
+mMAlcRi8C1liou+Zp6M9ibE5mnuN2RvhMbcbs5ccgL9cgCXDJ82bxZQmk6qJua1T
+cHVz5Ilzyd63kv67VPqGr3PUvqFw2PMP12o18iSU/LfFswEkMoRl9AHkDZ0Zaxg=
+=LeS3
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild b/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild
index 08d658394b8f..7dfddb7e88bf 100644
--- a/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild
+++ b/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild
@@ -1,23 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild,v 1.4 2011/11/01 12:24:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gchemutils/gchemutils-0.13.1.ebuild,v 1.5 2012/04/18 13:21:59 ssuominen Exp $
 
-EAPI=3
+EAPI=4
+inherit gnome2 # multilib toolchain-funcs nsplugins
 
-inherit gnome2 multilib versionator
-
-MPV=$(get_version_component_range 1-2)
-MY_PN=gnome-chemistry-utils
-MY_P=${MY_PN}-${PV}
+MY_P=gnome-chemistry-utils-${PV}
 
 DESCRIPTION="C++ classes and Gtk+-2 widgets related to chemistry"
 HOMEPAGE="http://www.nongnu.org/gchemutils/"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${MPV}/${MY_P}.tar.bz2"
+SRC_URI="mirror://nongnu/${PN}/${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nls nsplugin"
+IUSE="nls" # nsplugin
 
 CDEPEND="
 	gnome-base/libglade:2.0
@@ -25,17 +22,14 @@ CDEPEND="
 	x11-libs/gtkglext
 	sci-chemistry/chemical-mime-data
 	sci-chemistry/bodr
-	sci-chemistry/openbabel
-	nsplugin? ( || (
-		net-libs/xulrunner
-		www-client/firefox
-	) )"
+	sci-chemistry/openbabel"
 RDEPEND="${CDEPEND}
 	gnome-extra/yelp" #271998
 DEPEND="${CDEPEND}
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
+# nsplugin? ( net-misc/npapi-sdk )
 
 S=${WORKDIR}/${MY_P}
 
@@ -45,22 +39,32 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-dependency-tracking
 		--disable-update-databases
-		$(use_enable nsplugin mozilla-plugin)
+		--disable-mozilla-plugin
 		$(use_enable nls)"
+	# $(use_enable nsplugin mozilla-plugin)
 
-	if use nsplugin; then
-		G2CONF="${G2CONF} --with-mozilla-libdir=/usr/$(get_libdir)/nsbrowser/"
-	fi
+	#if use nsplugin; then
+	#	G2CONF="${G2CONF} --with-mozilla-libdir=/usr/$(get_libdir)/${PLUGINS_DIR}"
+	#fi
 
-	DOCS="AUTHORS ChangeLog README TODO NEWS"
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Drop DEPRECATED flags, bug #388509
 	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \
 		configure configure.ac || die
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	#if use nsplugin; then
+	#	export MOZILLA_CFLAGS="$($tc-getPKG_CONFIG) --cflags npapi-sdk)"
+	#	export MOZILLA_LIBS=""
+	#fi
+
+	gnome2_src_configure
 }
 
 src_test() {
@@ -71,7 +75,7 @@ src_test() {
 
 src_install() {
 	gnome2_src_install
-	find "${D}" -name "*.la" -delete
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_postinst() {