remove old ebuild, revbump based on qt4-r2 eclass

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

2 files changed, 23 insertions, 25 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 732f22467f36..c20d4cc7ae69 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/qmpdclient
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.59 2010/01/06 16:35:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.60 2010/01/07 12:48:48 hwoarang Exp $
+
+*qmpdclient-1.1.2-r1 (07 Jan 2010)
+
+  07 Jan 2010; <hwoarang@gentoo.org> -qmpdclient-1.1.1-r2.ebuild,
+  +qmpdclient-1.1.2-r1.ebuild:
+  remove old ebuild, revbump based on qt4-r2 eclass
 
   06 Jan 2010; Jeroen Roovers <jer@gentoo.org> qmpdclient-1.1.2.ebuild:
   Stable for HPPA (bug #299317).
diff --git a/media-sound/qmpdclient/qmpdclient-1.1.1-r2.ebuild b/media-sound/qmpdclient/qmpdclient-1.1.2-r1.ebuild
index 7d354d217d9c..f5753c8e1729 100644
--- a/media-sound/qmpdclient/qmpdclient-1.1.1-r2.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.1.2-r1.ebuild
@@ -1,45 +1,42 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.1-r2.ebuild,v 1.1 2009/10/28 06:09:52 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.1.2-r1.ebuild,v 1.1 2010/01/07 12:48:48 hwoarang Exp $
 
 EAPI="2"
 
-inherit qt4
+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="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~hwoarang/distfiles/${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"
 IUSE="debug dbus"
 
-DEPEND="x11-libs/qt-gui:4[dbus?,debug?]"
+DEPEND="x11-libs/qt-gui:4[dbus?]"
 RDEPEND="${DEPEND}"
 
-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 ${LANGSNOLONG}; do
-	IUSE="${IUSE} linguas_${X%_*}"
-done
+S="${WORKDIR}/${PN}"
 
-for X in ${LANGS};do
-	IUSE="${IUSE} linguas_${X}"
-done
+DOCS="AUTHORS README THANKSTO Changelog"
 
 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
@@ -55,10 +52,6 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	eqmake4 qmpdclient.pro
-}
-
 src_compile() {
 	emake || die "emake failed"
 	# generate translations
@@ -70,8 +63,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install INSTALL_ROOT="${D}" || die "emake install failed"
-	dodoc README AUTHORS THANKSTO Changelog || die "Installing docs failed"
+	qt4-r2_src_install
 	for res in 16 22 64 ; do
 		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
 		newins icons/qmpdclient${res}.png ${PN}.png || die "Installing icons failed"