Version bump, allow building against X instead of gtk2. (Fixes bug #111190 and bug #111646)

(Portage version: 2.0.53_rc7)

4 files changed, 86 insertions, 12 deletions

diff --git a/net-www/mplayerplug-in/ChangeLog b/net-www/mplayerplug-in/ChangeLog
index 4a3de6f4c350..d7683f264594 100644
--- a/net-www/mplayerplug-in/ChangeLog
+++ b/net-www/mplayerplug-in/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/mplayerplug-in
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.48 2005/11/04 02:47:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/ChangeLog,v 1.49 2005/11/19 08:44:49 josejx Exp $
+
+*mplayerplug-in-3.15 (19 Nov 2005)
+
+  19 Nov 2005; Joseph Jezak <josejx@gentoo.org> +mplayerplug-in-3.15.ebuild:
+  Version bump, allow building against X instead of gtk2. (Fixes bug #111190
+  and bug #111646)
 
   04 Nov 2005; Joseph Jezak <josejx@gentoo.org> mplayerplug-in-3.11.ebuild:
   Marked ppc.
diff --git a/net-www/mplayerplug-in/Manifest b/net-www/mplayerplug-in/Manifest
index 25ff26f9f6b6..922ded723cfe 100644
--- a/net-www/mplayerplug-in/Manifest
+++ b/net-www/mplayerplug-in/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d0191e441de2cccabbdbd8892004c733 ChangeLog 7908
+MD5 0f42f169480f29f64343f95dfe794418 ChangeLog 8080
 MD5 8642e3be6b1af51cbbf7e7790cc8ba12 files/digest-mplayerplug-in-2.80 71
 MD5 c2e30e3c9bd430344299015704bc28b6 files/digest-mplayerplug-in-2.85 71
 MD5 8c3b348cd7951d7c21c115f602e22f31 files/digest-mplayerplug-in-3.11 71
+MD5 8cd4233707566dc0a0f8ba64f0529823 files/digest-mplayerplug-in-3.15 71
 MD5 66c156160ef60780ee4c80a28873e766 metadata.xml 250
 MD5 a93db3f864de724c0408dc08506f2d90 mplayerplug-in-2.80.ebuild 1458
 MD5 dd12cc307a2fc2c00237b06a38cd20c5 mplayerplug-in-2.85.ebuild 1464
 MD5 01ba83f4cb718f82bbf7197a2deb8368 mplayerplug-in-3.11.ebuild 1911
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDas1NcsIHjyDViGQRAg9aAKC7yWDmkBMNJIS3R9mfC9eA6p907QCfQZrL
-QSByPd3uDJz4+fvh5Zp2jUc=
-=T8Yv
------END PGP SIGNATURE-----
+MD5 350a9316fd01a84c7b49e54e246ce386 mplayerplug-in-3.15.ebuild 2061
diff --git a/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.15 b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.15
new file mode 100644
index 000000000000..45cd67b790de
--- /dev/null
+++ b/net-www/mplayerplug-in/files/digest-mplayerplug-in-3.15
@@ -0,0 +1 @@
+MD5 34edc6bff7b4e6d89bdcd8bf9e961580 mplayerplug-in-3.15.tar.gz 202404
diff --git a/net-www/mplayerplug-in/mplayerplug-in-3.15.ebuild b/net-www/mplayerplug-in/mplayerplug-in-3.15.ebuild
new file mode 100644
index 000000000000..79f4efa4bf87
--- /dev/null
+++ b/net-www/mplayerplug-in/mplayerplug-in-3.15.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mplayerplug-in/mplayerplug-in-3.15.ebuild,v 1.1 2005/11/19 08:44:49 josejx Exp $
+
+inherit nsplugins multilib
+
+DESCRIPTION="mplayer plug-in for Gecko based browsers"
+HOMEPAGE="http://mplayerplug-in.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 -hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="gecko-sdk gtk"
+
+DEPEND=">=media-video/mplayer-0.92
+		gecko-sdk? ( net-libs/gecko-sdk )
+		!gecko-sdk? ( || ( >=www-client/mozilla-1.6 www-client/mozilla-firefox ) )
+		!gtk ( virtual/x11 )
+
+		gtk? (
+			>=x11-libs/gtk+-2.2.0
+			dev-libs/atk
+			>=dev-libs/glib-2.2.0
+			>=x11-libs/pango-1.2.1
+		)"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	local myconf
+
+	if use gecko-sdk; then
+		myconf="${myconf} --with-gecko-sdk=/usr/$(get_libdir)/gecko-sdk"
+	fi
+
+	# We force gtk2 now because moz only compiles against gtk2
+	if use gtk; then
+		myconf="${myconf} --enable-gtk2"
+	else
+		ewarn "For playback controls, you must enable gtk support."
+		myconf="${myconf} --enable-x"
+	fi
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	exeinto /opt/netscape/plugins
+	doexe mplayerplug-in.so || die "plugin failed"
+	inst_plugin /opt/netscape/plugins/mplayerplug-in.so
+
+	insinto /opt/netscape/plugins
+	doins mplayerplug-in.xpt || die "xpt failed"
+	inst_plugin /opt/netscape/plugins/mplayerplug-in.xpt
+
+	PLUGINS="gmp rm qt wmp"
+
+	for plugin in ${PLUGINS}; do
+		### Install the plugin
+		exeinto /opt/netscape/plugins
+		doexe "mplayerplug-in-${plugin}.so" || die "plugin ${plugin} failed"
+		inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.so"
+		### Install the xpt
+		insinto /opt/netscape/plugins
+	    doins "mplayerplug-in-${plugin}.xpt" || die "plugin ${plugin} xpt failed"
+		inst_plugin "/opt/netscape/plugins/mplayerplug-in-${plugin}.xpt"
+	done
+
+	insinto /etc
+	doins mplayerplug-in.conf
+
+	dodoc ChangeLog INSTALL README DOCS/tech/*.txt
+}