Version bump, dropped sparc and hppa because of qt-webkit dependency

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

3 files changed, 97 insertions, 16 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 3cd02f6c7863..29820b06f09e 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/qmpdclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.73 2011/01/06 22:46:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.74 2011/02/18 14:53:09 angelos Exp $
+
+*qmpdclient-1.2.1 (18 Feb 2011)
+
+  18 Feb 2011; <angelos@gentoo.org> +qmpdclient-1.2.1.ebuild:
+  Version bump, dropped sparc and hppa because of qt-webkit dependency
 
   06 Jan 2011; Michael Weber <xmw@gentoo.org> qmpdclient-1.1.3.ebuild:
   sparc stable (bug 340759)
diff --git a/media-sound/qmpdclient/Manifest b/media-sound/qmpdclient/Manifest
index 3c3a8a1bce24..2f1de00faff6 100644
--- a/media-sound/qmpdclient/Manifest
+++ b/media-sound/qmpdclient/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST qmpdclient-1.1.3.tar.bz2 266099 RMD160 46b95714eb0d5eb43cf7fef72021b216825d5f1b SHA1 d3de2ecf36f266cc436e081b9071606ce43b2a65 SHA256 8d49c8c4c68be5fbe968d30bdc958c53e864f4727568cc20e783ebdf91a10524
+DIST qmpdclient-1.2.1.tar.bz2 271243 RMD160 8d2f766ac765de486bfd4aa54c09d1c90b25d668 SHA1 bfa94d30a7f3c611f6b72ea8bad4a27e983c6410 SHA256 9d57ffbf2985c1dbc9e8856e9c5edf5171e85152d8cf58ad692e85233a9b0773
 EBUILD qmpdclient-1.1.3.ebuild 2501 RMD160 308c36ca2431a65e5ad8f21ec1b6976ac9d35933 SHA1 5a97c73f4306dbcc67314d3dc544991095805236 SHA256 b57b70ad48f549688be4318324b3527432b2252d45638a593078edea3f138e58
+EBUILD qmpdclient-1.2.1.ebuild 2242 RMD160 850ae664e63e0ec423a83943d1cb84b41b44f6d8 SHA1 0c451ab4798eef46d82d8d6fc5849dbe7472d00f SHA256 5a51616923dff2d6d78d0c8bda205fdfe041fa1717757e84a9075d13bded015b
 EBUILD qmpdclient-9999.ebuild 780 RMD160 cf9c63ea5dd74ce869e135ae43db587bdb115d1e SHA1 22c521d449793a43df4d50e0336ae5748a35682c SHA256 c3971cb88230dc1dc9fad610b1201191133143b128a194cc5eca43e6b9392341
-MISC ChangeLog 10949 RMD160 5464838f2230c4bc547543359e60fb84d707e63c SHA1 8557bf523a50a9a905b6f9a6ecbf9b8001ace97d SHA256 3dcfad3f96b47360fad0d1dc5857c771c0c539dc71e77a209ff319d03148e51b
+MISC ChangeLog 11120 RMD160 9f9fb8aecc0c6de87c66b40bc94b814d5ffe4164 SHA1 80a7a0e266190aa038a0617fd3336f721dbd80a0 SHA256 867777ac1db79465d6d239b06b029cda51af27170cdd2af2b89dcb5d3b9b2282
 MISC metadata.xml 354 RMD160 9447adf4a6109b2ae9cd432efe4731b797a960cf SHA1 c63e9e822ba1c454e2b6a2e40e481f6ac37b30d5 SHA256 3a04edf3735f2f0f9aec88b1622b478a17bdbf51c982b565230d7c88dd2044d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNSSbtAAoJEPqDWhW0r/LCzfQQAL4WXkn9GnDMiukx885Gm3gL
-L6INozD954fNO7KoiH+6yVdrT7N7Bnqo1ujD4T0wwzQ/cZUYeJQcHI9k+uDFj4b9
-zeboJytOFsTTJgwKVYPHBKxjEetW0NzEcvxB6WPdZk/JU8FwVWE5sV6U62GfEYoT
-C/VphSLmMlSpgvba9Z80+qBGeAD5xFCU37w1itMqpm/8glldY7MF/jLa4o931AT7
-tQVf9+RF4nsj9/qu/IbpF7yA33rnrq7kefmmpsEGoDFodjR0GMdDnGbg6T1gBFfR
-i8CTWtiFFo1kPZl5iDzFfwtaT4Pzrq6K/6M2x7a1R4vbq2jFnDanebWN/PF7Sd83
-/40tpNvOLWOHVd2PolQuH0TZkKTlu0QKnojBPCtNtBU6osAFwjhKijWlUgf8omPL
-nVahDJxfHFuEnKOGQgndC8CyqWQzoXExuXK0vFgLo0oI47zkll3iB/qTBAnij+Qb
-Wj3vN1wzDhyHaFlsd43Thq6/BgXelCSgAqJvrvOmfV663yxIw5oz57qUkOePu3hA
-LkW+m1zVhzMlPZPY8YfdQ87Nq31DLBhlDyi++PJasI8jx+ous+lRvrFU5WuS2rZm
-7yJpkw/SjX5j0AcMCIsN5q3NKgQpGzjRF2mEbBUkFbkT6fmMgxUrlc0DaNxw537k
-BI4OJIc2nOzvZhFRoibi
-=mk1B
+iF4EAREIAAYFAk1eh9kACgkQmWq1bYTyC0NW0AD+IiWxWa4sTeXZ+0jcldThVE57
+cminr5yptMK4ozrpmbMA/3/a/HOorCWd3FL9me74e0GqFh52gpBxD/4ZrJVkOCjz
+=SzcB
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
new file mode 100644
index 000000000000..25f1c48b159c
--- /dev/null
+++ b/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild,v 1.1 2011/02/18 14:53:09 angelos Exp $
+
+EAPI="2"
+
+LANGSLONG="cs_CZ de_DE fr_FR it_IT nl_NL nn_NO no_NO ru_RU sv_SE tr_TR uk_UA"
+LANGS="zh_CN zh_TW pt_BR "
+
+inherit qt4-r2
+
+DESCRIPTION="QMPDClient with NBL additions, such as lyrics' display"
+HOMEPAGE="http://bitcheese.net/wiki/QMPDClient"
+SRC_URI="http://dump.bitcheese.net/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug dbus"
+
+DEPEND="x11-libs/qt-gui:4[dbus?]
+	x11-libs/qt-webkit:4
+	x11-libs/qt-xmlpatterns:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+DOCS="AUTHORS README THANKSTO Changelog"
+
+src_prepare() {
+	# Fix the install path
+	sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:" ${PN}.pro \
+		|| die "sed failed (install path)"
+
+	# nostrip fix
+	sed -i -e "s:^CONFIG += :CONFIG += nostrip :" ${PN}.pro \
+		|| die "sed failed (nostrip)"
+
+	sed -i -e "s:+= -O2 -g0 -s:+= -O2 -g0:" ${PN}.pro \
+		|| die "sed failed (nostrip)"
+
+	# fix installation folder name
+	sed -i "s:share/QMPDClient:share/qmpdclient:" ${PN}.pro src/config.cpp \
+		|| die "failed to fix installation directory"
+
+	# check dbus
+	if ! use dbus; then
+		sed -i -e "s/message(DBus notifier:\ enabled)/message(DBus notifier:\ disabled)/" \
+			-e "s/CONFIG\ +=\ nostrip\ qdbus//" \
+			-e "s/SOURCES\ +=\ src\/notifications_dbus.cpp/SOURCES\ +=\ src\/notifications_nodbus.cpp/" \
+			${PN}.pro || die "disabling dbus failed"
+	fi
+	qt4-r2_src_prepare
+}
+
+src_compile() {
+	emake || die "emake failed"
+	# generate translations
+	emake translate || die "failed to generate translations"
+	cd "${S}"/lang
+	for X in *.ts;do
+		lrelease "${X}" || die "lrelease failed"
+	done
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	#install translations
+	insinto /usr/share/${PN}/translations/
+	local LANG=
+	for LANG in ${LINGUAS};do
+	    for X in ${LANGSLONG};do
+			if [[ ${LANG} == ${X%_*} ]];then
+		    	doins -r lang/${X}.qm || die "failed to install translations"
+			fi
+	    done
+		for X in ${LANGS};do
+			if [[ ${LANG} == ${X} ]]; then
+				doins -r lang/${X}.qm || die "failed to install translations"
+			fi
+		done
+	done
+}