Version bump.

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

4 files changed, 123 insertions, 3 deletions

diff --git a/media-sound/qtscrobbler/ChangeLog b/media-sound/qtscrobbler/ChangeLog
index 05f190dbb8e0..982357e4ed58 100644
--- a/media-sound/qtscrobbler/ChangeLog
+++ b/media-sound/qtscrobbler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/qtscrobbler
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/ChangeLog,v 1.5 2009/03/15 20:44:08 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/ChangeLog,v 1.6 2010/10/31 11:33:28 ssuominen Exp $
+
+*qtscrobbler-0.10 (31 Oct 2010)
+
+  31 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +qtscrobbler-0.10.ebuild, +files/qtscrobbler-0.10-Makefile.patch:
+  Version bump.
 
   15 Mar 2009; Markus Meier <maekke@gentoo.org> qtscrobbler-0.9.ebuild:
   amd64/x86 stable, bug #262543
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index f0ad1a22c42e..fb90904b8574 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,4 +1,7 @@
+AUX qtscrobbler-0.10-Makefile.patch 1359 RMD160 b0770f10fa409f1dc1a29d2504e256e778ee64fa SHA1 e72919be7c032032c6a5518b86050fc1d0d42df9 SHA256 3f7437b4ebdfb7085b5575e8aece347304b56647082500f950b8e4f0a2b45dda
+DIST qtscrob-0.10.tar.bz2 132507 RMD160 2319c77e262022f1369aa8cc83fbadf2d2395d1d SHA1 ce0bc2d4fe4a7773fbfd300f7e1a271bad88888d SHA256 b77451625d4943a1e19e4418616417944091339db7b31983c593f4bf7d73ee7b
 DIST qtscrob-0.9.tar.bz2 132657 RMD160 3f4e1a80ef15cf9ca09ed505306cc114f9f35a2d SHA1 d1dc679b58e60abaa966c4c28f20ed1800c621d8 SHA256 33b1b9ebab49a6e048357cb11e0111238d3ff273cf2778b3625a5c7eb2c32960
+EBUILD qtscrobbler-0.10.ebuild 1322 RMD160 42aa1a4ef8108c3ec1076e45ea26130cc9d23c9f SHA1 e6f87d2d348048623b192593665882f04ac071cd SHA256 799d327b28ad05897154d9a2f6ab369350cba1513223b38ba3b2d83fe62eed74
 EBUILD qtscrobbler-0.9.ebuild 1397 RMD160 e5dff6f4e9bc869d992d6f3ea20fe74599a62573 SHA1 7921b42c600b928ef1c7edd63e85332211f1370d SHA256 7813720420cbf21a81f3cb7d933bc6cfe5f866b69562cfbd56e466645c67f3e1
-MISC ChangeLog 922 RMD160 fcfcdb22e752315fd6b963fb3f042500d6cd65f5 SHA1 06fa116ca5b66b0dcc3469bbc453a9ba85e86032 SHA256 e4cb5f591f44d38ca34b66517a04f685eb34a10c62cd4084499ec46606723b63
+MISC ChangeLog 1097 RMD160 e2853ac45356619ef7710e31e5484a181de8e8be SHA1 d19ca3121c23eb5d9b9b345a5d08367e6bff0a34 SHA256 246fc09f8e215dc268bd37d759969904f74fdaa3e6fe95a9cdcbf0adcd49ffec
 MISC metadata.xml 230 RMD160 e4eadb1f04df0059db1cfcf2be4b985b7dbad5a9 SHA1 d04586124a91e94d252da19ffcba5d67d2dabe0c SHA256 28eeba781d0d677392552603cc8bad4bee83475ac5cb70459b5e007cde761342
diff --git a/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
new file mode 100644
index 000000000000..0558b72c9bf5
--- /dev/null
+++ b/media-sound/qtscrobbler/files/qtscrobbler-0.10-Makefile.patch
@@ -0,0 +1,46 @@
+--- src/cli/Makefile
++++ src/cli/Makefile
+@@ -1,4 +1,4 @@
+-CC   = g++
++CXX ?= g++
+ mingw = false
+ WINDRES =
+ RES  =
+@@ -27,7 +27,7 @@
+     LINKOBJ  = scrobble-cli.o libscrobble.o md5.o ConvertUTF.o mtp.o $(RES)
+ endif
+ 
+-CFLAGS = -Wall -O2 -g $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
++CXXFLAGS += -Wall $(INCLUDE) $(CURL_FLAGS) $(MTP_FLAGS)
+ 
+ .PHONY: all all-before all-after clean clean-custom
+ 
+@@ -37,22 +37,22 @@
+ 	rm -f *.o *~ *.d $(BIN) $(BIN).exe
+ 
+ $(BIN): $(OBJ)
+-	$(CC) $(LINKOBJ) -o $(BIN) $(LIBS)
++	$(CXX) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
+ 
+ scrobble-cli.o: scrobble-cli.cpp
+-	$(CC) -c scrobble-cli.cpp -o scrobble-cli.o $(CFLAGS)
++	$(CXX) -c scrobble-cli.cpp -o scrobble-cli.o $(CXXFLAGS)
+ 
+ libscrobble.o: ../lib/libscrobble.cpp
+-	$(CC) -c ../lib/libscrobble.cpp -o libscrobble.o $(CFLAGS)
++	$(CXX) -c ../lib/libscrobble.cpp -o libscrobble.o $(CXXFLAGS)
+ 
+ md5.o: ../lib/md5.c
+-	$(CC) -c ../lib/md5.c -o md5.o $(CFLAGS)
++	$(CXX) -c ../lib/md5.c -o md5.o $(CXXFLAGS)
+ 
+ ConvertUTF.o: ../lib/ConvertUTF.c
+-	$(CC) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CFLAGS)
++	$(CXX) -c ../lib/ConvertUTF.c -o ConvertUTF.o $(CXXFLAGS)
+ 
+ mtp.o: ../lib/mtp-libmtp.cpp
+-	$(CC) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CFLAGS)
++	$(CXX) -c ../lib/mtp-libmtp.cpp -o mtp.o $(CXXFLAGS)
+ 
+ install:
+ 	install -D -m 755 scrobble-cli -p $(DESTDIR)$(bindir)/scrobble-cli
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
new file mode 100644
index 000000000000..2d559ba63795
--- /dev/null
+++ b/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qtscrobbler/qtscrobbler-0.10.ebuild,v 1.1 2010/10/31 11:33:28 ssuominen Exp $
+
+EAPI=2
+inherit eutils qt4-r2 toolchain-funcs
+
+MY_PN=qtscrob
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Updates a last.fm profile using information from a supported portable music player"
+HOMEPAGE="http://qtscrob.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli +qt4"
+
+RDEPEND="media-libs/libmtp
+	net-misc/curl
+	x11-libs/qt-gui:4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+}
+
+src_configure() {
+	if use qt4; then
+		pushd src/qt >/dev/null
+		eqmake4 ${MY_PN}.pro
+		popd >/dev/null
+	fi
+}
+
+src_compile() {
+	if use cli; then
+		tc-export CXX
+		emake -C src/cli || die
+	fi
+
+	if use qt4; then
+		emake -C src/qt || die
+	fi
+}
+
+src_install() {
+	if use cli; then
+		newbin src/cli/scrobble-cli qtscrobbler-cli || die
+	fi
+
+	if use qt4; then
+		pushd src/qt >/dev/null
+		newbin qtscrob qtscrobbler
+		newicon resources/icons/128.png qtscrobbler.png
+		make_desktop_entry qtscrobbler QtScrobbler
+		popd >/dev/null
+	fi
+
+	dodoc AUTHORS CHANGELOG README
+}