version bump wrt #481922

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 132 insertions, 1 deletions

diff --git a/x11-misc/openbox-menu/ChangeLog b/x11-misc/openbox-menu/ChangeLog
index 2550a8ffbb6a..a49393a6ae2c 100644
--- a/x11-misc/openbox-menu/ChangeLog
+++ b/x11-misc/openbox-menu/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2013/06/25 12:58:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/openbox-menu/ChangeLog,v 1.7 2013/08/24 23:47:56 hasufell Exp $
+
+*openbox-menu-0.5.0 (24 Aug 2013)
+
+  24 Aug 2013; Julian Ospald <hasufell@gentoo.org> +openbox-menu-0.5.0.ebuild,
+  +files/openbox-menu-0.5.0-build.patch, metadata.xml:
+  version bump wrt #481922
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> openbox-menu-0.3.6.8.ebuild:
   Stable for amd64, wrt bug #474442
diff --git a/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
new file mode 100644
index 000000000000..5750e982be10
--- /dev/null
+++ b/x11-misc/openbox-menu/files/openbox-menu-0.5.0-build.patch
@@ -0,0 +1,81 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Wed Aug 21 14:26:38 UTC 2013
+Subject: several QA fixes
+
+--- a/Makefile
++++ b/Makefile
+@@ -1,17 +1,27 @@
+-LIBS= `pkg-config --libs glib-2.0 gtk+-2.0 libmenu-cache`
+-CFLAGS+= -g -Wall `pkg-config --cflags glib-2.0 gtk+-2.0 libmenu-cache`
+-CC=gcc
++CC ?= gcc
++PKG_CONFIG ?= pkg-config
++
++CFLAGS ?= -O2 -g
++CFLAGS += -Wall $(shell $(PKG_CONFIG) --cflags glib-2.0 gtk+-2.0 libmenu-cache)
++LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 gtk+-2.0 libmenu-cache)
+ #-DG_DISABLE_DEPRECATED
+ 
+-# Comment this line if you don't want icons to appear in menu
+-CFLAGS+=-DWITH_ICONS
+-# Uncomment this line if Openbox can display SVG icons 
+-# Check SVG support with '$ ldd /usr/bin/openbox | grep svg', librsvg must appear..
+-# CFLAGS+=-DWITH_SVG
+-
+-prefix= /usr/local
+-DESTDIR ?= $(prefix)
+-BINDIR= ${DESTDIR}/bin
++# set to 0 to turn off icons in menus
++ICONS=1
++
++# set to 0 to turn off svg icons in menus
++SVG_ICONS=1
++
++ifeq ($(SVG_ICONS),1)
++CPPFLAGS += -DWITH_SVG
++endif
++
++ifeq ($(ICONS),1)
++CPPFLAGS += -DWITH_ICONS
++endif
++
++prefix = /usr
++BINDIR = ${prefix}/bin
+ 
+ SRC= $(shell ls *.c 2> /dev/null)
+ OBJ= $(SRC:.c=.o)
+@@ -19,26 +29,29 @@
+ all: $(OBJ) openbox-menu
+ 
+ %.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+ 
+ openbox-menu: $(OBJ)
+-	$(CC) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(OBJ) -o openbox-menu $(LDFLAGS) $(LIBS)
+ 
+-.PHONY: clean install doc changelog check
++.PHONY: clean install install-strip doc changelog check
+ 
+ clean:
+ 	@rm -f *.o openbox-menu
+ 	@rm -rf doc
+ 
+ install:
++	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
++
++install-strip:
+ 	@strip -s openbox-menu
+-	@install -Dm 755 openbox-menu $(BINDIR)/openbox-menu
++	@install -Dm 755 openbox-menu "$(DESTDIR)$(BINDIR)/openbox-menu"
+ 
+ doc:
+ 	robodoc --src . --doc doc/ --multidoc --index --html --cmode
+ 
+ check: openbox-menu
+-	./openbox-menu > test.xml 
++	./openbox-menu > test.xml
+ 	xmllint test.xml
+ 	rm test.xml
+ 
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index 094cdfe4cb26..d9505161f5ba 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -14,6 +14,7 @@
 	</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>
 </pkgmetadata>
 
diff --git a/x11-misc/openbox-menu/openbox-menu-0.5.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.5.0.ebuild
new file mode 100644
index 000000000000..fb309e060c81
--- /dev/null
+++ b/x11-misc/openbox-menu/openbox-menu-0.5.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 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.0.ebuild,v 1.1 2013/08/24 23:47:56 hasufell 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="http://mimarchlinux.googlecode.com/files/${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"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC PKG_CONFIG
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch_user
+}
+
+src_compile() {
+	emake \
+		$(usex icons "ICONS=1" "ICONS=0") \
+		$(usex svg "SVG_ICONS=1" "SVG_ICONS=0")
+}