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

Package-Manager: portage-2.1.5_rc3

4 files changed, 72 insertions, 8 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/Manifest b/x11-plugins/docker/Manifest
index aa32f2548bb7..e21639b537d2 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX docker-1.5-makefile.patch 1199 RMD160 1beaed4cc9f7feee11dba0e3020c4bac9855ff9e SHA1 026244ad6fd108f423633e2eec529082bdb3c0bd SHA256 66e188379e89ddf0655788fcfde12438f63869e7801aeec1c3fae88b7b255ac8
 DIST docker-1.5.tar.gz 14863 RMD160 d36883acf4de5c2e97d478a7d29cb66645189748 SHA1 aff3e0c6103a7b1f190d4207868ae7c28d267304 SHA256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e
-EBUILD docker-1.5.ebuild 625 RMD160 867067870673b0a43009792b5de320fb24b93164 SHA1 4a171553b18c028746a1478373cc82638e06c4ae SHA256 f476f4b8fac16d25aa20fe60af23fd57855e0cf1a37c47ae95d6e66a073aeb5c
-MISC ChangeLog 2344 RMD160 b6f344913116ac203603c0737bbcee64817900d9 SHA1 4a3d6bdaea789223ca507ebd3df1ae86d9a9e9c2 SHA256 93be958b671ecc39c05afef960168254e6e7f81067408115e99e87eb7497408e
+EBUILD docker-1.5.ebuild 852 RMD160 abf6a793d78202b221b731f8b8a533258cebdff0 SHA1 7d367193c412cbf3c83ade21ae060785b54f1794 SHA256 9a7910210000e503a6719b2668eee78e4126a50e9cdcee72d008ca50c2aa3fcd
+MISC ChangeLog 2491 RMD160 18cb87f0b67243471916b734b11c504c4942ad3e SHA1 fe2b909949f2abaedd803f1fb11b967793e0307e SHA256 063d3788bbc82c1da60547e5be7beba67b226e1078b93ef816ff1499adabed3a
 MISC metadata.xml 267 RMD160 27753c1f4d82faee2605a0d2407faacd5cce6ffd SHA1 eb10f57f5ff1b2d8c06c58fa46642dc92005917a SHA256 63129b02d94a5455e5ff36587c796ccb473073fdbba188a46347027379e0d8fa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQTTwACgkQvSApE0uP4Usi2gCfXnNDpYzoa78GUrDTorzIZDjy
+Jn0AoJws6PSrLy62KEXC33pU6k5MyIA2
+=341i
+-----END PGP SIGNATURE-----
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)