Updated live ebuilds and synced 1.2.1 with 9999

(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)

3 files changed, 27 insertions, 80 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 29820b06f09e..ca568c0e5c22 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,10 @@
 # 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.74 2011/02/18 14:53:09 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.75 2011/03/14 17:35:45 angelos Exp $
+
+  14 Mar 2011; <angelos@gentoo.org> qmpdclient-1.2.1.ebuild,
+  qmpdclient-9999.ebuild:
+  Updated live ebuilds and synced 1.2.1 with 9999
 
 *qmpdclient-1.2.1 (18 Feb 2011)
 
diff --git a/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
index 25f1c48b159c..2419b78322f5 100644
--- a/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
@@ -1,13 +1,9 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild,v 1.2 2011/03/14 17:35:45 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
+EAPI=3
+inherit fdo-mime cmake-utils
 
 DESCRIPTION="QMPDClient with NBL additions, such as lyrics' display"
 HOMEPAGE="http://bitcheese.net/wiki/QMPDClient"
@@ -15,70 +11,19 @@ SRC_URI="http://dump.bitcheese.net/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug dbus"
+KEYWORDS=""
+IUSE="debug"
 
-DEPEND="x11-libs/qt-gui:4[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)"
+S=${WORKDIR}/${PN}
 
-	# 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
+pkg_setup() {
+	DOCS="AUTHORS README THANKSTO Changelog"
 }
 
-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
-}
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/qmpdclient/qmpdclient-9999.ebuild b/media-sound/qmpdclient/qmpdclient-9999.ebuild
index 0e85e1ef5aa5..3455e9a20196 100644
--- a/media-sound/qmpdclient/qmpdclient-9999.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-9999.ebuild
@@ -1,32 +1,30 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-9999.ebuild,v 1.2 2010/06/21 17:38:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-9999.ebuild,v 1.3 2011/03/14 17:35:45 angelos Exp $
 
 EAPI=3
-
 inherit cmake-utils git
 
 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"
-EGIT_REPO_URI="http://github.com/Voker57/qmpdclient.git"
+EGIT_REPO_URI="http://github.com/Voker57/${PN}.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="
-	x11-libs/qt-gui:4[dbus]
-	x11-libs/qt-xmlpatterns:4
-"
+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_configure() {
-	local mycmakeargs=( "-DVERSION=${PV}" )
-	cmake-utils_src_configure
+pkg_setup() {
+	DOCS="AUTHORS README THANKSTO Changelog"
 }
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }