amd64 stable wrt #343697

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

4 files changed, 6 insertions, 68 deletions

diff --git a/media-libs/libgpod/ChangeLog b/media-libs/libgpod/ChangeLog
index 8e7552628815..8dad586ff1c6 100644
--- a/media-libs/libgpod/ChangeLog
+++ b/media-libs/libgpod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgpod
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.81 2010/11/04 17:17:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/ChangeLog,v 1.82 2010/11/05 08:55:03 ssuominen Exp $
+
+  05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> libgpod-0.8.0.ebuild:
+  amd64 stable wrt #343697
 
   04 Nov 2010; Christian Faulhammer <fauli@gentoo.org> libgpod-0.8.0.ebuild:
   stable x86, bug 343697
diff --git a/media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch b/media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch
deleted file mode 100644
index 3a98023aad32..000000000000
--- a/media-libs/libgpod/files/libgpod-0.7.2-compile-without-hal.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- libgpod-0.7.2-orig/tools/Makefile.am	2009-04-15 23:18:36.000000000 +0200
-+++ libgpod-0.7.2/tools/Makefile.am	2009-04-28 12:35:43.000000000 +0200
-@@ -1,7 +1,6 @@
- if HAVE_SGUTILS
- 
- bin_PROGRAMS=ipod-read-sysinfo-extended
--noinst_PROGRAMS=ipod-time-sync
- 
- ipod_read_sysinfo_extended_SOURCES =	\
- 	read-sysinfoextended-sgutils.c	\
-@@ -12,6 +11,7 @@
- if HAVE_HAL
- haldir = $(HALCALLOUTSDIR)
- hal_PROGRAMS = libgpod-callout
-+noinst_PROGRAMS=ipod-time-sync
- 
- libgpod_callout_SOURCES =		\
- 	hal-callout.c 		\
diff --git a/media-libs/libgpod/libgpod-0.7.2.ebuild b/media-libs/libgpod/libgpod-0.7.2.ebuild
deleted file mode 100644
index c08f3a51ba85..000000000000
--- a/media-libs/libgpod/libgpod-0.7.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 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.13 2010/10/31 16:38:27 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-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 x86"
-IUSE="+gtk python test hal"
-
-RDEPEND=">=dev-libs/glib-2.16
-	sys-apps/sg3_utils
-	dev-libs/libxml2
-	hal? ( =sys-apps/hal-0.5* )
-	gtk? ( >=x11-libs/gtk+-2.6 )
-	python? ( >=dev-lang/python-2.3
-		>=media-libs/mutagen-1.8
-		>=dev-python/pygobject-2.8 )
-	test? ( media-libs/taglib )"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-1.3.24 )
-	dev-util/pkgconfig
-	dev-libs/libxslt"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-compile-without-hal.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with hal) \
-		$(use_enable gtk gdk-pixbuf) \
-		$(use_enable python pygobject) \
-		$(use_with python)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README TROUBLESHOOTING AUTHORS NEWS README.SysInfo
-}
diff --git a/media-libs/libgpod/libgpod-0.8.0.ebuild b/media-libs/libgpod/libgpod-0.8.0.ebuild
index 6c575ceadd06..4e3cf6993ced 100644
--- a/media-libs/libgpod/libgpod-0.8.0.ebuild
+++ b/media-libs/libgpod/libgpod-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.8.0.ebuild,v 1.4 2010/11/04 17:17:04 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgpod/libgpod-0.8.0.ebuild,v 1.5 2010/11/05 08:55:03 ssuominen Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gtkpod/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk python +udev iphone mono static-libs"
 
 RDEPEND=">=app-pda/libplist-1.0