Improved ebuild, proposed in bug 217850. Depend changed to include split Qt. Dropping older versions.

Package-Manager: portage-2.1.5_rc3

5 files changed, 56 insertions, 76 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 3a00f1e83e41..f337ec416f21 100644
--- a/media-sound/qmpdclient/ChangeLog
+++ b/media-sound/qmpdclient/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/qmpdclient
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.25 2008/03/07 22:18:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.26 2008/04/15 21:34:52 yngwin Exp $
+
+*qmpdclient-1.0.8-r1 (15 Apr 2008)
+
+  15 Apr 2008; Ben de Groot <yngwin@gentoo.org> -qmpdclient-1.0.6.2.ebuild,
+  -qmpdclient-1.0.7.ebuild, +qmpdclient-1.0.8-r1.ebuild:
+  Improved ebuild, proposed in bug 217850. Depend changed to include split
+  Qt. Dropping older versions.
 
   07 Mar 2008; Christoph Mende <angelos@gentoo.org> qmpdclient-1.0.8.ebuild:
   Stable on amd64, bug #210526
diff --git a/media-sound/qmpdclient/Manifest b/media-sound/qmpdclient/Manifest
index c4c753a7bd91..f4ab1014ea1a 100644
--- a/media-sound/qmpdclient/Manifest
+++ b/media-sound/qmpdclient/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.0.8-argc-ref-fix.patch 1088 RMD160 3051805d1fee865c688932fb8f5b3bb2e677e7c3 SHA1 79ea75eef9d224fd4bc9abb3e172dec03f5bc813 SHA256 384c0bb68beac7d7a81eb4f760ca3835974dc19fc495f2d4e00086f85fa04165
-DIST qmpdclient-1.0.6.2.tar.gz 204103 RMD160 927733606f027eff0ec4c7805481ae9b7d827474 SHA1 2130c426f894a581b8392bebd17d71b3d5069661 SHA256 f37513589b5a49c57240aee7b99ccf71647452193456a966ca0ce5d460768fff
-DIST qmpdclient-1.0.7.tar.gz 226078 RMD160 76bb28ef72bbd471aee20c39b1987c85fc0efecd SHA1 f7b14bd62ea5b4bf9c56942fce7e6a0050441ded SHA256 4d01940020414cb5c16299dd03f32bc00daa2defc7805348b71ef7ff42d2c5d2
 DIST qmpdclient-1.0.8.tar.gz 190349 RMD160 1f3d25c24c3724204ac82630d6c1a1914800a228 SHA1 0711d19a117634e97ba1f568cd186a5cfaf35e3c SHA256 2b9076a5c51b2c201f64e74b8756645427de539974fda10c8dd77dd2b7973381
-EBUILD qmpdclient-1.0.6.2.ebuild 818 RMD160 8b63ccaa2cc2f299946e0aceadc7d85358ded662 SHA1 fa1829fae696e8418a8b18181c6334a962f40709 SHA256 3b421ea0b53799b75ff5e61b43a46581ed211f36745626960cb0741d08ce02e2
-EBUILD qmpdclient-1.0.7.ebuild 821 RMD160 6e7a028c7caa145ba8b521d337642574373fd626 SHA1 d24cdfd7dc379cc05958bd96bc52493162549868 SHA256 f3d0370fc907db9a2d8efa1f43fe3e3b9303cef8901906f7b7b58a96658459c1
+EBUILD qmpdclient-1.0.8-r1.ebuild 1226 RMD160 a5cfdedcc749243d59983c31e279cf1b2d636046 SHA1 bcc41ced01e1f0409540a8122773bc14e7e79a3b SHA256 e3efd63f4b37e2e1c3d42c8d2edcbb92bb07e1bbb5e7bc8ef4fef4ee993a309d
 EBUILD qmpdclient-1.0.8.ebuild 1507 RMD160 15414555902a4803521fe249943ad9683913b836 SHA1 c18220f40c24e2bc14926e2e693cd240509d1d63 SHA256 ef3f68151ae0e526de64f81893f4ce8e7f56b714d28b3bfc07e5e1645a9bba8f
-MISC ChangeLog 4365 RMD160 e6329aefb6537459859b8e6a798cf5d88bf93e51 SHA1 9df832f28fb0a0646f431cd6100072033d92718b SHA256 f2ab146a99286b34fe7fa4f30c6b46ee7342de55167bde0c0eec3e3f301e57d9
+MISC ChangeLog 4640 RMD160 bb826da8ee084df1c7070daec587be57af1ddbf1 SHA1 0db753adc6277b7db1986cd154ed0be6f188df3a SHA256 f4ad4e6bb0b7ffda27a949877aa15ae5346b3e05714631100ba0f6f3c4d56cae
 MISC metadata.xml 312 RMD160 385fc14db78fefd87d894c15403e1356afd251f6 SHA1 bb45a55dde1a5d92ad5f4e5e9fff92f0d61971a6 SHA256 020f7c46ae8774fc31acda9fd827b37d8618787791b6d7abc3185177949f868d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH0b9AKhnDs22gwa8RAmg3AKD6h9uMvVUbAyc59SunCvTREFkt4ACg7TUw
-kk8qYB5wG9hbbCLWrWeyUyI=
-=YxPg
------END PGP SIGNATURE-----
diff --git a/media-sound/qmpdclient/qmpdclient-1.0.6.2.ebuild b/media-sound/qmpdclient/qmpdclient-1.0.6.2.ebuild
deleted file mode 100644
index 397f8ee2fc5c..000000000000
--- a/media-sound/qmpdclient/qmpdclient-1.0.6.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.0.6.2.ebuild,v 1.3 2008/02/29 20:06:46 carlo Exp $
-
-inherit eutils
-
-DESCRIPTION="An easy to use MPD client written in Qt 4.1"
-HOMEPAGE="http://havtknut.tihlde.org/qmpdclient"
-SRC_URI="http://havtknut.tihlde.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-4.1"
-
-src_compile() {
-	./configure || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dodoc README AUTHORS THANKSTO Changelog
-	insinto /usr/share/pixmaps
-	doins icons/qmpdclient{16,22,32,64,128}.png
-	dobin qmpdclient
-
-	make_desktop_entry qmpdclient "QMPDClient" qmpdclient64 "KDE;Qt;AudioVideo"
-}
diff --git a/media-sound/qmpdclient/qmpdclient-1.0.7.ebuild b/media-sound/qmpdclient/qmpdclient-1.0.7.ebuild
deleted file mode 100644
index 152153d272ab..000000000000
--- a/media-sound/qmpdclient/qmpdclient-1.0.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.0.7.ebuild,v 1.5 2008/02/29 20:06:46 carlo Exp $
-
-inherit eutils
-
-DESCRIPTION="An easy to use MPD client written in Qt 4.1"
-HOMEPAGE="http://havtknut.tihlde.org/qmpdclient"
-SRC_URI="http://havtknut.tihlde.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc x86"
-IUSE=""
-
-DEPEND=">=x11-libs/qt-4.2"
-
-src_compile() {
-	./configure || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dodoc README AUTHORS THANKSTO Changelog
-	insinto /usr/share/pixmaps
-	doins icons/qmpdclient{16,22,32,64,128}.png
-	dobin qmpdclient
-
-	make_desktop_entry qmpdclient "QMPDClient" qmpdclient64 "KDE;Qt;AudioVideo"
-}
diff --git a/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild b/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..c938c889a942
--- /dev/null
+++ b/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.0.8-r1.ebuild,v 1.1 2008/04/15 21:34:52 yngwin Exp $
+
+EAPI=1
+
+inherit eutils multilib qt4 toolchain-funcs
+
+DESCRIPTION="An easy to use MPD client written in Qt4"
+HOMEPAGE="http://havtknut.tihlde.org/qmpdclient"
+SRC_URI="http://havtknut.tihlde.org/${PN}/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+DEPEND="|| ( >=x11-libs/qt-4.2 x11-libs/qt-gui:4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix a crasher for am64 and possibly others. Bug #183593.
+	epatch "${FILESDIR}"/${PV}-argc-ref-fix.patch
+
+	# Fix the install path
+	sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:" qmpdclient.pro \
+		|| die "sed failed"
+}
+
+src_compile() {
+	eqmake4 || die "qmake failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	dodoc README AUTHORS THANKSTO Changelog
+	for res in 16 22 32 64 128 ; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins icons/qmpdclient${res}.png ${PN}.png
+	done
+
+	dobin qmpdclient || die "dobin failed"
+	make_desktop_entry qmpdclient "QMPDClient" ${PN} "Qt;AudioVideo;Audio"
+}