Version bump

5 files changed, 306 insertions, 10 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 936ab3ad3d25..b1baa015d7d9 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.57 2004/05/07 20:45:20 squash Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.58 2004/06/07 10:04:42 phosphan Exp $
+
+*xine-ui-0.99.1 (07 Jun 2004)
+
+  07 Jun 2004; Patrick Kursawe <phosphan@gentoo.org> xine-ui-0.99.1.ebuild,
+  files/preserve-CFLAGS-0.99.1.diff:
+  Version bump, had to adjust the preserve-cflags patch and remove the
+  implicit-config and symlink-bug patches (should be included upstream).
 
   07 May 2004; Josh Grebe <squash@gentoo.org> xine-ui-0.9.23-r2.ebuild:
   Stable on sparc
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 13d5cf7d85e5..15719ef1a83a 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,21 +1,24 @@
-MD5 cdf1125fbda77027475a7bdd5998fedd ChangeLog 9420
-MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
-MD5 151e217a87e10ebbb3322f5b56acb758 xine-ui-0.9.13-r1.ebuild 1634
 MD5 d8cb167064fc4556b071967d3079ef52 xine-ui-0.9.21-r1.ebuild 1612
-MD5 31ccd11fed338847f415e572a3463aa7 xine-ui-0.9.22-r1.ebuild 1450
+MD5 dc5a87350f0e5766eedceabc5f1e7f59 xine-ui-0.99.1.ebuild 1487
+MD5 65f49ef8ff9a130b26eca38551b21e61 xine-ui-0.9.23-r2.ebuild 1590
 MD5 95c595d0435e6a5efd362dccda2ea2fd xine-ui-0.9.22-r2.ebuild 1466
+MD5 151e217a87e10ebbb3322f5b56acb758 xine-ui-0.9.13-r1.ebuild 1634
 MD5 39a6578d1db67971775d1a2b23ffd4d9 xine-ui-0.9.23-r1.ebuild 1431
-MD5 65f49ef8ff9a130b26eca38551b21e61 xine-ui-0.9.23-r2.ebuild 1590
+MD5 4d7c4d6f5b506a8dbb95816646e58698 ChangeLog 9711
+MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
+MD5 31ccd11fed338847f415e572a3463aa7 xine-ui-0.9.22-r1.ebuild 1450
+MD5 f474df8e81130d6b495663ed56763180 files/preserve-CFLAGS-0.9.23.diff 5470
+MD5 29e08b482a6684f4c984b5e7d62226ab files/digest-xine-ui-0.99.1 67
+MD5 471be882204018951e47491017432284 files/preserve-CFLAGS-0.99.1.diff 6424
+MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
+MD5 2d9954f609edaa8124eb990dddd259e4 files/implicit-config.patch 1820
+MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
 MD5 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13-r1 67
 MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21-r1 67
 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r1 67
 MD5 a40013de7a4c30965b9adb242f6d9203 files/digest-xine-ui-0.9.22-r2 67
 MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r1 67
 MD5 72e97c4b1f21cf5aa998c87b95c7b383 files/digest-xine-ui-0.9.23-r2 67
-MD5 2d9954f609edaa8124eb990dddd259e4 files/implicit-config.patch 1820
-MD5 f474df8e81130d6b495663ed56763180 files/preserve-CFLAGS-0.9.23.diff 5470
 MD5 93797247103115aaa2ec56d8de5a6ec7 files/preserve-CFLAGS.diff 5500
 MD5 24814788406be1e1ce09035b2c867399 files/symlink-bug.patch 4326
-MD5 daacb70d49e7ee5ca3c1593f10eea0bc files/true-false.patch 298
 MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
-MD5 eae093d61629b0d42b806e9e84814e79 files/xine-ui-gentoo.diff 5216
diff --git a/media-video/xine-ui/files/digest-xine-ui-0.99.1 b/media-video/xine-ui/files/digest-xine-ui-0.99.1
new file mode 100644
index 000000000000..60de83604041
--- /dev/null
+++ b/media-video/xine-ui/files/digest-xine-ui-0.99.1
@@ -0,0 +1 @@
+MD5 6309b312e41b0caaf53746715d0eb580 xine-ui-0.99.1.tar.gz 2339506
diff --git a/media-video/xine-ui/files/preserve-CFLAGS-0.99.1.diff b/media-video/xine-ui/files/preserve-CFLAGS-0.99.1.diff
new file mode 100644
index 000000000000..d03ee807fa96
--- /dev/null
+++ b/media-video/xine-ui/files/preserve-CFLAGS-0.99.1.diff
@@ -0,0 +1,230 @@
+--- configure	2004-04-17 00:12:00.000000000 +0200
++++ configure.new	2004-06-07 11:52:06.518955539 +0200
+@@ -30005,227 +30005,6 @@
+     ;;
+ 
+   i?86*-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
+-    if test "$GCC" = yes; then
+-
+-		echo "$as_me:$LINENO: checking if $CC supports \"-mcpu=i386\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"-mcpu=i386\" flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS=""-mcpu=i386""
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_try_cflags_ok=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_try_cflags_ok=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-    CFLAGS="$SAVE_CFLAGS"
+-    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+-echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+-    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+-        sarchopt="-mcpu"
+-    else
+-        echo "$as_me:$LINENO: checking if $CC supports \"-march=i386\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"-march=i386\" flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS=""-march=i386""
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_try_cflags_ok=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_try_cflags_ok=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-    CFLAGS="$SAVE_CFLAGS"
+-    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+-echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+-    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+-        sarchopt="-march"
+-    else
+-         echo "$as_me:$LINENO: result: ** no cpu optimization supports **" >&5
+-echo "${ECHO_T}** no cpu optimization supports **" >&6
+-	          sarchopt=no
+-    fi
+-    fi
+-
+-	        echo "$as_me:$LINENO: checking if $CC supports \"$sarchopt=athlon\" flags" >&5
+-echo $ECHO_N "checking if $CC supports \"$sarchopt=athlon\" flags... $ECHO_C" >&6
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS=""$sarchopt=athlon""
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_try_cflags_ok=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_try_cflags_ok=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-    CFLAGS="$SAVE_CFLAGS"
+-    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+-echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+-    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+-        k7cpu="athlon"
+-    else
+-        k7cpu="i686"
+-    fi
+-
+-		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
+-	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+-
+-
+-	if test x"$sarchopt" != "xno"; then
+-
+-	    archopt_val=
+-
+-	    case "$host_alias" in
+-	    i386-*) # *BSD return this even on a P III #-))
+-		archopt_val=i386 ;;
+-	    i486-*) # oh dear!
+-		archopt_val=i486 ;;
+-	    i586-*)
+-		archopt_val=pentium ;;
+-	    i686-*)
+-		archopt_val=pentiumpro
+-		if test x"$check_athlon" = "xyes"; then
+-		    if test -f /proc/cpuinfo; then
+-			modelname=`cat /proc/cpuinfo | grep "model\ name\	:" | sed -e 's/ //g' | cut -d':' -f2`
+-			case "$modelname" in
+-			*Athlon* | *Duron* | *K7*)
+-			    archopt_val="$k7cpu" ;;
+-			esac
+-		    fi
+-		fi
+-		;;
+-	    k6-*)
+-		archopt_val=k6 ;;
+-	    k7-*)
+-		archopt_val=k7 ;;
+-	    athlon-*)
+-		archopt_val=athlon ;;
+-	    esac
+-
+-	    if test x"$archopt_val" != x; then
+-		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
+-		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
+-	    fi
+-
+-	fi
+-
+-    else
+-		CFLAGS="-O $CFLAGS"
+-	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
+-    fi
+-
+-
+ cat >>confdefs.h <<\_ACEOF
+ #define __i386__ 1
+ _ACEOF
diff --git a/media-video/xine-ui/xine-ui-0.99.1.ebuild b/media-video/xine-ui/xine-ui-0.99.1.ebuild
new file mode 100644
index 000000000000..12f1f79a2c45
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.1.ebuild,v 1.1 2004/06/07 10:04:42 phosphan Exp $
+
+inherit eutils
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X gnome nls directfb lirc aalib"
+
+DEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_rc3
+	>=net-misc/curl-7.10.2
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )
+	aalib? ( media-libs/aalib )
+	gnome? ( gnome-base/ORBit )
+	directfb? ( media-libs/aalib
+		>=dev-libs/DirectFB-0.9.9 )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/preserve-CFLAGS-${PV}.diff
+	epatch ${FILESDIR}/true-false.patch
+	use directfb || sed -i "s:dfb::" src/Makefile.in
+	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
+}
+
+src_compile() {
+	rm misc/xine-bugreport
+	local myconf=""
+	use X || myconf="${myconf} --disable-x11 --disable-xv"
+	use nls || myconf="${myconf} --disable-nls"
+	use lirc || myconf="${myconf} --disable-lirc"
+	use aalib || sed -e 's:no_aalib="":no_aalib="yes":g' \
+			-i configure || die "could not disable aalib"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}