Remove old

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

4 files changed, 6 insertions, 114 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 88e832f8becc..9da1d22e03c4 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.36 2011/07/28 16:44:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.37 2011/07/29 19:05:02 patrick Exp $
+
+  29 Jul 2011; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.10-r1.ebuild:
+  Remove old
 
   28 Jul 2011; Patrick Lauer <patrick@gentoo.org> -freewrl-1.22.9.ebuild,
   -freewrl-1.22.10.ebuild:
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index efcbd7c372c4..6ddd3a4d953e 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,6 +1,4 @@
-DIST freewrl-1.22.10.tar.bz2 1548349 RMD160 9ff1894c59e48e0c9412fa068ff52f75d45f6a6c SHA1 94ecc960a1936692aeee2ec232bb31561fac5958 SHA256 b52999a1754968c8f889de0f98566dceb2ddd70eec1d68d2d4f07a90292a466e
 DIST freewrl-1.22.12_pre2.tar.bz2 1747154 RMD160 fe8e83ff5928e6ad35aafa65ba5cca1459c45de8 SHA1 104f7769e615eea61015930b089b77dec7b7420c SHA256 2b82c0cea0241acc849635cab204c6a2c412dc94f66fc030fc8991ee274818e8
-EBUILD freewrl-1.22.10-r1.ebuild 3578 RMD160 ac6072e32c9118de2e18703ad65826408ef36591 SHA1 cb870deb1b9b403db4d2774e500906ba91b83e3f SHA256 369fcb8001fe22922a245f736562460c3a6410e5d486cf1a98f29359ed22b424
 EBUILD freewrl-1.22.12_pre2.ebuild 4867 RMD160 2ad6c6e39252c72790c33c08c0e0214335585e52 SHA1 049030afdf49419ffa0830e4801abae2c940606f SHA256 18e4326b8d6f2624858afea76a40bcc979392c4b93b5120ae0833d54a9a0fcf9
-MISC ChangeLog 5447 RMD160 20b66f504759ac69a3ee5af0390f288f7fa5216c SHA1 040a19d13ae086794da0fcc1f97bcf388a517761 SHA256 6851f7a4e89b0702ac968a380e989788e027034c331c797c983a1b711d4a9552
-MISC metadata.xml 863 RMD160 000f2c6b960dcaec7391eb3e5511ed141b0b0fad SHA1 d8b3e3eb5bc30bd19516eb38285d23603d8ab9b3 SHA256 d251acb2b3ef7c97f43b2ba5a98813e80ce8a2163a343a376e6958e1ea5d4060
+MISC ChangeLog 5539 RMD160 8784d14cd93d98993e3f499d730eb44c9b28723b SHA1 f772fe2f76dba72b28a6f414fda8e49c5109f2a2 SHA256 062cef9c37cb7543e1a19d07465833b6fca51a294c0eccca41b7ba01b480fc1f
+MISC metadata.xml 786 RMD160 d9d78b70915840969cd26ceae037fb36756f9fec SHA1 67a476c578803a124a147475cb74dfa57cb7c42e SHA256 82b36d79f505d46828942b4653bbdc8927248e557b4f219c9f8a9715759cb9d0
diff --git a/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild b/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild
deleted file mode 100644
index e1d65d2cc00d..000000000000
--- a/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.10-r1.ebuild,v 1.4 2011/06/22 02:28:51 nirbheek Exp $
-
-EAPI="2"
-
-inherit nsplugins eutils flag-o-matic java-pkg-opt-2
-
-DESCRIPTION="VRML2 and X3D compliant browser"
-SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
-HOMEPAGE="http://freewrl.sourceforge.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="curl debug libeai +glew +java +motif +sox static-libs"
-
-COMMONDEPEND="x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libX11
-	motif? ( x11-libs/openmotif )
-	media-libs/mesa
-	glew? ( media-libs/glew )
-	virtual/opengl
-	media-libs/libpng
-	virtual/jpeg
-	media-libs/imlib2
-	>=media-libs/freetype-2
-	media-libs/fontconfig
-	curl? ( net-misc/curl )
-	>=dev-lang/spidermonkey-1.8"
-DEPEND="${COMMONDEPEND}
-	>=dev-util/pkgconfig-0.22
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${COMMONDEPEND}
-	media-fonts/dejavu
-	|| ( media-gfx/imagemagick
-		media-gfx/graphicsmagick[imagemagick] )
-	app-arch/unzip
-	java? ( >=virtual/jre-1.4 )
-	sox? ( media-sound/sox )"
-
-src_prepare() {
-	# A hack to get around expat being grabbed from xulrunner
-	mkdir "${S}/src/lib/include";
-	cp /usr/include/expat.h "${S}/src/lib/include/";
-	cp /usr/include/expat_external.h "${S}/src/lib/include/";
-}
-
-src_configure() {
-	local myconf="--enable-fontconfig --disable-plugin
-		--with-imageconvert=/usr/bin/convert
-		--with-unzip=/usr/bin/unzip"
-	if use motif; then
-		myconf="${myconf} --with-x --with-target=motif"
-	else
-		myconf="${myconf} --with-x --with-target=x11"
-	fi
-	if use sox; then
-		myconf="${myconf} --with-soundconv=/usr/bin/sox"
-	fi
-	# disable the checks for other js libs, in case they are installed
-	myconf="${myconf} --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js --disable-seamonkey-js"
-	# spidermonkey has no pkg-config, so override ./configure
-	JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX"
-	JAVASCRIPT_ENGINE_LIBS="-lmozjs"
-	if has_version dev-lang/spidermonkey[threadsafe] ; then
-		JAVASCRIPT_ENGINE_CFLAGS="${JAVASCRIPT_ENGINE_CFLAGS} -DJS_THREADSAFE $(pkg-config --cflags nspr)"
-		JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) ${JAVASCRIPT_ENGINE_LIBS}"
-	fi
-	export JAVASCRIPT_ENGINE_CFLAGS
-	export JAVASCRIPT_ENGINE_LIBS
-	econf	${myconf} \
-		$(use_enable curl libcurl) \
-		$(use_with glew) \
-		$(use_enable debug) $(use_enable debug thread_colorized) \
-		$(use_enable libeai) \
-		$(use_enable java) \
-		$(use_enable static-libs static) \
-		$(use_enable sox sound)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use java; then
-		java-pkg_dojar src/java/vrml.jar
-		insinto /usr/share/${PN}/lib
-		doins src/java/java.policy
-		elog "Because vrml.jar requires access to sockets, you will need to incorporate the"
-		elog "contents of /usr/share/${PN}/lib/java.policy into your system or user's default"
-		elog "java policy."
-	fi
-
-	# remove unneeded .la files (as per Flameeyes' rant)
-	cd "${D}"
-	rm "usr/$(get_libdir)"/*.la "usr/$(get_libdir)/${PLUGINS_DIR}"/*.la
-}
-
-pkg_postinst() {
-	elog "All versions of FreeWRL are incompatible with xulrunner-2.0 and above."
-	elog "This ebuild gets around it by removing support for browser plugins and forcing"
-	elog "the javascript engine to spidermonkey.  If you are willing to downgrade to"
-	elog "xulrunner-1.9 (as well as downgrade/rebuild all packages depending on it), then"
-	elog "you can get this functionality back by adding =media-gfx/freewrl-1.22.10-r1 to your"
-	elog "package.mask"
-}
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 3422fdd2c329..21797c0ab270 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -13,7 +13,6 @@
 <use> 
         <flag name='glew'>Enable glew extensions</flag>
         <flag name='libeai'>Build EAI C library</flag>
-        <flag name='spidermonkey'>Use spidermonkey instead of Firefox</flag>
         <flag name='xulrunner'>Use libmozjs from xulrunner instead of using spidermonkey</flag>
         <flag name='osc'>Allows for OSC-based control and communication between multiple freewrl instances</flag>
         <flag name='java'>Build and install java EAI/SAI support library</flag>