old, use emake

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

5 files changed, 5 insertions, 132 deletions

diff --git a/media-libs/libgpod/Manifest b/media-libs/libgpod/Manifest
index cc38d12303b4..5d9b6f318aa6 100644
--- a/media-libs/libgpod/Manifest
+++ b/media-libs/libgpod/Manifest
@@ -1,10 +1,5 @@
-AUX libgpod-0.6.0+gcc-4.3.patch 301 RMD160 f9421e535c16951d5086f96cb5911fb327f7fd20 SHA1 fa0ac9be349e923dc2409081e347db8275d5eace SHA256 f06019ea636aeb21638754bef66ef12ee3f5f86df9c322661a2f4830f80f6bdd
 AUX libgpod-0.7.2-compile-without-hal.patch 509 RMD160 8035f563bd5c884424d65eca5e3ff3dda1b12b01 SHA1 46ac9d7e2731bf0fdf7ed883d5703d058065568f SHA256 238d7e483fa91e27ae7274f8538a49a46a1c1b5d48ede0c9cf12fcce3b983f33
-DIST libgpod-0.6.0.tar.gz 843097 RMD160 684ea4276cd2c1fbe4c415a8ac931d8777e8c2fb SHA1 09b660324785cec122b5df62f1825ebd595c4ecc SHA256 a2c8c998588361d8aaa4c662a38f50db164b8b4fce4e7bc49ac445a9ac87f80f
-DIST libgpod-0.7.0.tar.gz 949630 RMD160 0d0b0961231aa257767e11ba1e51f4eeea01f764 SHA1 c8ed26ed81a85acf230b5e2065399b038ac00046 SHA256 e10d438b1cda5ebb93234fad31d20c8f9e096e9dc8e7a4af1aa371b389eb4e1e
 DIST libgpod-0.7.2.tar.gz 959142 RMD160 231b4efd49b8b36e5b644e804a2cd0958b1d3fbf SHA1 66c95cec9f8aba92f3472df7429e873d30d0bd79 SHA256 2e8f31fc37ed0c9c89004097fdb568e8971627e7aedfb57fb229399c0f490777
-EBUILD libgpod-0.6.0.ebuild 1532 RMD160 efad623f66cf12e904131b5656e702b231a9363b SHA1 ad9209535e3a23dbcffcea2c7a159ca119ad43bc SHA256 32fa1c654dc3edb7da5cd2b93119af768eb2fed01ff176e808bca684f1d0a051
-EBUILD libgpod-0.7.0.ebuild 1437 RMD160 0bab34aebd575494c7010c7ff67cb7ee45644c55 SHA1 37e294e25a3094dae3022db5ed95302e7dd4ad9f SHA256 b1ab3b43aafe8bb1ce568d761103ecdd0144916ac6091bac724b983491308756
-EBUILD libgpod-0.7.2.ebuild 1242 RMD160 6e7e8ed5206952a820e565ce212d54aa9f824cc3 SHA1 1793459c28a6106a00e6cad826028ad6a1265cde SHA256 a0f0b0b9bd591412a239d3206c99d161c327bf76c95f49b8b2f4342ba90750dc
+EBUILD libgpod-0.7.2.ebuild 1203 RMD160 e3a4bfc52153977142e91feb9c16b903c6428938 SHA1 d7a1d3c3e99d107172a85010e51464f8a7d0f179 SHA256 e6b797dd6e7e37b6e0e976fc9be744809ceef05a6015bdf18fb33b38ea8bbbaa
 MISC ChangeLog 8698 RMD160 a2c8946615152f69a909be66f767a273fd34487d SHA1 5941a84d758b28c65cc6397d1e9402a20d83e26e SHA256 199b02e3af409fc19195458317b3eca6adb105926a35a4635ad7d98a0b89e090
 MISC metadata.xml 531 RMD160 b98d6dfd48ef14abe39eada4e28b876a8e2e1ea0 SHA1 e52cfaef27badc6cb243061a7a0c8e632f6dd677 SHA256 443935c87070ae93daa3f164cf637df09390f7043daab125cad11b2cab0b7291
diff --git a/media-libs/libgpod/files/libgpod-0.6.0+gcc-4.3.patch b/media-libs/libgpod/files/libgpod-0.6.0+gcc-4.3.patch
deleted file mode 100644
index 1e5dfe890237..000000000000
--- a/media-libs/libgpod/files/libgpod-0.6.0+gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- media-libs/libgpod-0.6.0/work/libgpod-0.6.0/tests/test-rebuild-db.cc	2007-06-02 10:56:58.000000000 +0200
-+++ test-rebuild-db.cc	2008-04-09 14:28:09.000000000 +0200
-@@ -29,6 +29,7 @@
- #include <sys/stat.h>
- #include <typeinfo>
- #include <unistd.h>
-+#include <cstring>
- 
- #include <glib/gstdio.h>
- 
diff --git a/media-libs/libgpod/libgpod-0.6.0.ebuild b/media-libs/libgpod/libgpod-0.6.0.ebuild
deleted file mode 100644
index 288c4939caae..000000000000
--- a/media-libs/libgpod/libgpod-0.6.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.6.0.ebuild,v 1.13 2009/03/10 17:40:52 tester Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="Shared library to access the contents of an iPod"
-HOMEPAGE="http://www.gtkpod.org/libgpod.html"
-SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE="gtk python doc test hal"
-
-RDEPEND=">=dev-libs/glib-2.4
-	hal? ( =sys-apps/hal-0.5* )
-	sys-apps/sg3_utils
-	gtk? ( >=x11-libs/gtk+-2 )
-	python? ( >=dev-lang/python-2.3
-		>=x11-libs/gtk+-2
-		media-libs/mutagen
-		gtk? ( >=dev-python/pygobject-2 ) )
-	test? ( media-libs/taglib )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	python? ( >=dev-lang/swig-1.3.24 )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}+gcc-4.3.patch"
-
-	elibtoolize
-}
-
-src_compile() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable gtk gdk-pixbuf) \
-		$(use_with hal hal) \
-		$(use_enable python) \
-		$(use_with python) || die "configure failed"
-
-	emake || die "make failed"
-
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README TROUBLESHOOTING AUTHORS NEWS README.SysInfo
-}
-
-pkg_postinst() {
-	einfo "If you use a newer Ipod like the Ipod classic, make sure to read"
-	einfo "the information in README.SysInfo in /usr/share/doc/${P}"
-	einfo "This is no needed if HAL is installed and works correctly."
-}
diff --git a/media-libs/libgpod/libgpod-0.7.0.ebuild b/media-libs/libgpod/libgpod-0.7.0.ebuild
deleted file mode 100644
index 74ce257d643c..000000000000
--- a/media-libs/libgpod/libgpod-0.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.7.0.ebuild,v 1.5 2009/05/31 15:33:48 ranger Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="Shared library to access the contents of an iPod"
-HOMEPAGE="http://www.gtkpod.org/libgpod.html"
-SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ppc64 ~sparc x86"
-IUSE="gtk python doc test hal"
-
-RDEPEND=">=dev-libs/glib-2.4
-	hal? ( =sys-apps/hal-0.5* )
-	sys-apps/sg3_utils
-	gtk? ( >=x11-libs/gtk+-2 )
-	python? ( >=dev-lang/python-2.3
-		>=x11-libs/gtk+-2
-		media-libs/mutagen
-		>=dev-python/pygobject-2 )
-	test? ( media-libs/taglib )"
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	python? ( >=dev-lang/swig-1.3.24 )
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable gtk gdk-pixbuf) \
-		$(use_with hal hal) \
-		$(use_enable python pygobject) \
-		$(use_with python) || die "configure failed"
-
-	emake || die "make failed"
-
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README TROUBLESHOOTING AUTHORS NEWS README.SysInfo
-}
-
-pkg_postinst() {
-	einfo "If you use a newer Ipod like the Ipod classic, make sure to read"
-	einfo "the information in README.SysInfo in /usr/share/doc/${P}"
-	einfo "This is no needed if HAL is installed and works correctly."
-}
diff --git a/media-libs/libgpod/libgpod-0.7.2.ebuild b/media-libs/libgpod/libgpod-0.7.2.ebuild
index 0fa16264d665..41632eb6187a 100644
--- a/media-libs/libgpod/libgpod-0.7.2.ebuild
+++ b/media-libs/libgpod/libgpod-0.7.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.7.2.ebuild,v 1.9 2009/09/27 15:25:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.7.2.ebuild,v 1.10 2009/09/29 21:37:41 ssuominen Exp $
 
 EAPI=2
-
 inherit autotools eutils
 
 DESCRIPTION="Shared library to access the contents of an iPod"
@@ -30,7 +29,7 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-compile-without-hal.patch"
+	epatch "${FILESDIR}"/${P}-compile-without-hal.patch
 	eautoreconf
 }
 
@@ -39,10 +38,10 @@ src_configure() {
 		$(use_with hal) \
 		$(use_enable gtk gdk-pixbuf) \
 		$(use_enable python pygobject) \
-		$(use_with python) || die "configure failed"
+		$(use_with python)
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc README TROUBLESHOOTING AUTHORS NEWS README.SysInfo
 }