Version bump to development release in order to get rid of the media-libs/libmp4v2 dependency problem.

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

3 files changed, 116 insertions, 9 deletions

diff --git a/app-pda/gtkpod/ChangeLog b/app-pda/gtkpod/ChangeLog
index ef0920e950ed..9017e03c74aa 100644
--- a/app-pda/gtkpod/ChangeLog
+++ b/app-pda/gtkpod/ChangeLog
@@ -1,6 +1,13 @@
 # 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.104 2012/05/10 07:25:01 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/gtkpod/ChangeLog,v 1.105 2012/06/07 00:35:44 ssuominen Exp $
+
+*gtkpod-2.1.2_beta2 (07 Jun 2012)
+
+  07 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +gtkpod-2.1.2_beta2.ebuild:
+  Version bump to development release in order to get rid of the
+  media-libs/libmp4v2 dependency problem.
 
   10 May 2012; Samuli Suominen <ssuominen@gentoo.org> -gtkpod-2.1.1-r2.ebuild:
   old
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index ae41b7da3abc..116fa60656e1 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 AUX gtkpod-2.1.1-segfault_with_directory_creation.patch 1477 RMD160 518bed7b227d5fa7fb199aab5c2de1287db7978b SHA1 a78cdf6ae367dd746b32bf57c99d904a1cf0e70a SHA256 f6154d9c2516b018712d9ff3b2fc2a2a1cd6855f48307834ec9ace3a66219883
 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
+DIST gtkpod-2.1.2-beta2.tar.gz 3674227 RMD160 82ff90395128182b352bfecde6009c8c208f94b7 SHA1 bcdeecbe6ea4126990e962b4beb582c9bad7cb33 SHA256 d91f77ab5a05854af520492ab1f31bc6ccbbbea0f770c1de119d7247d84572c4
 EBUILD gtkpod-2.0.2.ebuild 2188 RMD160 c563c20f4111a5640032adcb5744e4cc8a8f01cb SHA1 e233553f8cfff24840c4d8be77dff306616c41e4 SHA256 f68a21f682e84783f044289313b414fca8c9c4251fff95f1f56c713e7aeb56c5
 EBUILD gtkpod-2.1.1-r3.ebuild 2289 RMD160 4747e6c68b59361e09f18aee8f0c81797e944016 SHA1 d163f800c5b5a0ea5ef007958f942e1c96d25e16 SHA256 42e0d55e791501bdc5924a99cf592c766cd187cb17c069b5c1fc429d464d6e01
-MISC ChangeLog 13232 RMD160 3196693aae6507c0eb549fe99aa7658ae44597f4 SHA1 a401a7067b700060c353ecd7925f5d037fba960a SHA256 d96c61605b487e698bdafb61a6a4fd5fb35f69f70146ededd8a6ad553d160077
+EBUILD gtkpod-2.1.2_beta2.ebuild 2609 RMD160 a9d2d0cfe866f92d455861ed51a51e12558f5a32 SHA1 131163c7d54ea44c9477b5562f50cff52bf23e8b SHA256 1ff50f52c93f29f74e64e19ce247705ddc04b1e2be16b00a818983fa71a1abf3
+MISC ChangeLog 13459 RMD160 f0c1c49d071a5f21732ad6a51ad9fa8baa203f7d SHA1 8440c283b6a9ba57a8d82f7c04ca5a97fd62f90d SHA256 cf7d259690480d20c14037d738f52d0bd14a62d7f60a02cf13ae739476ec38a6
 MISC metadata.xml 328 RMD160 7e42bdb08392b764fa78306709554243091a513c SHA1 99aafd63402a1d8fcdc511e6431f8f315f6fa8b5 SHA256 0288ef4f77dee4547f748900456ff0079dece3ca0dd50e11e6d3d3d1ff9d6bf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPq2yfAAoJEEdUh39IaPFNEk4IAIktF4jBajzYvIKwzk3VXeEn
-6ndzzEKDcVHae62+/jGY3OCRJuGE13k32Wk8UQN2yb/YCn8aq2EatwslIpHpBFpX
-ynsL807aQyjuaHayc0e8hZjOkReLWLGL1r9W2256T0rZHHVwMqOu6TYwUWfK7VLp
-CcrmTDWTi3vXePeJxn73dPXkU8fIVzYFk7XcMZrI6D8oZ3/LPLlskoYOTrxWD2sq
-RpA+ZHT6W4ZxwGDBMYmQ8n+Yd8Mv4fFPQ5pIMjtT8OhDOGQy6JRHzwQgbJCcMx/p
-5aCQsdrh65E31y2SevkgrbtUhdYQx7MWNU4wCk+aNoV2OS2OaFSCiy5A4kaB/nY=
-=G1OI
+iQEcBAEBAgAGBQJPz/Z0AAoJEEdUh39IaPFNWs4H/1Cme4CdlYubau7jcg2DWJ1R
+obSlqTMmqfF0tyC/WK8TjJBeefV+pEai8qMITFJ2G6+wRMuCFTgE7UYRNA74r3Rv
+9B+dpsesfRH69ZBdrkc1Fh1xyhI7t1mF8Jt3aLxs7Gw+Aq2AE/iUKQrnqOaFUfPm
+Qxp0QXn31mgu+43/vXIe9/BvhoDjuIPw0PeEvUnMwqVOm0XE+16tbXSWVN7Uesit
+ah+Qsqq2rpWzEvPnbKfms+/Z8ByOB8Tydo7vfGSmj8vCTUTi7qcGGkikDM6XdnQq
+Tm1jfbG/7KYwwT7hdbzkJGfZ9cjr2kEyWoPYxkb1/KaChiAX5dR/eYuGYsYZEkg=
+=9wuf
 -----END PGP SIGNATURE-----
diff --git a/app-pda/gtkpod/gtkpod-2.1.2_beta2.ebuild b/app-pda/gtkpod/gtkpod-2.1.2_beta2.ebuild
new file mode 100644
index 000000000000..423b1aed74f2
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.2_beta2.ebuild
@@ -0,0 +1,98 @@
+# 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.2_beta2.ebuild,v 1.1 2012/06/07 00:35:44 ssuominen 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 cdr 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 )
+	clutter? ( media-libs/clutter-gtk:1.0 )
+	curl? ( >=net-misc/curl-7.10 )
+	cdr? (
+		>=app-cdr/brasero-3
+		media-libs/musicbrainz:3
+		)
+	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
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig"
+
+# Dpn't even try to bother with versionator.eclass for this one beta exception.
+S=${WORKDIR}/${PN}-2.1.2~bafd316
+
+src_prepare() {
+	# Make sure SLOT="4" is not used. Everyone should move from "3" to "5" directly.
+	sed -i -e '/PKG_CONFIG/s:libmusicbrainz4:&sLoT4iSdEpReCaTeD:' configure || die
+
+	# /path/to/install: '/path/to/app-pda/gtkpod-2.1.2_beta2/image/usr/share/gtkpod/data/rhythmbox.gep’: File exists
+	sed -i -e '/^dist_profiles_DATA/s:=.*:=:' plugins/sjcd/data/Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable webkit plugin-coverweb) \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_enable cdr plugin-sjcd) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac mp4)
+}
+
+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 "${ED}" -name '*.la' -exec rm -f {} +
+	rm -f "${ED}"/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
+}