x11-wm/qlwm: Readability. Migrated to EAPI 2 and added Makefile patches for qlwm-3 to allow user-defined CXX/LD-FLAGS.

svn path=/sunrise/; revision=8343

5 files changed, 136 insertions, 16 deletions

diff --git a/x11-wm/qlwm/ChangeLog b/x11-wm/qlwm/ChangeLog
index 9b2ffffe6..c56e6c944 100644
--- a/x11-wm/qlwm/ChangeLog
+++ b/x11-wm/qlwm/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Apr 2009; Christian Ruppert <idl0r@gentoo.org> qlwm-3.1.ebuild,
+  +files/qlwm-3-Makefiles.patch, qlwm-4.3.ebuild:
+  Readability. Migrated to EAPI 2 and added Makefile patches for qlwm-3 to
+  allow user-defined CXX/LD-FLAGS.
+
   12 Apr 2009; Thomas Fischer (Sparki) <fischer@unix-ag.uni-kl.de>
   +qlwm-3.1.ebuild, +qlwm-4.3.ebuild, +metadata.xml:
   New Ebuilds for bug 265893
diff --git a/x11-wm/qlwm/Manifest b/x11-wm/qlwm/Manifest
index 306d1a89f..0169808d4 100644
--- a/x11-wm/qlwm/Manifest
+++ b/x11-wm/qlwm/Manifest
@@ -1,6 +1,7 @@
+AUX qlwm-3-Makefiles.patch 2876 RMD160 e51a353e33b7523aa7283d3587ef1a206b4737d2 SHA1 18a024991bb99a1372a59c311df72174a0ef38f0 SHA256 1a5ca74eb35c47b0d849ee2e3c95e7b1940eebcc57ce0cc0b1e9be36242231fe
 DIST qlwm-3.1.tar.gz 50668 RMD160 6e6730aec46918ed9134c467f9bf540c053a7222 SHA1 e5ccaf6aeb4b9628c3ba19d3023862471bc04885 SHA256 4c9676dd35de562bd79b74b52d92e2b563069bc9fe97afc4a07aadfc7ddb923c
 DIST qlwm-4.3.tar.gz 50674 RMD160 41e6e8845e91939dc31d2b6dc2fcd37ce27522a8 SHA1 7fcf6eb9d92c211233169a6372b2fc1ada6e78c9 SHA256 302fc1c11affdbd337d5da5f28b7444c6cb328bf05ee1b71e0cdc3318d30a63a
-EBUILD qlwm-3.1.ebuild 2104 RMD160 4075598cba3d1dc0f20b001657ab3f0838a52bdd SHA1 036641266421e0214585d9e5e11db792760c10a9 SHA256 429257782e82983d3fb276790738cb4e068728d0b4e633770948934599207f78
-EBUILD qlwm-4.3.ebuild 2268 RMD160 412f5f4191a248797cbf08f5dd7f74faae971c0b SHA1 f350f9ebb84176f967c4a51ee74e8f9567c8e4bf SHA256 198f1fa3f4b25aed2ef9af701918194888ea120f9de69e8dc13dfb7bcaabaa0e
-MISC ChangeLog 262 RMD160 8b08baa89e0896c0d442c7d6897d64b63548369b SHA1 bcc357006f7ac37b83d9c484bdbb8b04bf749c18 SHA256 7408dced6e8cc4b998d55dbcd798d60e9074cd2a841d926ab95ee5b72a908870
+EBUILD qlwm-3.1.ebuild 2227 RMD160 8dd0f951960856410a66e948cea8bf89d72c3531 SHA1 afd0ea8e6b1483d7f98b5e94c0a679cca54394b9 SHA256 b616482b56d4d0bdaa518749d993cf856cc332997001e5bc0222cfb4dd8d1f05
+EBUILD qlwm-4.3.ebuild 2250 RMD160 91859b0594d2c4f7225a8a4a6d75e7ec86756875 SHA1 7f28e612b002adc65961e828374acc07dd9ab9fe SHA256 e1b3a43afcb345b40cda7fb624024aa45c28416e10860c7ebbdfeeb7033dd45a
+MISC ChangeLog 492 RMD160 bb6418b808ea293a95073b956048b534c3f1764b SHA1 726efc006171eda0eb5297eb974e480d24d97ea7 SHA256 67036840f1d21cad8de79e1a4c59fa374c626ac57ada429ef4478ea80383ffa0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/x11-wm/qlwm/files/qlwm-3-Makefiles.patch b/x11-wm/qlwm/files/qlwm-3-Makefiles.patch
new file mode 100644
index 000000000..7ae657f7b
--- /dev/null
+++ b/x11-wm/qlwm/files/qlwm-3-Makefiles.patch
@@ -0,0 +1,109 @@
+diff -Naurp -Naurp qlwm-3.1.old/dclock/Makefile qlwm-3.1/dclock/Makefile
+--- qlwm-3.1.old/dclock/Makefile	2004-01-26 15:14:57.000000000 +0100
++++ qlwm-3.1/dclock/Makefile	2009-04-18 19:00:05.883964330 +0200
+@@ -1,19 +1,19 @@
+ # Makefile for dclock
+ 
+ # Compiler
+-CXX  		= g++
+-CXXFLAGS	= -pipe -O2 ${CPPFLAGS} 
++CXX  		?= g++
++CXXFLAGS	?= -pipe -O2 ${CPPFLAGS} 
+ #CXXFLAGS	= -Wall -pipe
+ 
+ # include files
+ INCPATH		= -I$(QTDIR)/include
+ 
+ # libraries
+-LFLAGS		= -L$(QTDIR)/lib -pthread 
++LDFLAGS		+= -L$(QTDIR)/lib -pthread 
+ LIBS		= -lqt-mt
+ 
+ # Linker
+-LINK		= g++
++LINK		= ${CXX}
+ 
+ # Meta-object compiler
+ MOC		= $(QTDIR)/bin/moc
+@@ -36,7 +36,7 @@ SRCMOC  = moc_dclock.cpp
+ all: $(DESTDIR)$(TARGET)
+ 
+ $(DESTDIR)$(TARGET): $(OBJECTS) 
+-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
++	$(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+ 
+ depend:
+ 	makedepend *.cpp 2> /dev/null
+diff -Naurp -Naurp qlwm-3.1.old/mail/Makefile qlwm-3.1/mail/Makefile
+--- qlwm-3.1.old/mail/Makefile	2004-01-26 15:14:58.000000000 +0100
++++ qlwm-3.1/mail/Makefile	2009-04-18 18:59:12.206966659 +0200
+@@ -3,19 +3,19 @@
+ SHELL = /bin/sh
+ 
+ # Compiler
+-CXX  		= g++
+-CXXFLAGS	= -pipe -O2 ${CPPFLAGS}
++CXX  		?= g++
++CXXFLAGS	?= -pipe -O2 ${CPPFLAGS}
+ #CXXFLAGS	= -Wall -pipe
+ 
+ # include files
+ INCPATH		= -I$(QTDIR)/include
+ 
+ # libraries
+-LFLAGS		= -L$(QTDIR)/lib -pthread 
++LDFLAGS		+= -L$(QTDIR)/lib -pthread 
+ LIBS		= -lqt-mt
+ 
+ # Linker
+-LINK		= g++
++LINK		= ${CXX}
+ 
+ # Meta-object compiler
+ MOC		= $(QTDIR)/bin/moc
+@@ -38,7 +38,7 @@ SRCMOC  = moc_biff.cpp
+ all: conf.h $(DESTDIR)$(TARGET)
+ 
+ $(DESTDIR)$(TARGET): $(OBJECTS) 
+-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
++	$(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+ 
+ conf.h: Makefile
+ 	for i in /var/spool/mail /var/mail /usr/spool/mail /usr/mail ; do [ -d $${i} ] && break ; done ; \
+diff -Naurp -Naurp qlwm-3.1.old/src/Makefile qlwm-3.1/src/Makefile
+--- qlwm-3.1.old/src/Makefile	2004-01-26 15:14:58.000000000 +0100
++++ qlwm-3.1/src/Makefile	2009-04-18 18:58:56.528216463 +0200
+@@ -1,8 +1,8 @@
+ # Makefile for qlwm
+ 
+ # Compiler
+-CXX  		= g++
+-CXXFLAGS	= -pipe -O2 ${CPPFLAGS}
++CXX  		?= g++
++CXXFLAGS	?= -pipe -O2 ${CPPFLAGS}
+ #CXXFLAGS	= -Wall -pipe -DDEBUGMSG
+ #CXXFLAGS	= -pipe -DDEBUGMSG
+ 
+@@ -10,11 +10,11 @@ CXXFLAGS	= -pipe -O2 ${CPPFLAGS}
+ INCPATH		= -I/usr/X11R6/include -I$(QTDIR)/include
+ 
+ # libraries
+-LFLAGS		= -L/usr/X11R6/lib -L$(QTDIR)/lib -pthread
++LDFLAGS		+= -L/usr/X11R6/lib -L$(QTDIR)/lib -pthread
+ LIBS		= -lXext -lX11 -lm -lqt-mt
+ 
+ # Linker
+-LINK		= g++
++LINK		= ${CXX}
+ 
+ # Meta-object compiler
+ MOC		= $(QTDIR)/bin/moc
+@@ -37,7 +37,7 @@ SRCMOC  = moc_xwindow.cpp moc_winlist.cp
+ all: $(DESTDIR)$(TARGET)
+ 
+ $(DESTDIR)$(TARGET): $(OBJECTS) 
+-	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
++	$(LINK) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
+ 
+ depend:
+ 	makedepend *.cpp 2> /dev/null
diff --git a/x11-wm/qlwm/qlwm-3.1.ebuild b/x11-wm/qlwm/qlwm-3.1.ebuild
index 679d0eae4..781b86bd7 100644
--- a/x11-wm/qlwm/qlwm-3.1.ebuild
+++ b/x11-wm/qlwm/qlwm-3.1.ebuild
@@ -2,11 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="1"
+EAPI="2"
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A Qt based window manager"
 HOMEPAGE="http://www.mynetcologne.de/~nc-lindenal/qlwm/
-http://www.alinden.mynetcologne.de/qlwm/"
+	http://www.alinden.mynetcologne.de/qlwm/"
 SRC_URI="http://www.alinden.mynetcologne.de/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
@@ -15,14 +17,11 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="x11-libs/qt:3
-x11-libs/libX11
-x11-libs/libXext"
-
+	x11-libs/libX11
+	x11-libs/libXext"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# fix path to shared files
 	sed -i -e 's!^DEST .*$!DEST = /usr/share/'"${PN}-${SLOT}"'!' "Makefile" \
 	   || die "Cannot fix DEST variable for shared files"
@@ -32,6 +31,12 @@ src_unpack() {
 	# fixing path/filename to qtconfig
 	sed -i -e 's!qtconfig!/usr/qt/3/bin/qtconfig!' "files/menuconfig" \
 	   || die "Cannot fix menu entry for qtconfig"
+
+	epatch "${FILESDIR}/${PN}-3-Makefiles.patch"
+}
+
+src_compile() {
+	emake CXX=$(tc-getCXX) || die "emake failed"
 }
 
 src_install() {
diff --git a/x11-wm/qlwm/qlwm-4.3.ebuild b/x11-wm/qlwm/qlwm-4.3.ebuild
index ce5f076da..63a8ad8e1 100644
--- a/x11-wm/qlwm/qlwm-4.3.ebuild
+++ b/x11-wm/qlwm/qlwm-4.3.ebuild
@@ -6,7 +6,7 @@ EAPI="1"
 
 DESCRIPTION="A Qt based window manager"
 HOMEPAGE="http://www.mynetcologne.de/~nc-lindenal/qlwm/
-http://www.alinden.mynetcologne.de/qlwm/"
+	http://www.alinden.mynetcologne.de/qlwm/"
 SRC_URI="http://www.alinden.mynetcologne.de/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
@@ -14,15 +14,15 @@ SLOT="4"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="|| ( x11-libs/qt-gui:4 x11-libs/qt:4 )
-x11-libs/libX11
-x11-libs/libXext"
-
+DEPEND="x11-libs/qt-gui:4
+	x11-libs/libX11
+	x11-libs/libXext"
 RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	# fix path to shared files
 	sed -i -e 's!^DEST .*$!DEST = /usr/share/'"${PN}-${SLOT}"'!' "Makefile" \
 	   || die "Cannot fix DEST variable for shared files"