Disable C++ checks / fix uClibc building #74497 / clean up.

3 files changed, 39 insertions, 25 deletions

diff --git a/media-libs/libdv/ChangeLog b/media-libs/libdv/ChangeLog
index 95b4138c3f2e..2af71519076e 100644
--- a/media-libs/libdv/ChangeLog
+++ b/media-libs/libdv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libdv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.35 2005/01/11 02:44:45 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/ChangeLog,v 1.36 2005/01/12 04:06:39 vapier Exp $
+
+  11 Jan 2005; Mike Frysinger <vapier@gentoo.org> libdv-0.104.ebuild:
+  Disable C++ checks / fix uClibc building #74497 / clean up.
 
 *libdv-0.104 (10 Jan 2005)
 
diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index eb299688ee4f..1fb3f9fa6816 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,13 +1,23 @@
-MD5 6104a924ab9136919a1b0eac2bf586bb libdv-0.101.ebuild 1164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 626613d894362ecfd027b6285db2695a ChangeLog 5045
 MD5 a113b083fad2c71bcf2a360548ac7545 libdv-0.102.ebuild 1169
 MD5 9eddaa9f84b052f62b463beadff4dfe7 libdv-0.99-r1.ebuild 1169
 MD5 1427fcf4db28b76b675aae8bac20ab39 metadata.xml 274
-MD5 2828654da771b3dddc6d6b2fb2fc1051 libdv-0.104.ebuild 1169
-MD5 db041017458ffa2ad9bd7fbe34c2f17d ChangeLog 4910
-MD5 21abc06a6e969b1a6b5b1ca2f1f09474 files/digest-libdv-0.101 63
+MD5 6104a924ab9136919a1b0eac2bf586bb libdv-0.101.ebuild 1164
+MD5 95f4074d884279a9481527b7fefddacd libdv-0.104.ebuild 1135
 MD5 d577f2ed689030f4f13088422f1fa185 files/digest-libdv-0.102 63
 MD5 3d3bbf2ecd039329fe6b73dc9ada38bf files/digest-libdv-0.99-r1 62
-MD5 592d600ce50f0a107ecd5b348d434f9f files/libdv-0.99-2.6.patch 439
 MD5 db1c07312c8a5de3d64bc80c44b26d6e files/libdv-0.99-disablegtk.patch 3309
+MD5 592d600ce50f0a107ecd5b348d434f9f files/libdv-0.99-2.6.patch 439
+MD5 21abc06a6e969b1a6b5b1ca2f1f09474 files/digest-libdv-0.101 63
 MD5 2524a27d2f6e849452d1d5d1f97580ec files/digest-libdv-0.104 63
 MD5 ccdc17c32d38a07aab1b06d6932a13f8 files/libdv-0.104-amd64reloc.patch 9114
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.14 (GNU/Linux)
+
+iD8DBQFB5KJrroRuSHgZdywRAi7UAJ0cCNzI8Y4GfIqyR0u6rACYUXSLhgCfeKun
+zdR1ZFzfbMz+SUWyvxtY1Vc=
+=xHQX
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libdv/libdv-0.104.ebuild b/media-libs/libdv/libdv-0.104.ebuild
index 96de9d603f24..398fc22dab07 100644
--- a/media-libs/libdv/libdv-0.104.ebuild
+++ b/media-libs/libdv/libdv-0.104.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.1 2005/01/11 02:44:46 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdv/libdv-0.104.ebuild,v 1.2 2005/01/12 04:06:39 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils libtool
 
-DESCRIPTION="Software codec for dv-format video (camcorders etc)."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
+DESCRIPTION="Software codec for dv-format video (camcorders etc)"
 HOMEPAGE="http://libdv.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ia64 ~x86"
 IUSE="debug gtk sdl xv"
 
 RDEPEND="dev-libs/popt
@@ -22,23 +21,25 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack() {
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.99-2.6.patch"
-	epatch "${FILESDIR}/${PN}-0.104-amd64reloc.patch"
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
+	epatch "${FILESDIR}"/${PN}-0.104-amd64reloc.patch
+	epunt_cxx #74497
+	uclibctoolize #74497
 }
 
 src_compile() {
-	local myconf
-	myconf="${myconf} `use_with debug`"
-	myconf="${myconf} `use_enable gtk` `use_enable gtk gtktest`"
-	myconf="${myconf} `use_enable sdl`"
-	myconf="${myconf} `use_enable xv`"
-
-	econf ${myconf} || die "econf failed"
+	econf \
+		$(use_with debug) \
+		$(use_enable gtk) $(use_enable gtk gtktest) \
+		$(use_enable sdl) \
+		$(use_enable xv) \
+		|| die "econf failed"
 	make || die "compile problem"
 }
 
-src_install () {
-	einstall
-	dodoc AUTHORS COPYING COPYRIGHT ChangeLog INSTALL NEWS README* TODO
+src_install() {
+	make install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
 }