voyageur    15/01/19 19:31:07

  Modified:             metadata.xml ChangeLog docker-1.5.ebuild
  Added:                docker-1.5-r1.ebuild
  Log:
  Move under desktop-dock, block app-emulation/docker in current stable, clean 
ebuild and rename binary
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
C74525F2)

Revision  Changes    Path
1.4                  x11-plugins/docker/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/metadata.xml?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/metadata.xml?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/docker/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml        19 Oct 2013 15:15:47 -0000      1.3
+++ metadata.xml        19 Jan 2015 19:31:07 -0000      1.4
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<maintainer><email>[email protected]</email></maintainer>
-  <longdescription>
+<herd>desktop-dock</herd>
+<longdescription>
   Openbox app which acts as a system tray for KDE and GNOME2.
-  </longdescription>
+</longdescription>
 </pkgmetadata>



1.24                 x11-plugins/docker/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/ChangeLog?rev=1.24&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/ChangeLog?rev=1.24&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/docker/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog   19 Oct 2013 15:15:47 -0000      1.23
+++ ChangeLog   19 Jan 2015 19:31:07 -0000      1.24
@@ -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 <[email protected]> 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 <[email protected]> metadata.xml:
   Cleanup due desktop-wm removal



1.19                 x11-plugins/docker/docker-1.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild?rev=1.19&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild?rev=1.19&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild?r1=1.18&r2=1.19

Index: docker-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/docker/docker-1.5.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- docker-1.5.ebuild   5 May 2012 05:12:02 -0000       1.18
+++ docker-1.5.ebuild   19 Jan 2015 19:31:07 -0000      1.19
@@ -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 @@
 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"
 



1.1                  x11-plugins/docker/docker-1.5-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/docker-1.5-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/docker/docker-1.5-r1.ebuild?rev=1.1&content-type=text/plain

Index: docker-1.5-r1.ebuild
===================================================================
# 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"
}




Reply via email to