summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-11-05 08:56:19 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-11-05 08:56:19 +0000
commitc8568ca80b38a0f1252129053e996c13f12a57c5 (patch)
tree62f66d8ba98ac0142ef7e7b3f2c095dd2f03944f
parentamd64 stable wrt #343697 (diff)
downloadgentoo-2-c8568ca80b38a0f1252129053e996c13f12a57c5.tar.gz
gentoo-2-c8568ca80b38a0f1252129053e996c13f12a57c5.tar.bz2
gentoo-2-c8568ca80b38a0f1252129053e996c13f12a57c5.zip
amd64 stable wrt #343697
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)
-rw-r--r--app-pda/gtkpod/ChangeLog5
-rw-r--r--app-pda/gtkpod/files/gtkpod-0.99.14_p20090710-libmp4v2.patch13
-rw-r--r--app-pda/gtkpod/gtkpod-0.99.14_p20090710.ebuild55
-rw-r--r--app-pda/gtkpod/gtkpod-1.0.0.ebuild4
4 files changed, 6 insertions, 71 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/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