patch against configure.in to make curl disable-able.

5 files changed, 104 insertions, 3 deletions

diff --git a/media-video/totem/ChangeLog b/media-video/totem/ChangeLog
index e1150ad8b74c..04b463dae1c6 100644
--- a/media-video/totem/ChangeLog
+++ b/media-video/totem/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/totem
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.26 2003/11/25 13:45:29 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/ChangeLog,v 1.27 2003/12/07 18:39:08 spider Exp $
+
+*totem-0.99.8-r1 (07 Dec 2003)
+
+  07 Dec 2003; <spider@gentoo.org> totem-0.99.8-r1.ebuild,
+  files/totem-0.99.8-curl.patch:
+  Added a patch to actually disable curl
 
 *totem-0.99.8 (25 Nov 2003)
 
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index c8bb282b83bf..e6406a0c5837 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1,9 +1,9 @@
-MD5 c7f8bb6a710d4fcd60db5f5690866d42 ChangeLog 3705
+MD5 72b48a989a4fc23f4a5cead238c60f7e ChangeLog 3872
 MD5 dafbcb3d4280b4a0802bb5cd74f74c98 metadata.xml 559
 MD5 34a2f114ddf5d0e6c2cc9da46f684dcd totem-0.99.8.ebuild 1377
 MD5 d51e4b6a5fed90aec4dda7b19615864d totem-0.99.7.ebuild 1302
 MD5 ffbaad8befb74b57db2c00e74adaafba totem-0.99.5.ebuild 1304
-MD5 100777cf81be052a2c1a2edaf04df69c totem-0.99.8-r1.ebuild 1581
+MD5 1090ba4742b2a538ecff0dea3f138318 totem-0.99.8-r1.ebuild 1662
 MD5 5555967d2623a7a6476864d9294bf323 files/digest-totem-0.99.8 65
 MD5 de48e6636ec8a8884f4e17cadbb89d82 files/digest-totem-0.99.7 65
 MD5 c24abb8ac12e32b2372e91d65343cc34 files/digest-totem-0.99.5 65
diff --git a/media-video/totem/files/digest-totem-0.99.8-r1 b/media-video/totem/files/digest-totem-0.99.8-r1
new file mode 100644
index 000000000000..84310a8ca54f
--- /dev/null
+++ b/media-video/totem/files/digest-totem-0.99.8-r1
@@ -0,0 +1 @@
+MD5 fc8c0fcf96bcea69a7c957ef1666cd7e totem-0.99.8.tar.bz2 786192
diff --git a/media-video/totem/files/totem-0.99.8-curl.patch b/media-video/totem/files/totem-0.99.8-curl.patch
new file mode 100644
index 000000000000..d7df476a5a32
--- /dev/null
+++ b/media-video/totem/files/totem-0.99.8-curl.patch
@@ -0,0 +1,25 @@
+--- configure.in	2003-11-09 02:07:19.000000000 +0100
++++ /tmp/configure.in	2003-12-07 19:19:18.000000000 +0100
+@@ -87,7 +87,21 @@
+ CURL_MAJOR_REQ=7
+ CURL_MINOR_REQ=9
+ CURL_MICRO_REQ=8
+-AC_PATH_PROG(CURL_CONFIG, curl-config, no)
++
++AC_ARG_ENABLE(curl,     
++	AC_HELP_STRING([--disable-curl],[disable curl support]),
++		[case "${enableval}" in
++			yes) WANT_CURL=yes ;;
++			no)  WANT_CURL=no ;;
++			*) AC_MSG_ERROR(bad value ${enableval} for --enable-curl) ;;
++		esac],  
++		[WANT_CURL=yes]) dnl Default value
++if test x$WANT_CURL = xyes ; then
++	AC_PATH_PROG(CURL_CONFIG, curl-config, no)
++else
++	CURL_CONFIG=no
++fi
++
+ AC_MSG_CHECKING(for curl)
+ if test "$CURL_CONFIG" = "no" ; then
+   AC_MSG_WARN(curl development libraries missing, no automatic DLL downloader)
diff --git a/media-video/totem/totem-0.99.8-r1.ebuild b/media-video/totem/totem-0.99.8-r1.ebuild
new file mode 100644
index 000000000000..6077386441d1
--- /dev/null
+++ b/media-video/totem/totem-0.99.8-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/totem/totem-0.99.8-r1.ebuild,v 1.1 2003/12/07 18:39:08 spider Exp $
+
+inherit gnome2
+
+IUSE="gstreamer lirc curl"
+DESCRIPTION="Movie player for GNOME"
+HOMEPAGE="http://www.hadess.net/totem.php3"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+LICENSE="GPL-2"
+
+# specific gtk dep is needed for a certain xfree patch (#21336)
+RDEPEND=">=dev-libs/glib-2.1
+	>=x11-libs/gtk+-2.2.2-r1
+	>=gnome-base/libgnomeui-2.1.1
+	>=gnome-base/gnome-vfs-2.2
+	>=gnome-base/libglade-2
+	>=gnome-base/gnome-desktop-2.2
+	lirc? ( app-misc/lirc )
+	!gstreamer? ( >=media-libs/xine-lib-1_rc0
+		curl? ( >=net-ftp/curl-7.9.8 )
+	)
+	gstreamer? ( >=media-libs/gstreamer-0.6.3
+		>=media-libs/gst-plugins-0.6.3
+		>=media-plugins/gst-plugins-gnomevfs-0.6.3
+		>=media-plugins/gst-plugins-colorspace-0.6.3
+		>=media-plugins/gst-plugins-xvideo-0.6.3
+		mad? ( >=media-plugins/gst-plugins-mad-0.6.3 )
+		)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.20
+	>=dev-util/pkgconfig-0.12.0"
+
+DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS TODO"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	# add enable/disable curl
+	epatch ${FILESDIR}/${P}-curl.patch
+	export WANT_AUTOCONF_2_5=1
+	autoconf
+
+	#fixes sandbox violations
+	gnome2_omf_fix
+
+}
+
+
+# move this in the right order so stacking works. "fulhack"
+use curl \
+	&& G2CONF="${G2CONF} --enable-curl" \
+	|| G2CONF="${G2CONF} --disable-curl"
+
+# xine is default
+use gstreamer && G2CONF="${G2CONF} --enable-gstreamer --disable-curl"
+
+use lirc \
+	&& G2CONF="${G2CONF} --enable-lirc" \
+	|| G2CONF="${G2CONF} --disable-lirc"
+
+
+