Revision bump to install libvcd.so and libvcd.pc. This is needed for libcdio.

11 files changed, 157 insertions, 134 deletions

diff --git a/media-video/vcdimager/ChangeLog b/media-video/vcdimager/ChangeLog
index 255154444baa..665d4c7ce66b 100644
--- a/media-video/vcdimager/ChangeLog
+++ b/media-video/vcdimager/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/vcdimager
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/ChangeLog,v 1.19 2004/09/24 03:02:50 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/ChangeLog,v 1.20 2004/09/24 09:35:17 eradicator Exp $
+
+*vcdimager-0.7.20-r2 (24 Sep 2004)
+
+  24 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/vcdimager-0.7.20-libvcd.patch, -vcdimager-0.7.14.ebuild,
+  -vcdimager-0.7.15.ebuild, -vcdimager-0.7.16.ebuild,
+  +vcdimager-0.7.20-r2.ebuild:
+  Removing old versions.
+  Revision bump to install libvcd.so and libvcd.pc. This is needed for libcdio.
 
   23 Sep 2004; Tom Gall <tgall@gentoo.org> vcdimager-0.7.20-r1.ebuild:
   added ~ppc64
diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest
index 7e4657391814..2a14557cbead 100644
--- a/media-video/vcdimager/Manifest
+++ b/media-video/vcdimager/Manifest
@@ -5,13 +5,16 @@ MD5 f71f0fb50a28afc84463f3babdf9aa08 vcdimager-0.7.15.ebuild 1149
 MD5 6ee313437512f8da78a55b0238fef890 vcdimager-0.7.16.ebuild 1150
 MD5 c670ed9ec7d5db38afa076ea1d911404 vcdimager-0.7.17.ebuild 1151
 MD5 66738427d3a0785b5bc29aea7101291a vcdimager-0.7.19.ebuild 1096
-MD5 16c564330d2bc7236964e6029c28fd7b vcdimager-0.7.20-r1.ebuild 1195
 MD5 db19d610bf052c5ad958c5a775448451 vcdimager-0.7.20.ebuild 1095
-MD5 e82176935b2c91da5a4bc00977928d5c files/cdio.patch 301
+MD5 16c564330d2bc7236964e6029c28fd7b vcdimager-0.7.20-r1.ebuild 1195
+MD5 a2d8746c6d3c77c8ca820c68b5290345 vcdimager-0.7.20-r2.ebuild 1258
 MD5 05d0ac26ac23a665c4b3059f3cb3eb81 files/digest-vcdimager-0.7.14 68
 MD5 827551e61b59b4d445bcb7274c10665b files/digest-vcdimager-0.7.15 73
 MD5 51d10ff2c44237bb715680004a9d5259 files/digest-vcdimager-0.7.16 73
 MD5 04fb826d136b198afa9cb1e5b115a63b files/digest-vcdimager-0.7.17 73
 MD5 bc5affe96540d5d15693b7cb5b0e16ea files/digest-vcdimager-0.7.19 73
 MD5 5e0c78969e48bd4c779ccda811e163e3 files/digest-vcdimager-0.7.20 68
+MD5 e82176935b2c91da5a4bc00977928d5c files/cdio.patch 301
 MD5 5e0c78969e48bd4c779ccda811e163e3 files/digest-vcdimager-0.7.20-r1 68
+MD5 c048409383703da86edcf956543bf4a7 files/vcdimager-0.7.20-libvcd.patch 3981
+MD5 5e0c78969e48bd4c779ccda811e163e3 files/digest-vcdimager-0.7.20-r2 68
diff --git a/media-video/vcdimager/files/digest-vcdimager-0.7.14 b/media-video/vcdimager/files/digest-vcdimager-0.7.14
deleted file mode 100644
index fbcaba651cd8..000000000000
--- a/media-video/vcdimager/files/digest-vcdimager-0.7.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c2a076f863f5939d35d2af72c5015bf vcdimager-0.7.14.tar.gz 734081
diff --git a/media-video/vcdimager/files/digest-vcdimager-0.7.15 b/media-video/vcdimager/files/digest-vcdimager-0.7.15
deleted file mode 100644
index c5ca0ee647d3..000000000000
--- a/media-video/vcdimager/files/digest-vcdimager-0.7.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55000b02d7f6e70f3b7e3b034d2429f4 vcdimager-0.7.15-cdio.tar.gz 751426
diff --git a/media-video/vcdimager/files/digest-vcdimager-0.7.16 b/media-video/vcdimager/files/digest-vcdimager-0.7.16
deleted file mode 100644
index b1a46ec6da78..000000000000
--- a/media-video/vcdimager/files/digest-vcdimager-0.7.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8724595754a730455de4ec12b8b74aa8 vcdimager-0.7.16-cdio.tar.gz 753367
diff --git a/media-video/vcdimager/files/digest-vcdimager-0.7.20-r2 b/media-video/vcdimager/files/digest-vcdimager-0.7.20-r2
new file mode 100644
index 000000000000..6fd558018acd
--- /dev/null
+++ b/media-video/vcdimager/files/digest-vcdimager-0.7.20-r2
@@ -0,0 +1 @@
+MD5 fc36c46e296671f2fc35b6811a1aeb52 vcdimager-0.7.20.tar.gz 954324
diff --git a/media-video/vcdimager/files/vcdimager-0.7.20-libvcd.patch b/media-video/vcdimager/files/vcdimager-0.7.20-libvcd.patch
new file mode 100644
index 000000000000..42fb586d43a3
--- /dev/null
+++ b/media-video/vcdimager/files/vcdimager-0.7.20-libvcd.patch
@@ -0,0 +1,96 @@
+diff -Naur vcdimager-0.7.20.orig/Makefile.am vcdimager-0.7.20/Makefile.am
+--- vcdimager-0.7.20.orig/Makefile.am	2004-02-19 22:15:27.000000000 -0800
++++ vcdimager-0.7.20/Makefile.am	2004-09-24 02:22:31.161011459 -0700
+@@ -22,7 +22,7 @@
+ 
+ # pkg-config(1) related rules
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libvcdinfo.pc 
++pkgconfig_DATA = libvcdinfo.pc libvcd.pc
+ 
+ EXTRA_DIST = BUGS FAQ cygwin-dist.sh HACKING libpopt.m4 \
+ 	ChangeLog_pre0_5 ChangeLog_pre0_7_14 \
+diff -Naur vcdimager-0.7.20.orig/Makefile.in vcdimager-0.7.20/Makefile.in
+--- vcdimager-0.7.20.orig/Makefile.in	2004-02-19 22:20:23.000000000 -0800
++++ vcdimager-0.7.20/Makefile.in	2004-09-24 02:22:52.548477211 -0700
+@@ -222,7 +222,7 @@
+ 
+ # pkg-config(1) related rules
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libvcdinfo.pc 
++pkgconfig_DATA = libvcdinfo.pc libvcd.pc
+ EXTRA_DIST = BUGS FAQ cygwin-dist.sh HACKING libpopt.m4 \
+ 	ChangeLog_pre0_5 ChangeLog_pre0_7_14 \
+ 	debian/changelog debian/control debian/copyright debian/docs debian/info debian/rules debian/watch $(wildcard debian/*.install)
+diff -Naur vcdimager-0.7.20.orig/lib/Makefile.am vcdimager-0.7.20/lib/Makefile.am
+--- vcdimager-0.7.20.orig/lib/Makefile.am	2004-02-12 16:52:18.000000000 -0800
++++ vcdimager-0.7.20/lib/Makefile.am	2004-09-24 02:23:26.158923375 -0700
+@@ -45,8 +45,7 @@
+ libvcdinfo_la_REVISION := 1
+ libvcdinfo_la_AGE := 0
+ 
+-noinst_LTLIBRARIES = libvcd.la
+-lib_LTLIBRARIES = libvcdinfo.la
++lib_LTLIBRARIES = libvcd.la libvcdinfo.la
+ 
+ INCLUDES = $(LIBVCD_CFLAGS) $(LIBCDIO_CFLAGS)
+ 
+diff -Naur vcdimager-0.7.20.orig/lib/Makefile.in vcdimager-0.7.20/lib/Makefile.in
+--- vcdimager-0.7.20.orig/lib/Makefile.in	2004-02-19 22:20:25.000000000 -0800
++++ vcdimager-0.7.20/lib/Makefile.in	2004-09-24 02:26:15.567934554 -0700
+@@ -92,7 +92,7 @@
+ CONFIG_CLEAN_FILES =
+ am__installdirs = $(DESTDIR)$(libdir)
+ libLTLIBRARIES_INSTALL = $(INSTALL)
+-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
++LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libvcd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_libvcd_la_OBJECTS = vcd.lo data_structures.lo directory.lo files.lo \
+@@ -254,8 +254,7 @@
+ libvcdinfo_la_CURRENT := 0
+ libvcdinfo_la_REVISION := 1
+ libvcdinfo_la_AGE := 0
+-noinst_LTLIBRARIES = libvcd.la
+-lib_LTLIBRARIES = libvcdinfo.la
++lib_LTLIBRARIES = libvcd.la libvcdinfo.la
+ INCLUDES = $(LIBVCD_CFLAGS) $(LIBCDIO_CFLAGS)
+ libvcd_la_LIBADD = $(LIBCDIO_LIBS) $(LIBISO9660_LIBS)
+ libvcd_la_SOURCES = \
+@@ -382,17 +381,8 @@
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-
+-clean-noinstLTLIBRARIES:
+-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+-	  test "$$dir" = "$$p" && dir=.; \
+-	  echo "rm -f \"$${dir}/so_locations\""; \
+-	  rm -f "$${dir}/so_locations"; \
+-	done
+ libvcd.la: $(libvcd_la_OBJECTS) $(libvcd_la_DEPENDENCIES) 
+-	$(LINK)  $(libvcd_la_LDFLAGS) $(libvcd_la_OBJECTS) $(libvcd_la_LIBADD) $(LIBS)
++	$(LINK) -rpath $(libdir) $(libvcd_la_LDFLAGS) $(libvcd_la_OBJECTS) $(libvcd_la_LIBADD) $(LIBS)
+ libvcdinfo.la: $(libvcdinfo_la_OBJECTS) $(libvcdinfo_la_DEPENDENCIES) 
+ 	$(LINK) -rpath $(libdir) $(libvcdinfo_la_LDFLAGS) $(libvcdinfo_la_OBJECTS) $(libvcdinfo_la_LIBADD) $(LIBS)
+ 
+@@ -564,7 +554,7 @@
+ clean: clean-am
+ 
+ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+-	clean-noinstLTLIBRARIES mostlyclean-am
++	mostlyclean-am
+ 
+ distclean: distclean-am
+ 	-rm -rf ./$(DEPDIR)
+@@ -613,7 +603,7 @@
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+ 
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+-	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
++	clean-libLTLIBRARIES clean-libtool \
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
diff --git a/media-video/vcdimager/vcdimager-0.7.14.ebuild b/media-video/vcdimager/vcdimager-0.7.14.ebuild
deleted file mode 100644
index d96647f3eee7..000000000000
--- a/media-video/vcdimager/vcdimager-0.7.14.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.14.ebuild,v 1.5 2004/07/14 22:16:38 agriffis Exp $
-
-IUSE="xml2"
-
-DESCRIPTION="GNU VCDimager"
-SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/${P}.tar.gz"
-HOMEPAGE="http://www.vcdimager.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-# Ideally this would also include help2man, but it's not yet in portage.
-DEPEND="xml2? ( >=dev-libs/libxml2-2.3.8 )"
-
-src_compile() {
-
-	local myopts
-
-	# We disable the xmltest because the configure script includes differently
-	# than the actual XML-frontend C files.
-
-	use xml2 \
-	&& myopts="${myopts} --with-xml-prefix=/usr --disable-xmltest" \
-	|| myopts="${myopts} --without-xml-frontend"
-
-	econf ${myopts} || die
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HACKING INSTALL
-	dodoc NEWS README THANKS TODO
-}
diff --git a/media-video/vcdimager/vcdimager-0.7.15.ebuild b/media-video/vcdimager/vcdimager-0.7.15.ebuild
deleted file mode 100644
index 04df3ab1db67..000000000000
--- a/media-video/vcdimager/vcdimager-0.7.15.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.15.ebuild,v 1.4 2004/06/25 00:51:56 agriffis Exp $:
-
-IUSE="xml2"
-
-DESCRIPTION="GNU VCDimager"
-S=${WORKDIR}/${PN}-${PV}-cdio
-SRC_URI="http://savannah.nongnu.org/download/libcdio/libcdio.pkg/0.6/${PN}-${PV}-cdio.tar.gz"
-HOMEPAGE="http://www.vcdimager.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-# Ideally this would also include help2man, but it's not yet in portage.
-DEPEND=">=dev-libs/libcdio-0.6
-	xml2? ( >=dev-libs/libxml2-2.3.8 )"
-
-src_compile() {
-	local myopts
-
-	# We disable the xmltest because the configure script includes differently
-	# than the actual XML-frontend C files.
-
-	use xml2 \
-	&& myopts="${myopts} --with-xml-prefix=/usr --disable-xmltest" \
-	|| myopts="${myopts} --without-xml-frontend"
-
-	econf ${myopts} || die
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HACKING INSTALL
-	dodoc NEWS README THANKS TODO
-}
diff --git a/media-video/vcdimager/vcdimager-0.7.16.ebuild b/media-video/vcdimager/vcdimager-0.7.16.ebuild
deleted file mode 100644
index a3978bb5ea7e..000000000000
--- a/media-video/vcdimager/vcdimager-0.7.16.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.16.ebuild,v 1.4 2004/06/25 00:51:56 agriffis Exp $
-
-IUSE="xml2"
-
-DESCRIPTION="GNU VCDimager"
-S=${WORKDIR}/${PN}-${PV}-cdio
-SRC_URI="http://savannah.nongnu.org/download/libcdio/libcdio.pkg/0.61/${PN}-${PV}-cdio.tar.gz"
-HOMEPAGE="http://www.vcdimager.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-# Ideally this would also include help2man, but it's not yet in portage.
-DEPEND=">=dev-libs/libcdio-0.61
-	xml2? ( >=dev-libs/libxml2-2.3.8 )"
-
-src_compile() {
-	local myopts
-
-	# We disable the xmltest because the configure script includes differently
-	# than the actual XML-frontend C files.
-
-	use xml2 \
-	&& myopts="${myopts} --with-xml-prefix=/usr --disable-xmltest" \
-	|| myopts="${myopts} --without-xml-frontend"
-
-	econf ${myopts} || die
-	emake || die
-}
-
-src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog FAQ HACKING INSTALL
-	dodoc NEWS README THANKS TODO
-}
diff --git a/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild b/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild
new file mode 100644
index 000000000000..6df2269192e3
--- /dev/null
+++ b/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vcdimager/vcdimager-0.7.20-r2.ebuild,v 1.1 2004/09/24 09:35:17 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="GNU VCDimager"
+HOMEPAGE="http://www.vcdimager.org/"
+SRC_URI="http://www.vcdimager.org/pub/vcdimager/vcdimager-0.7_UNSTABLE/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~alpha ~ia64 ~sparc"
+IUSE="xml2"
+
+DEPEND=">=dev-libs/libcdio-0.66
+	dev-util/pkgconfig
+	xml2? ( >=dev-libs/libxml2-2.5.11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/cdio.patch
+
+	# Patch Makefile.in to install libvcd.
+	epatch ${FILESDIR}/${P}-libvcd.patch
+}
+
+src_compile() {
+	local myopts
+	# We disable the xmltest because the configure script includes differently
+	# than the actual XML-frontend C files.
+	use xml2 \
+		&& myopts="${myopts} --with-xml-prefix=/usr --disable-xmltest" \
+		|| myopts="${myopts} --without-xml-frontend"
+
+	econf ${myopts} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc AUTHORS BUGS ChangeLog FAQ HACKING NEWS README THANKS TODO
+}