version bump (bug #420851)

Package-Manager: portage-2.2.0_alpha110/cvs/Linux i686

4 files changed, 105 insertions, 12 deletions

diff --git a/media-sound/google-musicmanager/ChangeLog b/media-sound/google-musicmanager/ChangeLog
index 088f455f68a8..4938b7a2658f 100644
--- a/media-sound/google-musicmanager/ChangeLog
+++ b/media-sound/google-musicmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/google-musicmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.14 2012/05/23 07:57:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.15 2012/06/14 00:43:21 ottxor Exp $
+
+*google-musicmanager-1.0.37.252_beta (14 Jun 2012)
+
+  14 Jun 2012; Christoph Junghans <ottxor@gentoo.org>
+  google-musicmanager-1.0.35.3998_beta.ebuild,
+  +google-musicmanager-1.0.37.252_beta.ebuild:
+  version bump (bug #420851)
 
 *google-musicmanager-1.0.35.3998_beta (23 May 2012)
 
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
index 659f7f773566..f9d28dcb4fee 100644
--- a/media-sound/google-musicmanager/Manifest
+++ b/media-sound/google-musicmanager/Manifest
@@ -5,14 +5,21 @@ DIST google-musicmanager-beta_1.0.29.4806-r0_amd64.deb 3106636 RMD160 44880c37d6
 DIST google-musicmanager-beta_1.0.29.4806-r0_i386.deb 3096254 RMD160 e99ef06719ec254debc8b679593a997eae0dff52 SHA1 01737e818aa008818cc5402617c3054d7069d6b6 SHA256 1a5105b6aabcf806ba4be65f73f1b7a090b5e7e8cc158ed8d16539e0af752dd2
 DIST google-musicmanager-beta_1.0.35.3998-r0_amd64.deb 3144476 RMD160 c6f3a63560f6a0447a89be17115e9f47d92f4cf2 SHA1 56653c6a0107141565e6f759cbedaa729435335d SHA256 8c279d31ce829200bc2804d029a6fac579c0e518ad03d0d4a5bc6d37a704273b
 DIST google-musicmanager-beta_1.0.35.3998-r0_i386.deb 3137256 RMD160 04276b9df9a962bb23f74510b2510a5c00f96051 SHA1 4b844433a4b6ba1a4ea0c10b8abfeb0aac6bb76b SHA256 1f824c50447852e7aad57bf89d62cb1c4ffd3e1b095e6e02f57010ced6bf1c9f
+DIST google-musicmanager-beta_1.0.37.252-r0_amd64.deb 3145918 RMD160 9a4e34b20e1f7b1f48121554217bcf5291fafbda SHA1 10fbdf7e8e8d8ae524ccfcf3981f447703d0f675 SHA256 bfc591859c15f727be2d74ccff005c51ba7a5ebd77991abe03b309f72f2d10c4
+DIST google-musicmanager-beta_1.0.37.252-r0_i386.deb 3135920 RMD160 d5ed974e6d58877a688f17c99f94b1c5808b18fa SHA1 1ac1452f0b54378f8fee1048ac45e10f7af1e4bc SHA256 5348384373df086ade7b66b734f13cc6f5f474a167f0b861bc261f647d490a89
 EBUILD google-musicmanager-1.0.29.4806_beta.ebuild 2310 RMD160 256ae502d836cabb9a0eb4a2c141635aaf8d892d SHA1 8c0f8abc1f64a96b4ac44eebee6d8eb3f40834e8 SHA256 d495317b32e631226799e64ca62f329ef3b771d9b4d8a708234af000251ef8fe
-EBUILD google-musicmanager-1.0.35.3998_beta.ebuild 2138 RMD160 0b974cea5a14465f3307b7d92a65cdb0f5a6b193 SHA1 1c5b191b79ab826db3595798b4d6d294a420ae6c SHA256 779c977a26c975fafc9b3c8cd8e7a007d7fc8afac2f359043a966afe4e806adf
-MISC ChangeLog 3866 RMD160 58292f701d0c17ec66268bf25a39936f9c84d37e SHA1 40c8ecb13a75a520cc95d64c761e23fb1d27dc3b SHA256 0bdcb1bc63f084f45beec0dc33a5093dd2a548e6c59472065c9de53429c4e2ba
+EBUILD google-musicmanager-1.0.35.3998_beta.ebuild 2330 RMD160 0cf88a1836b33b7743f3542eb5cd8b1d2031b715 SHA1 0e17fa261754977bae9109d423dc0f504743b64f SHA256 bb8d0e3c5bdf0a40ae43692377bceb989d6f1c04b337c03f92e31a68a0a9a483
+EBUILD google-musicmanager-1.0.37.252_beta.ebuild 2136 RMD160 5298f6c82ead787e2f6250414bbb96a7333c99cf SHA1 fa00a08ca0bbcd87ef9bebcde16a41f344ef168f SHA256 ab17efbc94ea218b72729bfae27bb5606f156ed73c036d3c2261357ef0e7d6ad
+MISC ChangeLog 4095 RMD160 f8060bf316528c303967419df3399d6120e265e8 SHA1 7f3cab1419e232a672cfb82f8123583c53067c90 SHA256 041f8dde315a682195f0a1d0f39b4851f392d1c4c7cbf8f1242a08af2deb87e3
 MISC metadata.xml 339 RMD160 b7d2a61ee2b57a569c94c9575975298b258b20ef SHA1 b14b3e5b809793b5cf14247ab89d81aa264780e6 SHA256 4932e5c90a9654cf8990850600f551105860d93728d8af6fcf39d3eab1d970f8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+8mH4ACgkQ/ejvha5XGaMznwCg2au7Fs0zyp56APWoANz4uLPy
-iuMAoKXSkloG/IXcZ4crw8lqriqaYwTJ
-=rBvH
+iQEcBAEBAgAGBQJP2TOvAAoJEOeBhlrCAAWG2Z8IAIJRKXbm1BPVOYAdOIOuLhGB
+975HlSw9hHevRKos42LjnjIJvxoAMbDDbNGJeQHHOGgPfZ9y6hiVWRps2esINS6W
+GeS3Fs+xv4gDcdfJaa7uDQ2GnjONaudNQHu+gCoan+j/BJyk5gOKd2SrsIrmCD5v
+ELEiaIVYJGSygUB219SYTOxQQ70F/WIAAZjzNODozzIkJK9Khr3ZUwHAcTcZrkvg
+x45y1yRuYTcPVTACjMkPdhkndzL/o217jtkj7w8AzkvYidBFz3YN2ORPZW1Hur5a
+KvNYO2ImVHiz9Q5SLcuHEVQnTA3wjkyvEie/AG4ENzp2Ez+S1qC7HP28DoI6P8Y=
+=lFDV
 -----END PGP SIGNATURE-----
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild
index a13e80c2a7dc..7cedac71c24f 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild,v 1.1 2012/05/23 07:57:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild,v 1.2 2012/06/14 00:43:21 ottxor Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="log"
 
-RESTRICT="strip mirror"
+RESTRICT="fetch strip"
 
 RDEPEND="
 	dev-libs/expat
@@ -54,9 +54,12 @@ QA_DT_HASH="${INSTALL_BASE}/.*"
 S="${WORKDIR}/${INSTALL_BASE}"
 
 pkg_nofetch() {
-	einfo "This version is no longer available from Google."
-	einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
-	einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)."
+	elog "This version is no longer available from Google and the license prevents mirroring."
+	elog "This ebuild is intended for users who already downloaded it previously and have problems"
+	elog "with ${PV}+. If you can get the distfile from e.g. another computer of yours, or search"
+	use amd64 && MY_PKG="${MY_PKG/i386/amd64}"
+	elog "it with google: http://www.google.com/search?q=intitle:%22index+of%22+${MY_PKG}"
+	elog "and copy the file ${MY_PKG} to ${DISTDIR}."
 }
 
 src_install() {
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.37.252_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.37.252_beta.ebuild
new file mode 100644
index 000000000000..918ddda8d9c4
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.37.252_beta.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.37.252_beta.ebuild,v 1.1 2012/06/14 00:43:21 ottxor Exp $
+
+EAPI=4
+
+inherit eutils unpacker
+
+MY_URL="http://dl.google.com/linux/musicmanager/deb/pool/main/${P:0:1}/${PN}-beta"
+MY_PKG="${PN}-beta_${PV/_beta}-r0_i386.deb"
+
+DESCRIPTION="Google Music Manager is a application for adding music to your Google Music library."
+HOMEPAGE="http://music.google.com"
+SRC_URI="x86? ( ${MY_URL}/${MY_PKG} )
+	amd64? ( ${MY_URL}/${MY_PKG/i386/amd64} )"
+
+LICENSE="google-talkplugin Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB as-is"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="log"
+
+RESTRICT="strip mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/libogg
+	media-libs/libvorbis
+	net-dns/libidn
+	sys-libs/glibc
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/qt-core
+	x11-libs/qt-gui
+	x11-libs/qt-webkit
+	log? ( dev-libs/log4cxx )
+	"
+
+DEPEND="app-arch/xz-utils
+	app-admin/chrpath"
+
+INSTALL_BASE="opt/google/musicmanager"
+
+QA_TEXTRELS="${INSTALL_BASE}/libmpgdec.so.0"
+
+QA_DT_HASH="${INSTALL_BASE}/.*"
+
+S="${WORKDIR}/${INSTALL_BASE}"
+
+pkg_nofetch() {
+	einfo "This version is no longer available from Google."
+	einfo "Note that Gentoo cannot mirror the distfiles due to license reasons, so we have to follow the bump."
+	einfo "Please file a version bump bug on http://bugs.gentoo.org (search existing bugs for ${PN} first!)."
+}
+
+src_install() {
+	insinto "/${INSTALL_BASE}"
+	doins config.xml product_logo*
+
+	exeinto "/${INSTALL_BASE}"
+	chrpath -d MusicManager || die
+	doexe MusicManager google-musicmanager minidump_upload
+	#TODO unbundle this
+	doexe libaacdec.so libaudioenc.so.0 libmpgdec.so.0 libid3tag.so
+
+	dosym /"${INSTALL_BASE}"/google-musicmanager /opt/bin/google-musicmanager
+
+	make_desktop_entry "${PN}" "Google Music Manager" \
+		"/${INSTALL_BASE}/product_logo_32.xpm" "AudioVideo;Audio;Player;Music"
+}