Version bump (bug #522596 by José Romildo Malaquias).

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613)

5 files changed, 63 insertions, 67 deletions

diff --git a/x11-misc/openbox-menu/ChangeLog b/x11-misc/openbox-menu/ChangeLog
index a49393a6ae2c..80a4371cd108 100644
--- a/x11-misc/openbox-menu/ChangeLog
+++ b/x11-misc/openbox-menu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/openbox-menu
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/openbox-menu/ChangeLog,v 1.7 2013/08/24 23:47:56 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/openbox-menu/ChangeLog,v 1.8 2014/09/17 08:15:41 jer Exp $
+
+*openbox-menu-0.5.1 (17 Sep 2014)
+
+  17 Sep 2014; Jeroen Roovers <jer@gentoo.org> -openbox-menu-0.3.6.7.ebuild,
+  +openbox-menu-0.5.1.ebuild, -files/openbox-menu-0.3.6.7-build.patch,
+  metadata.xml:
+  Version bump (bug #522596 by José Romildo Malaquias).
 
 *openbox-menu-0.5.0 (24 Aug 2013)
 
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.3.6.7-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.3.6.7-build.patch
deleted file mode 100644
index 2f1fb4aa411e..000000000000
--- a/x11-misc/openbox-menu/files/openbox-menu-0.3.6.7-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Jul 24 15:08:47 UTC 2012
-Subject: build system
-
---- openbox-menu-0.3.6.7/Makefile
-+++ openbox-menu-0.3.6.7/Makefile
-@@ -1,9 +1,8 @@
--LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
--CFLAGS+= -Wall -g `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
-+LIBS= $(shell pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache)
-+CFLAGS+= $(shell pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache)
- 
--prefix= /usr
--DESTDIR ?= $(prefix)
--BINDIR= /bin/
-+prefix ?= /usr
-+BINDIR = $(prefix)/bin/
- 
- SRC= $(shell ls *.c 2> /dev/null)
- OBJ= $(SRC:.c=.o)
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index d9505161f5ba..3ec7e75078cb 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<maintainer>
-		<email>hasufell@gentoo.org</email>
-		<name>Julian Ospald</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mimasgpc@free.fr</email>
-		</maintainer>
-		<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
-	</upstream>
-	<use>
-		<flag name='icons'>Turn on to let icons appear in menus</flag>
-		<flag name='svg'>Support svg icons (needs icons enabled)</flag>
-	</use>
+<herd>desktop-misc</herd>
+<upstream>
+<maintainer status="active">
+<email>mimasgpc@free.fr</email>
+</maintainer>
+<doc lang="en">http://mimasgpc.free.fr/openbox-menu_en.html</doc>
+</upstream>
+<use>
+<flag name='icons'>Enable support for icons in menus</flag>
+<flag name='svg'>Support SVG icons</flag>
+</use>
 </pkgmetadata>
 
diff --git a/x11-misc/openbox-menu/openbox-menu-0.3.6.7.ebuild b/x11-misc/openbox-menu/openbox-menu-0.3.6.7.ebuild
deleted file mode 100644
index 54968763d24e..000000000000
--- a/x11-misc/openbox-menu/openbox-menu-0.3.6.7.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/openbox-menu/openbox-menu-0.3.6.7.ebuild,v 1.3 2012/08/27 13:30:37 johu Exp $
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Another dynamic menu generator for Openbox"
-HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html"
-SRC_URI="http://mimarchlinux.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	lxde-base/menu-cache
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
diff --git a/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
new file mode 100644
index 000000000000..128319fe121d
--- /dev/null
+++ b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild,v 1.1 2014/09/17 08:15:41 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Another dynamic menu generator for Openbox"
+HOMEPAGE="http://mimasgpc.free.fr/openbox-menu_en.html"
+SRC_URI="https://bitbucket.org/fabriceT/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+icons svg"
+REQUIRED_USE="svg? ( icons )"
+
+CDEPEND="
+	dev-libs/glib:2
+	lxde-base/menu-cache
+	x11-libs/gtk+:2
+"
+RDEPEND="
+	${CDEPEND}
+	icons? ( x11-wm/openbox[imlib,svg?] )
+	!icons? ( x11-wm/openbox )
+"
+DEPEND="
+	${CDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.5.0-build.patch
+	epatch_user
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		$(usex icons 'ICONS=1' 'ICONS=0') \
+		$(usex svg 'SVG_ICONS=1' 'SVG_ICONS=0')
+}