version bump

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

5 files changed, 107 insertions, 18 deletions

diff --git a/media-sound/google-musicmanager/ChangeLog b/media-sound/google-musicmanager/ChangeLog
index 597e842a3964..096030dca81d 100644
--- a/media-sound/google-musicmanager/ChangeLog
+++ b/media-sound/google-musicmanager/ChangeLog
@@ -1,6 +1,14 @@
 # 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.10 2012/03/09 01:15:33 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.11 2012/03/29 14:07:31 ottxor Exp $
+
+*google-musicmanager-1.0.29.4806_beta (29 Mar 2012)
+
+  29 Mar 2012; Christoph Junghans <ottxor@gentoo.org>
+  google-musicmanager-1.0.24.7712_beta.ebuild,
+  google-musicmanager-1.0.27.206_beta.ebuild,
+  +google-musicmanager-1.0.29.4806_beta.ebuild:
+  version bump
 
   09 Mar 2012; Christoph Junghans <ottxor@gentoo.org>
   -google-musicmanager-1.0.22.3409_beta.ebuild,
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
index 38fed7323082..3dcc679a7751 100644
--- a/media-sound/google-musicmanager/Manifest
+++ b/media-sound/google-musicmanager/Manifest
@@ -5,18 +5,21 @@ DIST google-musicmanager-beta_1.0.24.7712-r0_amd64.deb 3033006 RMD160 df12c32ff7
 DIST google-musicmanager-beta_1.0.24.7712-r0_i386.deb 3023506 RMD160 668538144e40688be386207888211b242a56962c SHA1 c08411581cd14be87a7e19fa56d0342c6f3d00d6 SHA256 04027ed7659d1b195f37bd216d0c300162326e32e99346ad9b8025b076481998
 DIST google-musicmanager-beta_1.0.27.206-r0_amd64.deb 3106564 RMD160 9f86c2e9e65ecbd1c5f8abeaa65043e1e784dfa3 SHA1 0c2ab989310b6546374b6a422a326052faac8229 SHA256 7168c264d5280a74d1d4673aeb0785da53fb56ae85057fc8bef58297ce8007f4
 DIST google-musicmanager-beta_1.0.27.206-r0_i386.deb 3096264 RMD160 a71461144c6b7ee1ea72e7a065b34c1d660af7f9 SHA1 5a85158bcee6a19b2e177675616a267a07595fce SHA256 a016a51aed14dfc6d8f2ab55a164db09aa2aed62a42b6481050a13ed709bf67f
-EBUILD google-musicmanager-1.0.24.7712_beta.ebuild 2477 RMD160 decc945e6bb3508d7e09689f6d1b9f034b173f79 SHA1 ffba6d9a72a7165d1e3f20f15412eccacc8f891e SHA256 20b4b3877118d7010862df0468f0a45706ba2ef460e08b6a7407374f13740f6c
-EBUILD google-musicmanager-1.0.27.206_beta.ebuild 2116 RMD160 9ccb879e60c7a687b2e4e615028329d6cf089a6b SHA1 bd67bcb1b98cde3285db6d1db64ec70fe9c2fc38 SHA256 d239f62f310e8cee01fe14b32151bdfcfddbb115ac56cf0dd157046360f858d4
-MISC ChangeLog 2966 RMD160 a89de2ea28d1f5553a60efa59131cecd93f792ec SHA1 d009e9a49346cc632c9215a9846b1693967d8e19 SHA256 c16ecb9f91f47d7f701e9cdfa61fcf63a44ea01b7360526b41e2d95f1cbbc5ed
+DIST google-musicmanager-beta_1.0.29.4806-r0_amd64.deb 3106636 RMD160 44880c37d6e88bcb6ed288a1ff321736a6b74684 SHA1 4559cbce3e33a7bc5f1b32770eed7c0e0ba8fb27 SHA256 eb00fd028c14b69aad0f6866382cfb2e2b72c154d701712823846c11127e9485
+DIST google-musicmanager-beta_1.0.29.4806-r0_i386.deb 3096254 RMD160 e99ef06719ec254debc8b679593a997eae0dff52 SHA1 01737e818aa008818cc5402617c3054d7069d6b6 SHA256 1a5105b6aabcf806ba4be65f73f1b7a090b5e7e8cc158ed8d16539e0af752dd2
+EBUILD google-musicmanager-1.0.24.7712_beta.ebuild 2476 RMD160 6b21f8428989bb24da6b4256c43e4684470a0714 SHA1 51290161dabd0b37cb0746c11d21e930018bc017 SHA256 c3540b31b66d0ba39386e10d1c4960844e3199e8be4e2a59c6212aa2c347ef4b
+EBUILD google-musicmanager-1.0.27.206_beta.ebuild 2309 RMD160 027b8c600c64cd7148444a77da8d8ecf15bb81a2 SHA1 6de062f051f2f68376d87c81e68de653ecfdea48 SHA256 c71205fe5c0e1865ec2e80c9fbef5ad73a2fbc874581284f11b5ee10b8caaac9
+EBUILD google-musicmanager-1.0.29.4806_beta.ebuild 2117 RMD160 9b7157877ae4c1a19885d0f1aa84789f04719b24 SHA1 c1e7ca51eb3e5dc7393124ca432f766b399da792 SHA256 6458746a7bedee621922b2427d7f73bc5ca2a78eea12944798fad9f00b4a2fbe
+MISC ChangeLog 3230 RMD160 d24c9e1bd2d4c423fc31cc6b9d12495b04b2d384 SHA1 ba193ddde322b48fef3b029fe9cc45f2ba239598 SHA256 8654d26bee21de4d2cc19a272281a24a1821f6545e38a12308ae93ef959295f7
 MISC metadata.xml 339 RMD160 b7d2a61ee2b57a569c94c9575975298b258b20ef SHA1 b14b3e5b809793b5cf14247ab89d81aa264780e6 SHA256 4932e5c90a9654cf8990850600f551105860d93728d8af6fcf39d3eab1d970f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPWVm7AAoJEOeBhlrCAAWGl8oIAIwwDcuHCr8cqFII1Ma62z+H
-j0/oXPV7DM8HA+jbR7NEM0sVld8vtbDdwPl0i1wSgyUNTTbZ4UH8q8a8XT8tvHll
-GCurVZaPzwAKnYO4uolUK5Uv0VHYKfHTrtvimDJxutgNoWLOLerX+JxEiQY68L5u
-aD4pat4X+omDEA6pyMGDUK+QktdZ/gj7OK/tTaIu35SIoGcnqCYcB5RFOKkBUAO8
-VAf2wJoTpyOXtu0oq95vODPWLZHbNKQv/TjNS1ulSCh7kYVHq5KAhitw6SEe91+8
-YXhuCX2xW0xmp5m5oTupVneT9RGaCe9TOwOAuvPTRG3TkOJ9/XMU+/5JZnong7o=
-=K3Xu
+iQEcBAEBAgAGBQJPdGypAAoJEOeBhlrCAAWGH3wIAJFIUBM7FZ4YdPhXaMR5cCzj
+ESxZRzA91VmqHjZXgF+0M0j/RWQfxbTSTLft1SKOX7x+tOYCDngZibo/krOX1F8f
+Fd6BszQwtgdH7tlxDpLyzmAnexd6GxMMO8ZQutkZJW8+EwuAmwk6r5jv61+ca/vn
+ja4N5MvoEd+2dVwVSHXTqXePwbUZ3wLmGCIjpjgJleP0KsJc4R737jr1XAW7gWR9
+Rw6euILJ23Fxd6HLzBXZy76clkyAvvas53kGD0XU4AngPWCAElbt2rfU8uEyjGxM
+1bPzBe/lUABjXL//wu+vqprBxer3bOGYpsQvPNPkCL/SVT4PV5ipHuJvV3ggWpM=
+=JkCM
 -----END PGP SIGNATURE-----
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.24.7712_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.24.7712_beta.ebuild
index 9c1424708d94..d0a1fb9dce17 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.24.7712_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.24.7712_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.24.7712_beta.ebuild,v 1.2 2012/03/09 01:13:48 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.24.7712_beta.ebuild,v 1.3 2012/03/29 14:07:31 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
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.27.206_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.27.206_beta.ebuild
index e9e61e0bd729..0e694214db0a 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.27.206_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.27.206_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.27.206_beta.ebuild,v 1.1 2012/03/09 01:13:48 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.27.206_beta.ebuild,v 1.2 2012/03/29 14:07:31 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
@@ -53,9 +53,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.29.4806_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.29.4806_beta.ebuild
new file mode 100644
index 000000000000..dd6aa0d67230
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.29.4806_beta.ebuild
@@ -0,0 +1,75 @@
+# 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.29.4806_beta.ebuild,v 1.1 2012/03/29 14:07:31 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
+	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"
+}