remove old ebuild, revbump based on qt4-r2 eclass

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 25 insertions, 27 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/Manifest b/media-sound/qmpdclient/Manifest
index bf4887fdf936..1d9cca12a549 100644
--- a/media-sound/qmpdclient/Manifest
+++ b/media-sound/qmpdclient/Manifest
@@ -1,7 +1,7 @@
 DIST qmpdclient-1.1.1.tar.gz 354318 RMD160 34a31a5e97a426de454b1a581f2f2a25a64e198b SHA1 abc14402b0d8b7b10c310d44935816076fa6b0a2 SHA256 215d3d0c41d688bf13ab3bdbfb66bcffdacd4f7c16f024f2ce6cd9dc622e5f0a
 DIST qmpdclient-1.1.2.tar.bz2 260718 RMD160 098ac9b04ae00bad19687a403073a0c4470e9007 SHA1 a978e939c558b6c6fef07b6e8021d01c5a551de4 SHA256 7bd0c2a87e9a6bdd0580b5c99b6450eb8345f90e27c12a601d3f097e797d794d
-EBUILD qmpdclient-1.1.1-r2.ebuild 2639 RMD160 6a9311589137f77cbf5ec883460f244ab0d3eb43 SHA1 9559ebd60717db4b48c94692dc72a1d5269bcb06 SHA256 546fe896af0eff096efe48cda41f77d7d324ae620fa1b0bb702022e28d1c3769
 EBUILD qmpdclient-1.1.1.ebuild 2532 RMD160 1f2fd9f5db4bdb17d2734db2b45118d5eec93100 SHA1 e0528f79798707ef843ac778454b21d31394bf93 SHA256 1c51e9eeb02d15a02b2be88e05903ba0b346aef0f22a8735571a9262f5b71ff2
+EBUILD qmpdclient-1.1.2-r1.ebuild 2467 RMD160 afbb737575aaf888338d7579d1fc061c03a61a74 SHA1 6c5628d6163314278417bfff6c3c30558cf0fe97 SHA256 598bb8c752450620c556674926a51ec7b9e2b5caa5d34d6c88f25db9c37497c5
 EBUILD qmpdclient-1.1.2.ebuild 2706 RMD160 cdbd94f31625863e511adb6c483b3138449581a7 SHA1 44db93a4125a673504bedbf9c65f8d062f55d857 SHA256 360f5fec8d5c06afab978e176863c085b2c274cf93aaf524c349d66cc340f259
-MISC ChangeLog 9021 RMD160 9fa4cb144a946b2ab9aa8870592f1d331cb2da0a SHA1 c0aa5a0772c07175eec80c1776ffc48d45382041 SHA256 f906bdf769581fcb211eac57e8c05cee429af9d1673ef0227748c9973edc8391
+MISC ChangeLog 9212 RMD160 fd3171ce6528b9e4c21f1eabfddac7aec9b8e084 SHA1 3c75e04f3b7546d78a5a43f300a8f6749279e526 SHA256 31b507679100d09f61b31878bb3b509d6174f4cd51707fd73a769af1dafbb49b
 MISC metadata.xml 258 RMD160 f32ba62126b21562a3642f9d351eec482fa91c19 SHA1 c9dcd2a5a50ab150a1ddd117357dd705c4d05e77 SHA256 3f6828f13a57795ebfa18907e3cb7a9bf80b7be961ab0b198ec135762e90c723
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"