version bump

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key C2000586)

4 files changed, 106 insertions, 11 deletions

diff --git a/media-sound/google-musicmanager/ChangeLog b/media-sound/google-musicmanager/ChangeLog
index 9ccd862c0b58..8dbc14be0683 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.31 2013/04/04 20:47:46 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/ChangeLog,v 1.32 2013/05/01 23:18:06 ottxor Exp $
+
+*google-musicmanager-1.0.65.1341_beta (01 May 2013)
+
+  01 May 2013; Christoph Junghans <ottxor@gentoo.org>
+  +google-musicmanager-1.0.65.1341_beta.ebuild,
+  google-musicmanager-1.0.55.7425_beta-r2.ebuild,
+  google-musicmanager-1.0.60.7918_beta.ebuild:
+  version bump
 
 *google-musicmanager-1.0.60.7918_beta (04 Apr 2013)
 
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.55.7425_beta-r2.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.55.7425_beta-r2.ebuild
index f07b67eb122b..dc85784aecc6 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.55.7425_beta-r2.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.55.7425_beta-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.55.7425_beta-r2.ebuild,v 1.5 2013/03/10 16:30:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.55.7425_beta-r2.ebuild,v 1.6 2013/05/01 23:18:06 ottxor Exp $
 
 EAPI=5
 
@@ -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_FLAGS_IGNORED="${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}."
 }
 
 pkg_setup() {
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.60.7918_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.60.7918_beta.ebuild
index eb198f57ed30..4afe11fff1d8 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.60.7918_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.60.7918_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.60.7918_beta.ebuild,v 1.1 2013/04/04 20:47:46 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.60.7918_beta.ebuild,v 1.2 2013/05/01 23:18:06 ottxor Exp $
 
 EAPI=5
 
@@ -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_FLAGS_IGNORED="${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}."
 }
 
 pkg_setup() {
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.65.1341_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.65.1341_beta.ebuild
new file mode 100644
index 000000000000..4937cee75ad5
--- /dev/null
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.65.1341_beta.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 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.65.1341_beta.ebuild,v 1.1 2013/05/01 23:18:06 ottxor Exp $
+
+EAPI=5
+
+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-TOS Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB libtiff"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="log"
+
+RESTRICT="strip mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtwebkit:4
+	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
+	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_FLAGS_IGNORED="${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.json product_logo* lang.*.qm
+
+	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
+
+	local icon size
+	for icon in product_logo_*.png; do
+		size=${icon#product_logo_}
+		size=${size%.png}
+		newicon -s "${size}" "${icon}" ${PN}.png
+	done
+	domenu ${PN}.desktop
+}