Version bump to 1.1.2 . Remove old ebuild

(Portage version: 2.2_rc49/cvs/Linux x86_64)

2 files changed, 28 insertions, 22 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 38e3000065c9..34b03ed94d72 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/qmpdclient
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.56 2009/10/28 06:09:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.57 2009/11/08 16:53:11 hwoarang Exp $
+
+*qmpdclient-1.1.2 (08 Nov 2009)
+
+  08 Nov 2009; Markos Chandras <hwoarang@gentoo.org>
+  -qmpdclient-1.1.0-r3.ebuild, +qmpdclient-1.1.2.ebuild:
+  Version bump to 1.1.2. Remove old ebuild
 
 *qmpdclient-1.1.1-r2 (28 Oct 2009)
 
diff --git a/media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild b/media-sound/qmpdclient/qmpdclient-1.1.2.ebuild
index acec1af3532a..52508bd501e3 100644
--- a/media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.1.2.ebuild
@@ -1,53 +1,52 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.0-r3.ebuild,v 1.5 2009/06/09 19:10:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.2.ebuild,v 1.1 2009/11/08 16:53:11 hwoarang Exp $
 
 EAPI="2"
 
 inherit qt4
 
-MY_PN="${PN}-ne"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="QMPDClient with NBL additions, such as lyrics' display"
 HOMEPAGE="http://bitcheese.net/wiki/QMPDClient"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+SRC_URI="http://dump.bitcheese.net/files/dedycec/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="debug dbus"
 
-DEPEND="x11-libs/qt-gui:4[dbus?]"
+DEPEND="x11-libs/qt-gui:4[dbus?,debug?]"
 RDEPEND="${DEPEND}"
 
-LANGS="de_DE fr_FR it_IT nl_NL nn_NO no_NO ru_RU sv_SE tr_TR uk_UA"
-LANGSLONG="zh_CN zh_TW pt_BR"
+LANGSNOLONG="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 "
 
-for X in ${LANGS}; do
+for X in ${LANGSNOLONG}; do
 	IUSE="${IUSE} linguas_${X%_*}"
 done
 
-for X in ${LANGSLONG};do
+for X in ${LANGS};do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}"
 
 src_prepare() {
 	# Fix the install path
-	sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:" qmpdclient.pro \
+	sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:" ${PN}.pro \
 		|| die "sed failed (install path)"
 
+	# Fix package version
+	sed -i -e "s:1.1.1:${PV}:" ${PN}.pro || die "failed to fix package version"
 	# nostrip fix
-	sed -i -e "s:CONFIG += :CONFIG += nostrip :" qmpdclient.pro \
+	sed -i -e "s:CONFIG += :CONFIG += nostrip :" ${PN}.pro \
 		|| die "sed failed (nostrip)"
 
-	sed -i -e "s:+= -O2 -g0 -s:+= -O2 -g0:" qmpdclient.pro \
+	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/" src/config.cpp \
+	sed -i "s/share\/QMPDClient/share\/qmpdclient/" ${PN}.pro src/config.cpp \
 		|| die "failed to fix installation directory"
 
 	# check dbus
@@ -67,6 +66,10 @@ 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() {
@@ -77,19 +80,16 @@ src_install() {
 		newins icons/qmpdclient${res}.png ${PN}.png || die "Installing icons failed"
 	done
 
-	make_desktop_entry qmpdclient "QMPDClient" ${PN} \
-		"Qt;AudioVideo;Audio;" || die "Installing desktop entry failed"
-
 	#install translations
 	insinto /usr/share/${PN}/translations/
 	local LANG=
 	for LANG in ${LINGUAS};do
-	    for X in ${LANGS};do
+	    for X in ${LANGSNOLONG};do
 			if [[ ${LANG} == ${X%_*} ]];then
 		    	doins -r lang/${X}.qm || die "failed to install translations"
 			fi
 	    done
-		for X in ${LANGSLONG};do
+		for X in ${LANGS};do
 			if [[ ${LANG} == ${X} ]]; then
 				doins -r lang/${X}.qm || die "failed to install translations"
 			fi