old

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 13 insertions, 118 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index c842802a7011..a14c4d740d61 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/gtkpod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.99 2012/05/09 18:49:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.100 2012/05/09 18:50:26 ssuominen Exp $
+
+  09 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.1.1-r1.ebuild,
+  -files/gtkpod-2.1.1-libmp4v2_so_2.patch:
+  old
 
 *gtkpod-2.1.1-r2 (09 May 2012)
 
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index c7f874af98f2..cb4721c22478 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gtkpod-2.1.1-libmp4v2_so_2.patch 572 RMD160 3f025cb69106b79f2f7010bb9245b4f6d92db75e SHA1 5982a95e74a57f7cd2893980462e1a5c5f68257b SHA256 6d973eb0b7cceb89242a91ee5d409c4316496060e94888ce952242fc8315b896
 DIST gtkpod-2.0.2.tar.gz 2982482 RMD160 0810947c013c137f57599a999f63d07d6710b6c7 SHA1 d93e7618653d00a8bc845fd070305c5b38eea1e8 SHA256 2c5dd3d193cd73ba107ccb158e48198768f1dd26724834f8f5ab804281ea4648
 DIST gtkpod-2.1.1.tar.gz 3120542 RMD160 5f30795cf7cda5744181f56875c7648d430d76fc SHA1 aa0bd06395f878bdf9578f8e4350536216fcd2b6 SHA256 a474bb44ed42df554b02c2bd592485ee4fbe91cb9d0fe43576a63bb8b174c37a
 EBUILD gtkpod-2.0.2.ebuild 2142 RMD160 ae5290fbcfd93e897037f7e42b1bd7340692cf64 SHA1 85662dd1408bc1ace910b178fbecc725f7e8ec7b SHA256 e63fd29ac10b5f2abff798d598489f630da06eede7c6b238121fe2322622ee44
-EBUILD gtkpod-2.1.1-r1.ebuild 2114 RMD160 eea8683c26e4cc83dc9cf9848b883dc00ea479ec SHA1 f324cc2ada837493cca89640a2baee2a19119671 SHA256 982b3274311caaf8a9d636f6da38e96c64643825286f8cedc27443d2db5d739d
 EBUILD gtkpod-2.1.1-r2.ebuild 2162 RMD160 b96d38509d43e1e21a6c5fc25c4c7813419cf244 SHA1 32dc0e32904325409de1a610dbd2b8610a22ac09 SHA256 18130a4d84b263dc99dc034dc2c1d675d5492eaf2a322a62aa37912c2a7ec246
-MISC ChangeLog 12497 RMD160 49b9ec5a0c70b9e5c5b80a05be57b0e6f875e94f SHA1 6841f72f3bfb8612b1c11658e3e4ae724cf82471 SHA256 8efb29c50c844ebde5e570b9e3dba18c152908a05d86c102060c8fcb85414b2d
+MISC ChangeLog 12627 RMD160 4514adca68c4decfa6fa4f8e88258648120f1880 SHA1 e749a3451bfb6453772ce5f063732abab562882e SHA256 0d019cb26448aeef496b0b71a85d63aa240ed03d9f279906b74f61b7c2a610dc
 MISC metadata.xml 428 RMD160 c40c3a378f712e2d05f3e9115c1f3c451bbfa361 SHA1 1c1bf125d989ce79c5cb34851bb164251c40ac9c SHA256 b181f09ad8688911dbcccc8a25e2043db62c7c5697d6ac70645f9c3d639f52d5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPqruVAAoJEEdUh39IaPFNrGUH+QEi/4vxaUNJ57/crRo2EmHO
-7h5D8e6X6j4fAKLJJ0GkSATjL89wR9kIdT/2tY0WysN0FoSG0vKmWGUMIiaVwmN/
-hib7oLxfXEjM5g8YnaI1NJtaqXWcc9iV+TiMqi00MYu/WC13iHnszh0uLsKTo5PS
-M9RDaWiWx85aCFIk62tgCwL1SkJD1SCBOsweveJMY9766UdrlkY5NFckLMOojpA4
-Km6xLLDFBmnJDTENIg9q6AcsHHiH+s02T7QCMLN204rlf5Y8b5eBNDZbcUk06/5Q
-JBK3LaBFpAFo27M+Il7dTsKysQzd9Ow7IaPGnjzHOBLRCjqcjfMdvmtU9n1Z1jA=
-=vXLe
+iQEcBAEBAgAGBQJPqrvHAAoJEEdUh39IaPFN//cH/jEPJXkVQNB5VfrgWfJzorKJ
+9MMFyShoYPnBRZvquTho5nL1YCy3Q0HDq3+TUTK22PWxZyHtCZsjEuoGe+Z/QYgJ
+/rwpaDv/Tzx3bTF2xXrTDqK/GogXyPEQXrn6Av/e8YX0Z9oWqZ+FTIHz55f1j2sJ
+o3HrJm8yJyc77fHe3oMZbzbPW7EOefoGx7NlJvUDM0ZyGGHE+lwStgMYg9I6t9xu
+8B/Qw864lS6Sx3dx93zG7imLo2WZh01J6TtwKxeRYBx+izR19ktiXFC1jRR++gRk
+gEezlKolGNvpQG0bZ4xHZCBBUdg8qcHDhElLploo+BRFZlIc0mQd+LvXswVJD80=
+=wxm4
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/files/gtkpod-2.1.1-libmp4v2_so_2.patch b/app-pda/gtkpod/files/gtkpod-2.1.1-libmp4v2_so_2.patch
deleted file mode 100644
index 39cab41eb424..000000000000
--- a/app-pda/gtkpod/files/gtkpod-2.1.1-libmp4v2_so_2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix loading of libmp4v2.so.2 from mp4v2-1.9.1_p497.
-See, http://gtkpod.org/bugs/index.php?do=details&task_id=93
-
---- plugins/filetype_mp4/mp4file.c
-+++ plugins/filetype_mp4/mp4file.c
-@@ -317,10 +317,10 @@
- /* mp4v2 initialization code */
- 
- void mp4_init() {
--    mp4v2_handle = dlopen("libmp4v2.so.1", RTLD_LAZY);
-+    mp4v2_handle = dlopen("libmp4v2.so.2", RTLD_LAZY);
- 
-     if (!mp4v2_handle) {
--        mp4v2_handle = dlopen("libmp4v2.so.0", RTLD_LAZY);
-+        mp4v2_handle = dlopen("libmp4v2.so.1", RTLD_LAZY);
- 
-         if (!mp4v2_handle) {
-             return;
diff --git a/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild b/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild
deleted file mode 100644
index bcf6d2d473be..000000000000
--- a/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/gtkpod-2.1.1-r1.ebuild,v 1.3 2012/05/03 20:20:57 jdhore Exp $
-
-EAPI=4
-inherit eutils gnome2-utils
-
-DESCRIPTION="A graphical user interface to the Apple productline"
-HOMEPAGE="http://gtkpod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac clutter curl flac gstreamer mp3 vorbis webkit"
-
-COMMON_DEPEND="dev-libs/gdl:3
-	>=dev-libs/glib-2.28.5
-	>=dev-libs/libxml2-2.7.7
-	>=dev-util/anjuta-2.91
-	>=media-libs/libgpod-0.7.0
-	>=media-libs/libid3tag-0.15
-	>=x11-libs/gtk+-3.0.8:3
-	aac? (
-		media-libs/faad2
-		>=media-libs/libmp4v2-1.9.1
-		)
-	clutter? ( media-libs/clutter-gtk:1.0 )
-	curl? ( >=net-misc/curl-7.10 )
-	flac? ( media-libs/flac )
-	gstreamer? ( >=media-libs/gst-plugins-base-0.10.25:0.10 )
-	mp3? ( media-sound/lame )
-	vorbis? (
-		media-libs/libvorbis
-		media-sound/vorbis-tools
-		)
-	webkit? ( >=net-libs/webkit-gtk-1.3:3 )"
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? ( media-plugins/gst-plugins-meta:0.10 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/os-headers"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.1-libmp4v2_so_2.patch
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable webkit plugin-coverweb) \
-		$(use_enable clutter plugin-clarity) \
-		$(use_enable gstreamer plugin-media-player) \
-		$(use_with curl) \
-		$(use_with vorbis ogg) \
-		$(use_with flac) \
-		$(use_with aac faad)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF}/html \
-		figuresdir=/usr/share/doc/${PF}/html/figures \
-		install
-
-	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-	rm -f "${D}"/usr/share/gtkpod/data/{AUTHORS,COPYING}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}