ogle fixes and removal of old and broken version

5 files changed, 11 insertions, 71 deletions

diff --git a/media-video/ogle/ChangeLog b/media-video/ogle/ChangeLog
index 104bcd00725f..4b1106ea8246 100644
--- a/media-video/ogle/ChangeLog
+++ b/media-video/ogle/ChangeLog
@@ -1,13 +1,11 @@
 # ChangeLog for media-video/ogle
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ChangeLog,v 1.2 2002/03/27 04:47:55 blocke Exp $
+
+*ogle-0.8.2-r5 (26 Mar 2002)
+
+  26 Mar 2002; Bruce A. Locke <blocke@shivan.org> ogle-0.8.2-r5.ebuild :
+
+  libtool and libxml2 fixes should make this ebuild usable again
 
-*ogle-0.8.2-r2 (1 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/media-video/ogle/files/digest-ogle-0.8.2-r4 b/media-video/ogle/files/digest-ogle-0.8.2-r4
deleted file mode 100644
index 9774a8b01d9b..000000000000
--- a/media-video/ogle/files/digest-ogle-0.8.2-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b2c949e372b7e79f9106d99c5d2ba45 ogle-0.8.2.tar.gz 480190
diff --git a/media-video/ogle/files/digest-ogle-0.8.2-r2 b/media-video/ogle/files/digest-ogle-0.8.2-r5
index 9774a8b01d9b..9774a8b01d9b 100644
--- a/media-video/ogle/files/digest-ogle-0.8.2-r2
+++ b/media-video/ogle/files/digest-ogle-0.8.2-r5
diff --git a/media-video/ogle/ogle-0.8.2-r2.ebuild b/media-video/ogle/ogle-0.8.2-r2.ebuild
deleted file mode 100644
index 093675c2d256..000000000000
--- a/media-video/ogle/ogle-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.8.2-r2.ebuild,v 1.2 2002/02/02 05:08:40 blocke Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Ogle is a full featured DVD player that supports DVD menus"
-SRC_URI="http://www.dtek.chalmers.se/groups/dvd/dist/${P}.tar.gz"
-HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
-
-DEPEND="media-libs/libdvdcss media-libs/jpeg dev-libs/libxml2 media-libs/libdvdread media-libs/a52dec x11-base/xfree"
-
-src_compile() {
-
-  local myconf
-
-  use mmx || myconf="--disable-mmx"
-  use oss || myconf="${myconf} --disable-oss"
-
-  ./configure --prefix=/usr --enable-shared --sysconfdir=/etc --host=${CHOST}  || die
-  make CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml -I/usr/include/libxml2" || die	
-
-}
-
-src_install() {
-	
-  make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info docdir=${D}/usr/share/doc/${PF}/html sysconfdir=${D}/etc install || die
-  dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO doc/liba52.txt
-
-  # fix bug #376: ogle build does not install libdvdcontrol shared libs
-  # if libs are not already installed... (could not find error in makefile)
-  insinto /usr/lib/ogle
-  doins ogle/.libs/libdvdcontrol.a
-  mv ogle/libdvdcontrol.la ogle/libdvdcontrol.la.old
-  sed 's|/var/tmp/portage/ogle-0.8.2-r2/work/ogle-0.8.2/ogle|/usr/lib/ogle|' ogle/libdvdcontrol.la.old > ogle/libdvdcontrol.la
-  doins ogle/libdvdcontrol.la
-  mv ogle/.libs/libdvdcontrol.so.3.2.0U ogle/.libs/libdvdcontrol.so.3.2.0
-  doins ogle/.libs/libdvdcontrol.so.3.2.0
-  dosym /usr/lib/ogle/libdvdcontrol.so.3.2.0 /usr/lib/ogle/libdvdcontrol.so
-  dosym /usr/lib/ogle/libdvdcontrol.so.3.2.0 /usr/lib/ogle/libdvdcontrol.so.3
-  dosym /usr/lib/ogle /usr/lib/ogle/.libs
-
-}
-
diff --git a/media-video/ogle/ogle-0.8.2-r4.ebuild b/media-video/ogle/ogle-0.8.2-r5.ebuild
index 05fbb8ac3504..31b59a196387 100644
--- a/media-video/ogle/ogle-0.8.2-r4.ebuild
+++ b/media-video/ogle/ogle-0.8.2-r5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.8.2-r4.ebuild,v 1.1 2002/03/25 21:18:35 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogle/ogle-0.8.2-r5.ebuild,v 1.1 2002/03/27 04:47:56 blocke Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Ogle is a full featured DVD player that supports DVD menus"
@@ -11,14 +11,14 @@ HOMEPAGE="http://www.dtek.chalmers.se/groups/dvd/"
 DEPEND="media-libs/libdvdcss media-libs/jpeg dev-libs/libxml2 media-libs/libdvdread media-libs/a52dec x11-base/xfree"
 
 src_compile() {
-	# Fix libxml2. note, this is CLUDGE and not good!
- 	CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml" 
-	CXXFLAGS="${CXXFLAGS} -I/usr/include/libxml2/libxml"
+
 	local myconf
 	
 	use mmx || myconf="--disable-mmx"
 	use oss || myconf="${myconf} --disable-oss"
+
 	libtoolize --copy --force
+
 	./configure --prefix=/usr --enable-shared --sysconfdir=/etc --host=${CHOST}  || die
 	make CFLAGS="${CFLAGS} -I/usr/include/libxml2/libxml -I/usr/include/libxml2" || die	
 
@@ -29,18 +29,5 @@ src_install() {
   make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info docdir=${D}/usr/share/doc/${PF}/html sysconfdir=${D}/etc install || die
   dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO doc/liba52.txt
 
-  # fix bug #376: ogle build does not install libdvdcontrol shared libs
-  # if libs are not already installed... (could not find error in makefile)
-  insinto /usr/lib/ogle
-  doins ogle/.libs/libdvdcontrol.a
-  mv ogle/libdvdcontrol.la ogle/libdvdcontrol.la.old
-  sed 's|/var/tmp/portage/ogle-0.8.2-r2/work/ogle-0.8.2/ogle|/usr/lib/ogle|' ogle/libdvdcontrol.la.old > ogle/libdvdcontrol.la
-  doins ogle/libdvdcontrol.la
-  mv ogle/.libs/libdvdcontrol.so.3.2.0U ogle/.libs/libdvdcontrol.so.3.2.0
-  doins ogle/.libs/libdvdcontrol.so.3.2.0
-  dosym /usr/lib/ogle/libdvdcontrol.so.3.2.0 /usr/lib/ogle/libdvdcontrol.so
-  dosym /usr/lib/ogle/libdvdcontrol.so.3.2.0 /usr/lib/ogle/libdvdcontrol.so.3
-  dosym /usr/lib/ogle /usr/lib/ogle/.libs
-
 }