Explicitely link against libX11 (bug #367365)

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

3 files changed, 31 insertions, 7 deletions

diff --git a/media-sound/qmpdclient/ChangeLog b/media-sound/qmpdclient/ChangeLog
index 155457cc8071..dada46e372e8 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.84 2011/05/12 12:57:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/ChangeLog,v 1.85 2011/05/15 14:36:21 angelos Exp $
+
+  15 May 2011; Christoph Mende <angelos@gentoo.org> qmpdclient-1.2.1.ebuild,
+  +files/qmpdclient-1.2.1-explicit-link.patch:
+  Explicitely link against libX11 (bug #367365)
 
   12 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> qmpdclient-9999.ebuild:
   move global variable to global scope. Declare mycmakeargs local.
diff --git a/media-sound/qmpdclient/files/qmpdclient-1.2.1-explicit-link.patch b/media-sound/qmpdclient/files/qmpdclient-1.2.1-explicit-link.patch
new file mode 100644
index 000000000000..467a4d553b5f
--- /dev/null
+++ b/media-sound/qmpdclient/files/qmpdclient-1.2.1-explicit-link.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28fd3b4..4197a69 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ cmake_minimum_required(VERSION 2.6)
+ 
+-find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui QtNetwork QtXml QtXmlPatterns REQUIRED QtDBus X11)
++find_package(Qt4 4.4.0 COMPONENTS QtCore QtGui QtNetwork QtXml QtXmlPatterns REQUIRED QtDBus)
++find_package(X11 REQUIRED)
+ 
+ SET (QT_USE_QTNETWORK TRUE)
+ SET (QT_USE_QTXMLPATTERNS TRUE)
+@@ -279,6 +280,7 @@ add_definitions(-DNAMEVER="${NAMEVER}" -DPREFIX="${CMAKE_INSTALL_PREFIX}" -DVERS
+ add_executable(qmpdclient ${QMPDClient_srcs} ${QMPDClient_ppd_hdrs} ${QMPDClient_ppd_uis} ${QMPDClient_ppd_res} ${COMPILED_TRANSLATIONS})
+ 
+ target_link_libraries(qmpdclient ${QT_LIBRARIES})
++target_link_libraries(qmpdclient ${X11_LIBRARIES})
+ 
+ install(TARGETS qmpdclient DESTINATION bin)
+ if(UNIX)
diff --git a/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild b/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
index a9b8f799765f..158945eb9826 100644
--- a/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
+++ b/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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.7 2011/04/13 18:06:10 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmpdclient/qmpdclient-1.2.1.ebuild,v 1.8 2011/05/15 14:36:21 angelos Exp $
 
-EAPI=3
+EAPI=4
 inherit fdo-mime cmake-utils
 
 DESCRIPTION="QMPDClient with NBL additions, such as lyrics' display"
@@ -22,16 +22,15 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
-pkg_setup() {
-	DOCS="AUTHORS README THANKSTO Changelog"
-}
+DOCS=( AUTHORS README THANKSTO Changelog )
 
 src_prepare() {
 	sed -i -e "/^Categories/s/Network/AudioVideo/" ${PN}.desktop || die
+	epatch "${FILESDIR}"/${P}-explicit-link.patch
 }
 
 src_configure() {
-	mycmakeargs=( "-DVERSION=${PV}" )
+	local mycmakeargs=( "-DVERSION=${PV}" )
 	cmake-utils_src_configure
 }