RESTRICT="nomirror"

12 files changed, 45 insertions, 35 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index d468e538f54f..40694d000852 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.71 2003/10/17 18:16:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.72 2003/10/21 15:07:29 mholzer Exp $
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-0.9.13-r3.ebuild,
+  xine-lib-1_beta12-r1.ebuild, xine-lib-1_beta12.ebuild,
+  xine-lib-1_rc0-r3.ebuild, xine-lib-1_rc1.ebuild:
+  added RESTRICT="nomirror".
 
   18 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-lib-1_beta12-r1.ebuild,
   xine-lib-1_beta12.ebuild, xine-lib-1_rc0-r3.ebuild, xine-lib-1_rc1.ebuild:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index cf043cb87bdc..30f340d27e9e 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,10 +1,10 @@
-MD5 80404cda0419b16af8ebe5fd3f646734 ChangeLog 13971
+MD5 2498c3103d34fc5d7996aeb79a3ffb19 ChangeLog 14186
 MD5 ae4bc626a0e60a274f0edcd798d9ad7f metadata.xml 252
-MD5 238c54c6e566c4d30cad02c029c66d1e xine-lib-0.9.13-r3.ebuild 3638
-MD5 87f7f04e316bee7f2c6edbf12e876ee0 xine-lib-1_beta12-r1.ebuild 4147
-MD5 c1432b03ea8d58e4847bdfbb1b546b82 xine-lib-1_beta12.ebuild 3714
-MD5 9acbf8aa5a56123443909374ced78517 xine-lib-1_rc0-r3.ebuild 4186
-MD5 aa73e5cf9a037f1a5b2d4f0dfd76822d xine-lib-1_rc1.ebuild 4189
+MD5 e5f3c44f7623ca8935cfb036f659d60c xine-lib-0.9.13-r3.ebuild 3656
+MD5 512b8ccb65630b7d1401a20066d9b25d xine-lib-1_beta12-r1.ebuild 4168
+MD5 7f49f48a39c11bd0858b9ce75d5069e0 xine-lib-1_beta12.ebuild 3734
+MD5 5f685f685db7b1ad3bd3c4e4c03bfec7 xine-lib-1_rc0-r3.ebuild 4206
+MD5 9622eda3cd1a39fb76833e84c5706bb9 xine-lib-1_rc1.ebuild 4160
 MD5 f1570a69c99207f65b5cdf1d154bbcd4 files/digest-xine-lib-0.9.13-r3 68
 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12 70
 MD5 8a96afc4d37712253fc7bb3472efbdc4 files/digest-xine-lib-1_beta12-r1 70
diff --git a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild b/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
index 5f19ea9610f5..3a43a5fdef27 100644
--- a/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild,v 1.5 2003/09/06 23:59:49 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.13-r3.ebuild,v 1.6 2003/10/21 15:07:29 mholzer Exp $
 
 IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa"
 
@@ -17,10 +17,11 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
+RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc"
 
 DEPEND="oggvorbis? ( media-libs/libvorbis )
 	X? ( virtual/x11 )
diff --git a/media-libs/xine-lib/xine-lib-1_beta12-r1.ebuild b/media-libs/xine-lib/xine-lib-1_beta12-r1.ebuild
index 747a06553fa7..67277edacdbb 100644
--- a/media-libs/xine-lib/xine-lib-1_beta12-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta12-r1.ebuild,v 1.9 2003/10/17 18:16:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta12-r1.ebuild,v 1.10 2003/10/21 15:07:29 mholzer Exp $
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
 # Commenting this out in this ebuild, because CFLAGS and CXXFLAGS are unset
@@ -18,6 +18,7 @@ MAKEOPTS="$MAKEOPTS -j1"
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
diff --git a/media-libs/xine-lib/xine-lib-1_beta12.ebuild b/media-libs/xine-lib/xine-lib-1_beta12.ebuild
index 3648263f82af..58db7375c132 100644
--- a/media-libs/xine-lib/xine-lib-1_beta12.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_beta12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta12.ebuild,v 1.8 2003/10/17 18:16:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_beta12.ebuild,v 1.9 2003/10/21 15:07:29 mholzer Exp $
 
 # this build doesn't play nice with -maltivec (gcc 3.2 only option) on ppc
 # Commenting this out in this ebuild, because CFLAGS and CXXFLAGS are unset
@@ -18,6 +18,7 @@ MAKEOPTS="$MAKEOPTS -j1"
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
diff --git a/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild
index 65a043fbaeff..102696cd365b 100644
--- a/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild,v 1.6 2003/10/17 18:16:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc0-r3.ebuild,v 1.7 2003/10/21 15:07:29 mholzer Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ MY_PKG_SUFFIX="a"
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
diff --git a/media-libs/xine-lib/xine-lib-1_rc1.ebuild b/media-libs/xine-lib/xine-lib-1_rc1.ebuild
index a16b8a3a95d3..402bdcd46f49 100644
--- a/media-libs/xine-lib/xine-lib-1_rc1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc1.ebuild,v 1.2 2003/10/17 18:16:11 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc1.ebuild,v 1.3 2003/10/21 15:07:29 mholzer Exp $
 
 inherit eutils
 
@@ -23,6 +23,7 @@ MY_PKG_SUFFIX=""
 DESCRIPTION="Core libraries for Xine movie player"
 HOMEPAGE="http://xine.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="1"
@@ -49,8 +50,7 @@ RDEPEND="oggvorbis? ( media-libs/libvorbis )
 	media-libs/speex"
 
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	>=sys-devel/gcc-3.2"
+	nls? ( sys-devel/gettext )"
 
 #sys-devel/gcc-3.2 fixes -march=pentium4 compile issue
 
@@ -101,8 +101,6 @@ src_compile() {
 	use sdl \
 		|| myconf="${myconf} --with-sdl-prefix=/null" # disable sdl check
 
-	einfo "myconf: ${myconf}"
-
 	econf ${myconf} || die "Configure failed"
 
 	emake || die "Parallel make failed"
diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 47d96a542436..b73c70d73647 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.36 2003/08/12 01:09:45 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.37 2003/10/21 15:04:02 mholzer Exp $
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> xine-ui-0.9.13.ebuild,
+  xine-ui-0.9.21.ebuild, xine-ui-0.9.22.ebuild:
+  added RESTRICT="nomirror"
 
   11 Aug 2003; Jason Wever <weeve@gentoo.org> xine-ui-0.9.21.ebuild:
   Added ~sparc to keywords.
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index cdf76ff059d0..62def3d6335a 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,7 +1,7 @@
-MD5 79ecde33abfa9be734d478668c997a49 ChangeLog 6239
-MD5 ee535a0d42a6dbd9eb44d1e4c0853177 xine-ui-0.9.13.ebuild 1615
-MD5 f271736f1eb19e8c25c7d9baa0585881 xine-ui-0.9.21.ebuild 1534
-MD5 2dd344e39fac4694bd7140c27453c035 xine-ui-0.9.22.ebuild 1525
+MD5 54461ab09a723f3a764c34633a978363 ChangeLog 6391
+MD5 6d620adba18c3d0705bbe4fc1c2fe152 xine-ui-0.9.13.ebuild 1633
+MD5 a17d6eb90fdcd029c820ab1260183337 xine-ui-0.9.22.ebuild 1470
+MD5 1801457cb5ca06f6d14c29bdd86f76a2 xine-ui-0.9.21.ebuild 1553
 MD5 507406ba270ef32d0ed30da3e932ef01 files/digest-xine-ui-0.9.13 67
 MD5 32aa0f3c22f337999efc35a1eff3cd94 files/digest-xine-ui-0.9.21 67
 MD5 f9ec30bd10b5c9d431b5d382310fe87d files/xine-ui-configure.patch 336
diff --git a/media-video/xine-ui/xine-ui-0.9.13.ebuild b/media-video/xine-ui/xine-ui-0.9.13.ebuild
index bee09b38a4c3..b7ab1196c03e 100644
--- a/media-video/xine-ui/xine-ui-0.9.13.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.9.13.ebuild,v 1.8 2003/09/07 00:08:13 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.13.ebuild,v 1.9 2003/10/21 15:04:02 mholzer Exp $
 
 IUSE="X aalib gnome nls directfb"
 
@@ -24,7 +24,7 @@ RDEPEND="nls? ( sys-devel/gettext )"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
-
+RESTRICT="nomirror"
 
 src_unpack() {
 
diff --git a/media-video/xine-ui/xine-ui-0.9.21.ebuild b/media-video/xine-ui/xine-ui-0.9.21.ebuild
index 87d62f24e153..1d8e2f7a715c 100644
--- a/media-video/xine-ui/xine-ui-0.9.21.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.9.21.ebuild,v 1.5 2003/09/07 00:08:13 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.21.ebuild,v 1.6 2003/10/21 15:04:02 mholzer Exp $
 
 DESCRIPTION="Skinned front end for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -21,6 +21,7 @@ IUSE="X aalib gnome nls directfb lirc"
 
 SLOT="0"
 KEYWORDS="x86 ~ppc ~sparc"
+RESTRICT="nomirror"
 
 S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
diff --git a/media-video/xine-ui/xine-ui-0.9.22.ebuild b/media-video/xine-ui/xine-ui-0.9.22.ebuild
index 9555269ec844..eedc01fae30d 100644
--- a/media-video/xine-ui/xine-ui-0.9.22.ebuild
+++ b/media-video/xine-ui/xine-ui-0.9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.9.22.ebuild,v 1.2 2003/09/07 00:08:13 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.9.22.ebuild,v 1.3 2003/10/21 15:04:02 mholzer Exp $
 
 DESCRIPTION="Skinned front end for Xine movie player."
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -21,6 +21,7 @@ IUSE="X aalib gnome nls directfb lirc"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
+RESTRICT="nomirror"
 
 S=${WORKDIR}/${P}
 SRC_URI="mirror://sourceforge/xine/${P}.tar.gz"
@@ -33,22 +34,19 @@ src_unpack() {
 	#patch -p1 < ${FILESDIR}/xine-ui-configure.patch || die "patch failed"
 
 	use directfb || ( \
-		sed -e "s:dfb::" src/Makefile.in \
-		    > src/Makefile.in.hacked
-		mv src/Makefile.in.hacked src/Makefile.in
+		sed -i "s:dfb::" src/Makefile.in
 	)
 
-	sed -e "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in \
-	    > src/xitk/Makefile.in.hacked
-	mv src/xitk/Makefile.in.hacked src/xitk/Makefile.in
-
+	sed -i "s:LDFLAGS =:LDFLAGS = -L/lib:" src/xitk/Makefile.in
 }
 
 src_compile() {
 
 	local myconf
-	use X	   || myconf="${myconf} --disable-x11 --disable-xv"
-	use nls	   || myconf="${myconf} --disable-nls"
+	use X || myconf="${myconf} --disable-x11 --disable-xv"
+	use nls || myconf="${myconf} --disable-nls"
+	use aalib || myconf="${myconf} --disable-aalibtest"
+	use lirc || myconf="${myconf} --disable-lirc"
 
 	econf ${myconf} || die
 	emake || die