Various QA fixes by Jakub Moc. (bug #207733)

(Portage version: 2.1.5_rc3)

3 files changed, 59 insertions, 6 deletions

diff --git a/x11-plugins/docker/ChangeLog b/x11-plugins/docker/ChangeLog
index 12825834f1bb..5d8910af01be 100644
--- a/x11-plugins/docker/ChangeLog
+++ b/x11-plugins/docker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/docker
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.14 2007/04/22 09:57:50 corsair Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.15 2008/04/24 09:04:05 omp Exp $
+
+  24 Apr 2008; David Shakaryan <omp@gentoo.org>
+  +files/docker-1.5-makefile.patch, docker-1.5.ebuild:
+  Various QA fixes by Jakub Moc. (bug #207733)
 
   22 Apr 2007; Markus Rothe <corsair@gentoo.org> docker-1.5.ebuild:
   Added ~ppc64
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
index 4356867ba2e9..87ed9f217206 100644
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ b/x11-plugins/docker/docker-1.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild,v 1.12 2007/04/22 09:57:50 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild,v 1.13 2008/04/24 09:04:05 omp Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
 HOMEPAGE="http://icculus.org/openbox/2/docker/"
@@ -13,10 +15,20 @@ DEPEND="${RDEPEND}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
 src_install() {
-	dobin docker
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README
 }
diff --git a/x11-plugins/docker/files/docker-1.5-makefile.patch b/x11-plugins/docker/files/docker-1.5-makefile.patch
new file mode 100644
index 000000000000..3a98da19455c
--- /dev/null
+++ b/x11-plugins/docker/files/docker-1.5-makefile.patch
@@ -0,0 +1,37 @@
+--- Makefile.orig       2002-11-20 11:20:49.000000000 +0100
++++ Makefile	2008-01-27 20:14:14.000000000 +0100
+@@ -5,12 +5,12 @@
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ 
+ # Change this PREFIX to where you want docker to be installed
+-PREFIX=/usr/local
++PREFIX=/usr
+ # Change this XLIBPATH to point to your X11 development package's installation
+-XLIBPATH=/usr/X11R6/lib
++XLIBPATH=/usr/lib
+ 
+ # Sets some flags for stricter compiling
+-CFLAGS=-pedantic -Wall -W -O
++CFLAGS+=-pedantic -Wall -W
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                 #
+@@ -24,7 +24,7 @@
+ target=docker
+ sources=docker.c kde.c icons.c xproperty.c net.c
+ headers=docker.h kde.h icons.h xproperty.h net.h version.h
+-extra=README COPYING version.h.in
++extra=README version.h.in
+ 
+ all: $(target) $(sources) $(headers)
+ 	@echo Build Successful
+@@ -40,7 +40,8 @@
+ 	sed -e "s/@VERSION@/$(VERSION)/" version.h.in > $@
+ 
+ install: all
+-	install $(target) $(PREFIX)/bin/$(target)
++	install -d $(DESTDIR)$(PREFIX)/bin
++	install $(target) $(DESTDIR)$(PREFIX)/bin/$(target)
+ 
+ uninstall:
+ 	rm -f $(PREFIX)/$(target)