From 2abe65cb8d746d2772b854d88bf8216f47627f38 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 21 Mar 2010 20:50:26 +0000 Subject: [PATCH] Remove nsplugin support, which was already package.use.masked and is not developed or recommended by upstream anymore. Removes the dependencies on old mozilla software versions, fixing bugs #282162, #282286, #300423. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-java/gnu-classpath/ChangeLog | 9 ++++++++- dev-java/gnu-classpath/Manifest | 10 +++++----- .../gnu-classpath/gnu-classpath-0.97-r1.ebuild | 16 +++------------- .../gnu-classpath/gnu-classpath-0.97.2.ebuild | 16 +++------------- .../gnu-classpath/gnu-classpath-0.98-r1.ebuild | 15 +++------------ .../gnu-classpath/gnu-classpath-0.98-r2.ebuild | 15 +++------------ 6 files changed, 25 insertions(+), 56 deletions(-) diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog index 13831e9ad372..b5a90f792663 100644 --- a/dev-java/gnu-classpath/ChangeLog +++ b/dev-java/gnu-classpath/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/gnu-classpath # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.103 2010/03/02 07:44:57 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.104 2010/03/21 20:50:26 caster Exp $ + + 21 Mar 2010; Vlastimil Babka + gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild, + gnu-classpath-0.98-r1.ebuild, gnu-classpath-0.98-r2.ebuild: + Remove nsplugin support, which was already package.use.masked and is not + developed or recommended by upstream anymore. Removes the dependencies on + old mozilla software versions, fixing bugs #282162, #282286, #300423. 02 Mar 2010; Pawel Hajdan jr gnu-classpath-0.98-r2.ebuild: diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest index 19f55cd2f8eb..efef8b13efd3 100644 --- a/dev-java/gnu-classpath/Manifest +++ b/dev-java/gnu-classpath/Manifest @@ -2,9 +2,9 @@ AUX 0.93-nsplugin.patch 1518 RMD160 b82f191cd788dce09745ca17042499f278d0b695 SHA DIST classpath-0.97-gentoo.tar.gz 10261662 RMD160 01ef33c4e50b5c88bfe2f59d9249110072d3764e SHA1 22b2ac2444b73df841e07c36c4e6621ab9a06d3f SHA256 5f0619b26fe3e0cded3e76a09be4004db62f5bcd198c041da2bd619cc633200e DIST classpath-0.97.2.tar.gz 10318014 RMD160 a33667d2b692da22cb872c57265511115a543a76 SHA1 627e9781f9bb744b1a70e4aaff88d2d0440cbf1f SHA256 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4 DIST classpath-0.98.tar.gz 11021342 RMD160 9a20f4ca9379d90cbca644c0e9410df1c57575a5 SHA1 1d6e8d1b3542a35bbd1013c61fab3cfae083decb SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f -EBUILD gnu-classpath-0.97-r1.ebuild 3384 RMD160 840c319ebe95c85ffc8d64b031cd180e9cda37bd SHA1 34e5d4a03d74ed4ed71837b931a3121a1ee30445 SHA256 565108ee8e1b404bcd04a8c65cccc6d48350cb4415f29b11d26c7ba28314c7c3 -EBUILD gnu-classpath-0.97.2.ebuild 2524 RMD160 78139abe1f2de7d3f766ccc3a98826079b4235ac SHA1 9d06a0bf13796548a8dcfc7765101e90eeba5b28 SHA256 bc56589cd40ee00a01fff127088f93cc243111cbf6f0740ad871bd0cf306af70 -EBUILD gnu-classpath-0.98-r1.ebuild 3422 RMD160 9854df1267cf640788217e06a582a6c94b75becd SHA1 104c461f26c2f1f80ac9f4727befafce60491d10 SHA256 f790d2d0afaa3fa7033cb21786fb38263968c70f85042715315af9915c96cb6a -EBUILD gnu-classpath-0.98-r2.ebuild 3427 RMD160 74da1ed2b8e71c4452399abd6531c32c3711b6e7 SHA1 9d006308d15d1171ff9b90d5330982840365cf0d SHA256 599b92d1d0be94a02ab9d4b818530aacc8c4a180a5725efd4fcc8e09476dbef2 -MISC ChangeLog 15225 RMD160 4983e9c02f00a9687796bd1523a36eb587d257c9 SHA1 2887c7dca5d855e05fe526130f6b81ec1cbbf0d1 SHA256 d749745789f52cd345a83d9c58084387ed3719cf26080dbf0ee0b43a8c4ff68f +EBUILD gnu-classpath-0.97-r1.ebuild 3148 RMD160 1789e3c84bbe8690b1a568f14c0ff8b8a48cb7e9 SHA1 20b55a2e841bcf01e2bf1a17b7ee4d54840d911c SHA256 2435e875350a6b210e836a03100796a600a0ee03ee16cfdfe0ae07158afb0ebe +EBUILD gnu-classpath-0.97.2.ebuild 2288 RMD160 d4ad49c7bf6509ed636316b956024780dfbdd12b SHA1 e3c1a60e804b177af00c64e41e5ae36479c7eb93 SHA256 dad3618b5b86a2c0e0ff9e596c1d5f0ccc2c613cab4ea310eb2e1d6a54ee2875 +EBUILD gnu-classpath-0.98-r1.ebuild 3196 RMD160 ad61b50943c1918cf1f41dca4d053b452378d1c3 SHA1 1f22fbe68f77e22341d3978de1c197f75512ba3c SHA256 50acc65a3ee097fdf8058a3a4afebe0dcae9a3cab43a3fb7aa1ad07037090932 +EBUILD gnu-classpath-0.98-r2.ebuild 3197 RMD160 50d8ba289072479c2dfb68f382bc6714995c8373 SHA1 f48a13d6c05802c6dbbfcf1a9a6e1062ae46522a SHA256 16e66d8a38ce6d1c3de85744a50d13ecbc0265c48535ab235fe8dc1aeae0b226 +MISC ChangeLog 15619 RMD160 b596f4c88d66031005613c96e057725e4e5a85d5 SHA1 faf8eac2885d7d02717604d31e54cd06a7072660 SHA256 7d3ca79e9c15f2ca9bfe66703189ba9ffc0f65eb3dfaa0a3eb2a11ed36e2ee4a MISC metadata.xml 456 RMD160 36f9f9619fd32cdfec79883a039433e4473f7f9f SHA1 4bd8e09e3b936882112ba76e7d8a820aa1c0d738 SHA256 ce74184ed34e49a121939077d436c7b73eff7b046f5367d2241d7d2d8f0a6061 diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild index 27c32e8b9706..2813ad235444 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.11 2010/01/01 17:59:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.12 2010/03/21 20:50:26 caster Exp $ EAPI=1 @@ -18,7 +18,7 @@ LICENSE="GPL-2-with-linking-exception" SLOT="0.97" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="alsa debug doc dssi examples gconf gtk gstreamer nsplugin qt4 xml" +IUSE="alsa debug doc dssi examples gconf gtk gstreamer qt4 xml" RDEPEND="alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.8 ) @@ -37,16 +37,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) x11-libs/libXtst x11-libs/pango ) - nsplugin? ( - >=x11-libs/gtk+-2.8 - || ( - =www-client/mozilla-firefox-2* - =net-libs/xulrunner-1.8* - =www-client/seamonkey-1* - =www-client/seamonkey-bin-1* - =www-client/firefox-bin-2* - ) - ) qt4? ( x11-libs/qt-gui:4 ) xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) gstreamer? ( @@ -104,7 +94,6 @@ src_compile() { $(use_enable gconf gconf-peer) \ $(use_enable gtk gtk-peer) \ $(use_enable gstreamer gstreamer-peer) \ - $(use_enable nsplugin plugin) \ $(use_enable qt4 qt-peer) \ $(use_enable xml xmlj) \ $(use_enable dssi ) \ @@ -113,6 +102,7 @@ src_compile() { --enable-jni \ --disable-dependency-tracking \ --disable-Werror \ + --disable-plugin \ --host=${CHOST} \ --prefix=/opt/${PN}-${SLOT} \ || die "configure failed" diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild index fbfe5843fb62..f998f7a63c25 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.6 2010/01/01 17:59:55 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.7 2010/03/21 20:50:26 caster Exp $ EAPI=1 @@ -15,7 +15,7 @@ LICENSE="GPL-2-with-linking-exception" SLOT="0.97" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="alsa debug doc dssi examples gconf gtk gstreamer nsplugin qt4 xml" +IUSE="alsa debug doc dssi examples gconf gtk gstreamer qt4 xml" RDEPEND="alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.8 ) @@ -34,16 +34,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) x11-libs/libXtst x11-libs/pango ) - nsplugin? ( - >=x11-libs/gtk+-2.8 - || ( - =www-client/mozilla-firefox-2* - =net-libs/xulrunner-1.8* - =www-client/seamonkey-1* - =www-client/seamonkey-bin-1* - =www-client/firefox-bin-2* - ) - ) qt4? ( x11-libs/qt-gui:4 ) xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) gstreamer? ( @@ -75,7 +65,6 @@ src_compile() { $(use_enable gconf gconf-peer) \ $(use_enable gtk gtk-peer) \ $(use_enable gstreamer gstreamer-peer) \ - $(use_enable nsplugin plugin) \ $(use_enable qt4 qt-peer) \ $(use_enable xml xmlj) \ $(use_enable dssi ) \ @@ -83,6 +72,7 @@ src_compile() { --enable-jni \ --disable-dependency-tracking \ --disable-Werror \ + --disable-plugin \ --host=${CHOST} \ --prefix=/opt/${PN}-${SLOT} \ --with-ecj-jar=/usr/share/eclipse-ecj-3.3/lib/ecj.jar \ diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild index 23d73226ee80..3bde8640c3d8 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild,v 1.6 2010/02/09 14:49:02 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild,v 1.7 2010/03/21 20:50:26 caster Exp $ EAPI=2 @@ -15,9 +15,8 @@ LICENSE="GPL-2-with-linking-exception" SLOT="0.98" KEYWORDS="amd64 ppc ppc64 x86" -IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer nsplugin qt4 xml" +IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml" -# xulrunner: http://bugs.gentoo.org/show_bug.cgi?id=257803 RDEPEND="alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.9-r2 ) dssi? ( >=media-libs/dssi-0.9 ) @@ -42,14 +41,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) x11-libs/libXtst x11-libs/pango ) - nsplugin? ( - >=x11-libs/gtk+-2.8 - || ( - =dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) dev-java/eclipse-ecj:3.3" @@ -98,13 +89,13 @@ src_configure() { $(use_enable gmp) \ $(use_enable gtk gtk-peer) \ $(use_enable gstreamer gstreamer-peer) \ - $(use_enable nsplugin plugin) \ $(use_enable qt4 qt-peer) \ $(use_enable xml xmlj) \ $(use_enable dssi ) \ $(use_with doc gjdoc) \ --enable-jni \ --disable-dependency-tracking \ + --disable-plugin \ --host=${CHOST} \ --prefix=/usr/${PN}-${SLOT} \ --with-ecj-jar=$(java-pkg_getjar eclipse-ecj:3.3 ecj.jar) \ diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild index 2c926f7c458c..37073cccc918 100644 --- a/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild +++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild,v 1.3 2010/03/02 07:44:57 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.98-r2.ebuild,v 1.4 2010/03/21 20:50:26 caster Exp $ EAPI=2 @@ -15,9 +15,8 @@ LICENSE="GPL-2-with-linking-exception" SLOT="0.98" KEYWORDS="~amd64 ppc ppc64 x86" -IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer nsplugin qt4 xml" +IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml" -# xulrunner: http://bugs.gentoo.org/show_bug.cgi?id=257803 RDEPEND="alsa? ( media-libs/alsa-lib ) doc? ( >=dev-java/gjdoc-0.7.9-r2 ) dssi? ( >=media-libs/dssi-0.9 ) @@ -42,14 +41,6 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) x11-libs/libXtst x11-libs/pango ) - nsplugin? ( - >=x11-libs/gtk+-2.8 - || ( - =dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 ) dev-java/eclipse-ecj:3.3" @@ -98,13 +89,13 @@ src_configure() { $(use_enable gmp) \ $(use_enable gtk gtk-peer) \ $(use_enable gstreamer gstreamer-peer) \ - $(use_enable nsplugin plugin) \ $(use_enable qt4 qt-peer) \ $(use_enable xml xmlj) \ $(use_enable dssi ) \ $(use_with doc gjdoc) \ --enable-jni \ --disable-dependency-tracking \ + --disable-plugin \ --host=${CHOST} \ --prefix=/usr/${PN}-${SLOT} \ --with-ecj-jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar) \ -- 2.26.2