Move under desktop-dock, block app-emulation/docker in current stable, clean ebuild and rename binary

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

6 files changed, 112 insertions, 16 deletions

diff --git a/x11-plugins/docker/ChangeLog b/x11-plugins/docker/ChangeLog
index 51511ae2b6e8..a780672ef811 100644
--- a/x11-plugins/docker/ChangeLog
+++ b/x11-plugins/docker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/docker
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.23 2013/10/19 15:15:47 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v 1.24 2015/01/19 19:31:07 voyageur Exp $
+
+*docker-1.5-r1 (19 Jan 2015)
+
+  19 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> docker-1.5.ebuild,
+  +docker-1.5-r1.ebuild, +files/docker-1.5-makefile_rename.patch, metadata.xml:
+  Move under desktop-dock, block app-emulation/docker in current stable, clean
+  ebuild and rename binary
 
   19 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due desktop-wm removal
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index d63c3fbf6826..50c7959ab7d1 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA256
 
 AUX docker-1.5-makefile.patch 1437 SHA256 7fc6f0ba34ecaf1d73de7c8c779e555b9dd50fb9782b274456a70e1da38a3837 SHA512 c48a8926b49d34fe7c794380d63c240e60d1df7c3d38c2e3ad8762593f36b478f6e90ce2acd4028491f2ad6b615cca3d81be503e60361ca607bef0f617645834 WHIRLPOOL 7f243ff00531dbc8e62667e91fcd56ecb1efd0c1e50102318050b09f9e5d3ad919705e0eab86cf24567bb5682f257427ef068b97a242674093cf3e28d38cd31a
-DIST docker-1.5.tar.gz 14863 SHA256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e
-EBUILD docker-1.5.ebuild 850 SHA256 913a56b7a47c73309a70a02088bb8fe74ec16751b30df69d6c9653fc2fa3207d SHA512 90a5f5491e2ec23918f699e4133fc518c2f4cbaf7a971f7bc6611cd0953ad4cf67ebf891485a80fbd44e11d17c392dd4f75f93a919d634d5834722918d80475a WHIRLPOOL 8737fca8b164813bc002fc0391e37cd3f76d3852b5a5d50830fba72efc7cd57c0e3349b9c7298790dca53d5fe3d059629200fd872d3ca2d8e6562c40d4a7059f
-MISC ChangeLog 3357 SHA256 e4923962e14114b7b8e355021ef7595901c011ed14fe998cbbbaf77a6c11a705 SHA512 20f9eaa1c98c6b05c86b886680f2233f059f4625dc97078cef53896dff79cce06746f94c86999aae33748e8e8fb5a0045a888c84eb6fd97f11595b57e807750b WHIRLPOOL ddd0a1bccebb00e826581ad14f9dd538bdc331e147618bbfbdef15c9687897340cf1a413778aab78129cd109a9b57e5dbfe8a290c38760f28d27942a3ff24305
-MISC metadata.xml 311 SHA256 8916b1236499950e21f5954a8fc9cfab5cea3f6423e043a1cd3fc32d72ffd6cf SHA512 65c1eb8fc4a81d0e5bca179bf3e5ebc92cceb3bcfc268a9adfd206b652754d2c41e45432fc5d1a90d4bb02e8d691811783cc845c348d3f502683a646595e0dbd WHIRLPOOL f21356c86d5120b53aaa5d7ca4858e89ba959874f91eae78b0c76049fcb5942d562deb39ed61c76c34e2e483a5826171c96ded22faed5e1024328e09b7acc598
+AUX docker-1.5-makefile_rename.patch 1485 SHA256 b71e665e16145a0dec5f09d219ac34a263d1cf82dea48a428b94d28287a30eb1 SHA512 17652b5ea6051264288bdb02dd5936b490a39ed1ce37d6ae00cc41b6b5ebc66fd1532bb60d35182db08776b948ff944cbc7a5ec5d9b067d73afd29827a19f7af WHIRLPOOL 06d639c7cbb544c418809508d90ddba08c067c36809cdd3812cb50f592692219aeae29c4bd2c380c7fc1f6bd3774c780729a3559480d56d020e8ad3f70a637a4
+DIST docker-1.5.tar.gz 14863 SHA256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861 WHIRLPOOL 2b8fbb60a901f97e71dc31cb876ee42f5b3ff6fe898f4d01b54e98d61352090d561b00fde16f081736ab9882d70281b49102c95a29211e1f0bec1a2f55bd75e1
+EBUILD docker-1.5-r1.ebuild 903 SHA256 8a1b7fb64b60f61f89bf1bd5201a63c6feb69e641813c8e1f7c0f77104809a38 SHA512 07835967eb4d3401222669695afb5655f16536bff158e3ae8c6d984356b0272cb79c7db892217c0a5d62e2d257b926a16e74bd09c59c188a776f54d802850399 WHIRLPOOL 85040d9eb09b08364e608dc8a7022b73b2b26bddc2566a4716d169a3357feb5c0f033e692c6edec0394b83f4813209741e36e3a31fa45270e5df19c6b15296e9
+EBUILD docker-1.5.ebuild 875 SHA256 db9b30b9c1dfc871ef2f7a6ee5b8b4dbe07ad30b77757de547f23e6e8819aee7 SHA512 44653735b853d8d5ac268dce09ced9699cde7683b68f07d14e25bbc1c59ff015f704a2109f7bf9308cc59b02205b3988f4e93ad2509fc8f52dc2e40035ca1fe7 WHIRLPOOL 386f828e336dd67a3c9d158470be0d8bbb63546d42af9f7dd6fb55d81f98298189d3dbd6f8e24d9c3f872d9694a4b37706d8eb1bd3d76342ac51a6d7639772a7
+MISC ChangeLog 3651 SHA256 b47f4622926353236f4d8459fef901f1b2f56236eb870e7b3e9f10bca9ee7c9a SHA512 19bbd64d3ac9c4542b82e9883c5db955adb204b0806b4ca4272633e40f2d7fd47ff971b0b0c7dc6daa1f890ef29f86ab995f337b577e28410309f4a38bed383b WHIRLPOOL f454b670570b2fadb382bf5d481ee4237ecfad75238ccc45b75212c160165b550f0401c0cfa84e0d0737c2878650b2c99cce95e9eca39ccd3f435e554c8fbd44
+MISC metadata.xml 264 SHA256 1a65ab438aa0549b2ec287145a4c3d67b71546126d34f3e875f7dcc32214b102 SHA512 84dbd459a041c016cb4a214211e78381b4ddd963cdbfa30eb7478ae9e6519adbb00198a8e34934e0e752ea8d3cb988a3deccbb497eca5ba36614a61590a4e716 WHIRLPOOL d5f1d9b98f67528e5e8a1167e34e5096f030d056eb9b08d73dce2963871277420231eae1ac21cc6ab09940241403d6b7fc6b02373b9468f137b4e57f82efbf12
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlJioiUACgkQCaWpQKGI+9QKEQCfVQWWTO1J75T7LwGy3ZOWadYV
-WREAnRqjO4RjaLHjqzvFne27UP6gB02e
-=N2UD
+iF4EAREIAAYFAlS9W4AACgkQFYEBGcdFJfL0YQD7BpNlm4KxX2doOdzRUQwijWAh
+tSLE3dDUMSsxKnDKxdUA/AtDLUrQ1yyqBG3SW7PzDth+fwxTHN5AIranoxo98rPE
+=gVzS
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild
new file mode 100644
index 000000000000..cc20fc594c3e
--- /dev/null
+++ b/x11-plugins/docker/docker-1.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5-r1.ebuild,v 1.1 2015/01/19 19:31:07 voyageur Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
+HOMEPAGE="http://icculus.org/openbox/2/docker/"
+SRC_URI="http://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.0.4
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-makefile_rename.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README
+}
+
+pkg_postinst() {
+	einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker"
+}
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
index 76f180eab64f..1c255ef60edf 100644
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ b/x11-plugins/docker/docker-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 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.18 2012/05/05 05:12:02 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild,v 1.19 2015/01/19 19:31:07 voyageur Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,7 +9,8 @@ HOMEPAGE="http://icculus.org/openbox/2/docker/"
 SRC_URI="http://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 RDEPEND=">=dev-libs/glib-2.0.4
-	x11-libs/libX11"
+	x11-libs/libX11
+	!app-emulation/docker"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
new file mode 100644
index 000000000000..2e742661b11d
--- /dev/null
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -0,0 +1,49 @@
+--- Makefile.orig	2015-01-19 20:10:47.762522964 +0100
++++ Makefile	2015-01-19 20:11:11.463545692 +0100
+@@ -5,12 +5,10 @@
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ 
+ # Change this PREFIX to where you want docker to be installed
+-PREFIX=/usr/local
+-# Change this XLIBPATH to point to your X11 development package's installation
+-XLIBPATH=/usr/X11R6/lib
++PREFIX = /usr
+ 
+ # Sets some flags for stricter compiling
+-CFLAGS=-pedantic -Wall -W -O
++CFLAGS += -pedantic -Wall -W
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                 #
+@@ -21,17 +19,17 @@
+ PACKAGE=docker
+ VERSION=1.5
+ 
+-target=docker
++target=wmdocker
+ 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
+ 
+ $(target): $(sources:.c=.o)
+-	$(CC) $(CFLAGS) -L$(XLIBPATH) -lX11 \
+-		`pkg-config --libs glib-2.0` $^ -o $@
++	$(CC) $(LDFLAGS) $(CFLAGS) $^ -lX11 \
++		`pkg-config --libs glib-2.0` -o $@
+ 
+ %.o: %.c
+ 	$(CC) -c $(CFLAGS) `pkg-config --cflags glib-2.0` $<
+@@ -40,7 +38,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)
diff --git a/x11-plugins/docker/metadata.xml b/x11-plugins/docker/metadata.xml
index 4497ed96289f..6a888dd1add1 100644
--- a/x11-plugins/docker/metadata.xml
+++ b/x11-plugins/docker/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <longdescription>
+<herd>desktop-dock</herd>
+<longdescription>
   Openbox app which acts as a system tray for KDE and GNOME2.
-  </longdescription>
+</longdescription>
 </pkgmetadata>