5 files changed, 8 insertions, 86 deletions
diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index 87a41e4a55e7..1a83a62681e3 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.85 2010/11/04 17:15:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.86 2010/11/05 08:56:18 ssuominen Exp $
+
+  05 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> gtkpod-1.0.0.ebuild:
+  amd64 stable wrt #343697
 
   04 Nov 2010; Christian Faulhammer <fauli@gentoo.org> gtkpod-1.0.0.ebuild:
   stable x86, bug 343697
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index c94205e980f0..36373e247244 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gtkpod-0.99.14_p20090710-libmp4v2.patch 257 RMD160 bc2e06c1e5d95df2833eaac61124995605781b37 SHA1 80d0eb6efcf29dcab6ad1c5ee94070b58081b83f SHA256 588e7d44ea54189418c9630c86fb4bf68c4aed80447df46eca1e4ffef8b51b69
-DIST gtkpod-0.99.14_p20090710.tar.bz2 1540888 RMD160 2613c9b2f5e819100f2d89f0ca135f80bed8d513 SHA1 00a99d042b7f11dadac2b0f317b545af899cbaa8 SHA256 b7d9025927c0d6feef43f51df5664c33f8c7f4523f8ab16f59d59946da8e812d
 DIST gtkpod-1.0.0.tar.gz 1899869 RMD160 271e9aeb25493b89933f203ebce4c004ce0da573 SHA1 77b768663458069a414c59b7aad285020c93a035 SHA256 d8089455d089b85390daefc522b7d60403ccf24585a57cae9f47b052f4f25f12
-EBUILD gtkpod-0.99.14_p20090710.ebuild 1400 RMD160 fb14f2e70ed8b8b4120ac556bdb2f90739b9c2a1 SHA1 f57030c6f654e93308bb70519bbc1e380b7db2b8 SHA256 02b7c080d6534864aa10a10873e2ada68789e816902ad67217d90602b9695ffd
-EBUILD gtkpod-1.0.0.ebuild 1130 RMD160 14c6ff3fbf75912bd9cd79da343377788a4937e8 SHA1 9298c7d5e336bea767cb6398ada86a7d729865f2 SHA256 1b89b3a297246f392d3c1f2941960524e88a40707f542f372a4373e59139043a
-MISC ChangeLog 10391 RMD160 485b4b1611883e08a5c346971f87061d1263926a SHA1 f7b0b726fce1a7cd730dd01871e5788c69319537 SHA256 d82f7a7806b317ebbb442f9ff5e5d8bfa011196378b91fb146633bc1c4f2c62f
+EBUILD gtkpod-1.0.0.ebuild 1133 RMD160 b940863bf448db685a94654fc13b6f92d4966b2d SHA1 0d1012c0df2012d228863c3b7b14531e802b7298 SHA256 7b22a1c8deaa5000e2fb9c0c5bac440ba6012dc04f648cac51b42e68680b787f
+MISC ChangeLog 10498 RMD160 a2ebef1556e1be02e19efdcbe99d565ae532b545 SHA1 d8bfe34494e7e1fb255dc5fe5e4bbbbce097c159 SHA256 7028da2d83aada3dd9927ebc8c9c26b128d98a9b9d4389efb976ef0fbaa01bb1
 MISC metadata.xml 214 RMD160 2603e0683cb46d84ef65084451adeb1be5f436e5 SHA1 b569ad75e630129aa266984b5963936db724bd14 SHA256 bf19169d8568531809a0b2aebdf2b5736f2bee804449c60ad7be954318262950
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzS6kMACgkQNQqtfCuFneMqygCbBkv2CiL8uznzEsp1Ut5jfTsh
-nKkAnj9Emp//0/8iUkMcwM9wuwJG1mF4
-=/ndB
------END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-0.99.14_p20090710-libmp4v2.patch b/app-pda/gtkpod/files/gtkpod-0.99.14_p20090710-libmp4v2.patch
deleted file mode 100644
index 43b75cd68081..000000000000
--- a/app-pda/gtkpod/files/gtkpod-0.99.14_p20090710-libmp4v2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix to mp4v2 >= 1.9.0 SONAME
-
---- src/mp4file.c
-+++ src/mp4file.c
-@@ -339,7 +339,7 @@
-     
- void mp4_init()
- {
--    mp4v2_handle = dlopen("libmp4v2.so.0", RTLD_LAZY);
-+    mp4v2_handle = dlopen("libmp4v2.so.1", RTLD_LAZY);
- 
-     if (!mp4v2_handle)
-     {
diff --git a/app-pda/gtkpod/gtkpod-0.99.14_p20090710.ebuild b/app-pda/gtkpod/gtkpod-0.99.14_p20090710.ebuild
deleted file mode 100644
index ce7d43be26a2..000000000000
--- a/app-pda/gtkpod/gtkpod-0.99.14_p20090710.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-0.99.14_p20090710.ebuild,v 1.10 2010/10/31 16:30:29 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="GUI for iPod using GTK2"
-HOMEPAGE="http://gtkpod.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aac flac gnome hal mp3 nls ogg"
-
-RDEPEND=">=x11-libs/gtk+-2.8
-	>=media-libs/libid3tag-0.15
-	>=gnome-base/libglade-2.4
-	>=gnome-base/libgnomecanvas-2.14
-	>=media-libs/libgpod-0.7
-	>=net-misc/curl-7.10
-	mp3? ( media-sound/lame )
-	gnome? ( >=gnome-base/gnome-vfs-2.6 )
-	hal? ( =sys-apps/hal-0.5* )
-	aac? ( media-libs/libmp4v2 )
-	ogg? ( media-libs/libvorbis
-		media-sound/vorbis-tools )
-	flac? ( media-libs/flac )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/flex
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libmp4v2.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable nls) \
-		$(use_with gnome gnome-vfs) \
-		$(use_with hal) \
-		$(use_with ogg) \
-		$(use_with flac)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TROUBLESHOOTING *.txt
-}
diff --git a/app-pda/gtkpod/gtkpod-1.0.0.ebuild b/app-pda/gtkpod/gtkpod-1.0.0.ebuild
index 67af576ae6ae..b36e4e96744e 100644
--- a/app-pda/gtkpod/gtkpod-1.0.0.ebuild
+++ b/app-pda/gtkpod/gtkpod-1.0.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/app-pda/gtkpod/gtkpod-1.0.0.ebuild,v 1.2 2010/11/04 17:15:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-1.0.0.ebuild,v 1.3 2010/11/05 08:56:18 ssuominen Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="aac curl flac mp3 ogg"
 
 RDEPEND=">=dev-libs/glib-2.16:2