Add snapshots of master and develop git HEADs, .desktop file, support gtk+:3 support via USE=-deprecated

(Portage version: 2.2.0_alpha183/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

7 files changed, 288 insertions, 25 deletions

diff --git a/www-client/jumanji/ChangeLog b/www-client/jumanji/ChangeLog
index a9d5b6f9daa0..75aeab815954 100644
--- a/www-client/jumanji/ChangeLog
+++ b/www-client/jumanji/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/jumanji
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/ChangeLog,v 1.8 2012/12/18 11:23:26 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/ChangeLog,v 1.9 2013/06/22 12:20:11 xmw Exp $
+
+*jumanji-0.0.0_p20111209 (22 Jun 2013)
+*jumanji-0.0.0_p20130103 (22 Jun 2013)
+
+  22 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/jumanji-0.0.0_p20111209-buildsystem.patch,
+  +files/jumanji-0.0.0_p20130103-gtk2.patch, +jumanji-0.0.0_p20111209.ebuild,
+  +jumanji-0.0.0_p20130103.ebuild, jumanji-9999.ebuild, metadata.xml:
+  Add snapshots of master and develop git HEADs, .desktop file, support gtk+:3
+  support via USE=-deprecated
 
   18 Dec 2012; Michael Weber <xmw@gentoo.org> jumanji-9999.ebuild:
   Remove keywords from live ebuild
@@ -26,4 +36,3 @@
   24 Aug 2010; Michael Weber <xmw@gentoo.org> +jumanji-9999.ebuild,
   +metadata.xml:
   Initial commit for jumanji. Fixes bug #328107.
-
diff --git a/www-client/jumanji/files/jumanji-0.0.0_p20111209-buildsystem.patch b/www-client/jumanji/files/jumanji-0.0.0_p20111209-buildsystem.patch
new file mode 100644
index 000000000000..f2a8aa43d42b
--- /dev/null
+++ b/www-client/jumanji/files/jumanji-0.0.0_p20111209-buildsystem.patch
@@ -0,0 +1,94 @@
+--- jumanji-0_p20111209/config.mk
++++ jumanji-0_p20111209/config.mk
+@@ -3,6 +3,12 @@
+ 
+ VERSION = 0.0.0
+ 
++ifeq ($(V),)
++	Q := @
++else
++	Q :=
++endif
++
+ # paths
+ PREFIX ?= /usr
+ MANPREFIX ?= ${PREFIX}/share/man
+--- jumanji-0_p20111209/Makefile
++++ jumanji-0_p20111209/Makefile
+@@ -19,11 +19,11 @@
+ 
+ %.o: %.c
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} -o $@ $<
++	$(Q)${CC} -c ${CFLAGS} -o $@ $<
+ 
+ %.do: %.c
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} ${DFLAGS} -o $@ $<
++	$(Q)${CC} -c ${CFLAGS} ${DFLAGS} -o $@ $<
+ 
+ ${OBJECTS}:  config.h config.mk
+ ${DOBJECTS}: config.h config.mk
+@@ -38,18 +38,18 @@
+ 
+ ${PROJECT}: ${OBJECTS}
+ 	@echo CC -o $@
+-	@${CC} ${SFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
++	$(Q)${CC} ${SFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${LIBS}
+ 
+ clean:
+-	@rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
++	$(Q)rm -rf ${PROJECT} ${OBJECTS} ${PROJECT}-${VERSION}.tar.gz \
+ 		${DOBJECTS} ${PROJECT}-debug
+ 
+ distclean: clean
+-	@rm -rf config.h
++	$(Q)rm -rf config.h
+ 
+ ${PROJECT}-debug: ${DOBJECTS}
+ 	@echo CC -o ${PROJECT}-debug
+-	@${CC} ${LDFLAGS} -o ${PROJECT}-debug ${DOBJECTS} ${LIBS}
++	$(Q)${CC} ${LDFLAGS} -o ${PROJECT}-debug ${DOBJECTS} ${LIBS}
+ 
+ debug: ${PROJECT}-debug
+ 
+@@ -61,25 +61,25 @@
+ 	cgdb ${PROJECT}-debug
+ 
+ dist: clean
+-	@mkdir -p ${PROJECT}-${VERSION}
+-	@cp -R LICENSE Makefile config.mk config.def.h README \
++	$(Q)mkdir -p ${PROJECT}-${VERSION}
++	$(Q)cp -R LICENSE Makefile config.mk config.def.h README \
+ 			${PROJECT}.1 ${SOURCE} ${PROJECT}-${VERSION}
+-	@tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
+-	@gzip ${PROJECT}-${VERSION}.tar
+-	@rm -rf ${PROJECT}-${VERSION}
++	$(Q)tar -cf ${PROJECT}-${VERSION}.tar ${PROJECT}-${VERSION}
++	$(Q)gzip ${PROJECT}-${VERSION}.tar
++	$(Q)rm -rf ${PROJECT}-${VERSION}
+ 
+ install: all
+ 	@echo installing executable file
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f ${PROJECT} ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin/${PROJECT}
+-	@echo installing manual page
+-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+-	@sed "s/VERSION/${VERSION}/g" < ${PROJECT}.1 > ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
+-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
++	$(Q)mkdir -p ${DESTDIR}${PREFIX}/bin
++	$(Q)cp -f ${PROJECT} ${DESTDIR}${PREFIX}/bin
++	$(Q)chmod 755 ${PROJECT} ${DESTDIR}${PREFIX}/bin/${PROJECT}
++	$(Q)echo installing manual page
++	$(Q)mkdir -p ${DESTDIR}${MANPREFIX}/man1
++	$(Q)sed "s/VERSION/${VERSION}/g" < ${PROJECT}.1 > ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
++	$(Q)chmod 644 ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
+ 
+ uninstall:
+ 	@echo removing executable file
+-	@rm -f ${DESTDIR}${PREFIX}/bin/${PROJECT}
++	$(Q)rm -f ${DESTDIR}${PREFIX}/bin/${PROJECT}
+ 	@echo removing manual page
+-	@rm -f ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
++	$(Q)rm -f ${DESTDIR}${MANPREFIX}/man1/${PROJECT}.1
diff --git a/www-client/jumanji/files/jumanji-0.0.0_p20130103-gtk2.patch b/www-client/jumanji/files/jumanji-0.0.0_p20130103-gtk2.patch
new file mode 100644
index 000000000000..3c3154065358
--- /dev/null
+++ b/www-client/jumanji/files/jumanji-0.0.0_p20130103-gtk2.patch
@@ -0,0 +1,49 @@
+--- jumanji-0.0.0_p20130103/config.mk
++++ jumanji-0.0.0_p20130103/config.mk
+@@ -8,30 +8,30 @@
+ MANPREFIX ?= ${PREFIX}/share/man
+ 
+ # libs
+-GTK_INC ?= $(shell pkg-config --cflags gtk+-3.0)
+-GTK_LIB ?= $(shell pkg-config --libs   gtk+-3.0)
++#GTK_INC ?= $(shell pkg-config --cflags gtk+-3.0)
++#GTK_LIB ?= $(shell pkg-config --libs   gtk+-3.0)
+ 
+-WEBKIT_INC ?= $(shell pkg-config --cflags webkitgtk-3.0)
+-WEBKIT_LIB ?= $(shell pkg-config --libs   webkitgtk-3.0 javascriptcoregtk-3.0)
++#WEBKIT_INC ?= $(shell pkg-config --cflags webkitgtk-3.0)
++#WEBKIT_LIB ?= $(shell pkg-config --libs   webkitgtk-3.0 javascriptcoregtk-3.0)
+ 
+-GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk3)
+-GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk3)
++#GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk3)
++#GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk3)
+ 
+-SQLITE_INC ?= $(shell pkg-config --cflags sqlite3)
+-SQLITE_LIB ?= $(shell pkg-config --libs sqlite3)
++#SQLITE_INC ?= $(shell pkg-config --cflags sqlite3)
++#SQLITE_LIB ?= $(shell pkg-config --libs sqlite3)
+ 
+-GTHREAD_INC ?= $(shell pkg-config --cflags gthread-2.0)
+-GTHREAD_LIB ?= $(shell pkg-config --libs gthread-2.0)
++#GTHREAD_INC ?= $(shell pkg-config --cflags gthread-2.0)
++#GTHREAD_LIB ?= $(shell pkg-config --libs gthread-2.0)
+ 
+ # if you want to use gtk2 uncomment the following lines
+-#GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
+-#GTK_LIB ?= $(shell pkg-config --libs   gtk+-2.0)
++GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
++GTK_LIB ?= $(shell pkg-config --libs   gtk+-2.0)
+ 
+-#WEBKIT_INC ?= $(shell pkg-config --cflags webkit-1.0)
+-#WEBKIT_LIB ?= $(shell pkg-config --libs   webkit-1.0)
++WEBKIT_INC ?= $(shell pkg-config --cflags webkit-1.0)
++WEBKIT_LIB ?= $(shell pkg-config --libs   webkit-1.0)
+ 
+-#GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk2)
+-#GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
++GIRARA_INC ?= $(shell pkg-config --cflags girara-gtk2)
++GIRARA_LIB ?= $(shell pkg-config --libs girara-gtk2)
+ 
+ # libs
+ INCS = ${GTK_INC} ${WEBKIT_INC} ${GIRARA_INC} ${GTHREAD_INC}
diff --git a/www-client/jumanji/jumanji-0.0.0_p20111209.ebuild b/www-client/jumanji/jumanji-0.0.0_p20111209.ebuild
new file mode 100644
index 000000000000..b1102926d116
--- /dev/null
+++ b/www-client/jumanji/jumanji-0.0.0_p20111209.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/www-client/jumanji/jumanji-0.0.0_p20111209.ebuild,v 1.1 2013/06/22 12:20:11 xmw Exp $
+
+EAPI=5
+
+inherit eutils savedconfig toolchain-funcs vcs-snapshot
+
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
+HOMEPAGE="http://pwmt.org/projects/jumanji"
+SRC_URI="https://git.pwmt.org/?p=jumanji.git;a=snapshot;h=614511550b5e4633397f3c26297d5995a5236766;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libunique:1
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:2
+	x11-libs/gtk+:2
+	!${CATEGORY}/${PN}:develop"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SFLAGS="" V=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
+}
diff --git a/www-client/jumanji/jumanji-0.0.0_p20130103.ebuild b/www-client/jumanji/jumanji-0.0.0_p20130103.ebuild
new file mode 100644
index 000000000000..f25c37ab5b8c
--- /dev/null
+++ b/www-client/jumanji/jumanji-0.0.0_p20130103.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/jumanji-0.0.0_p20130103.ebuild,v 1.1 2013/06/22 12:20:11 xmw Exp $
+
+EAPI=5
+
+inherit eutils savedconfig toolchain-funcs vcs-snapshot
+
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
+HOMEPAGE="http://pwmt.org/projects/jumanji"
+SRC_URI="https://git.pwmt.org/?p=jumanji.git;a=snapshot;h=963b309e9f91c6214f36c729514d5a08e7293310;sf=tgz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="develop"
+KEYWORDS="~amd64 ~x86"
+IUSE="+deprecated"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	!deprecated? (
+		dev-libs/girara:3
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3 )
+	deprecated? (
+		dev-libs/girara:2
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2 )
+	!${CATEGORY}/${PN}:0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	use deprecated && \
+		epatch "${FILESDIR}"/${PN}-0.0.0_p20130103-gtk2.patch
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" SFLAGS="" VERBOSE=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
+}
+
+src_install() {
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
+}
diff --git a/www-client/jumanji/jumanji-9999.ebuild b/www-client/jumanji/jumanji-9999.ebuild
index 6893f4002d49..b934e9d8a91a 100644
--- a/www-client/jumanji/jumanji-9999.ebuild
+++ b/www-client/jumanji/jumanji-9999.ebuild
@@ -1,40 +1,50 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/jumanji-9999.ebuild,v 1.7 2012/12/18 11:23:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/jumanji-9999.ebuild,v 1.8 2013/06/22 12:20:11 xmw Exp $
 
-EAPI=2
+EAPI=5
 
-inherit flag-o-matic git-2 toolchain-funcs
+inherit eutils savedconfig git-2 toolchain-funcs
 
-DESCRIPTION="webkit based browser"
+DESCRIPTION="highly customizable and functional web browser with minimalistic and space saving interface"
 HOMEPAGE="http://pwmt.org/projects/jumanji"
-SRC_URI=""
 EGIT_REPO_URI="git://pwmt.org/jumanji.git"
+EGIT_BRANCH=develop
 
 LICENSE="ZLIB"
-SLOT="0"
+SLOT="develop"
 KEYWORDS=""
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.22.4:2
-	>=dev-libs/libunique-1.1.6:1
-	>=net-libs/libsoup-2.30.2:2.4
-	>=net-libs/webkit-gtk-1.2.1:2
-	>=x11-libs/gtk+-2.18.6:2"
+IUSE="+deprecated"
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/glib:2
+	!deprecated? (
+		dev-libs/girara:3
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3 )
+	deprecated? (
+		dev-libs/girara:2
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2 )
+	!${CATEGORY}/${PN}:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	# respect CFLAGS
-	sed -i -e '/${CC}/s:${CFLAGS}:\0 ${INCS}:' Makefile || die
+	use deprecated && \
+		epatch "${FILESDIR}"/${PN}-0.0.0_p20130103-gtk2.patch
+
+	restore_config config.h
 }
 
 src_compile() {
-	tc-export CC
-	append-cflags -std=c99
-	emake CFLAGS="${CFLAGS}" DFLAGS="" SFLAGS="" all || die
+	emake CC="$(tc-getCC)" SFLAGS="" VERBOSE=1 || \
+		die "emake failed$(usex savedconfig ",please check the configfile" "")"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+	make_desktop_entry ${PN}
+
+	save_config config.h
 }
diff --git a/www-client/jumanji/metadata.xml b/www-client/jumanji/metadata.xml
index 5b80fb94c393..f1a793421fde 100644
--- a/www-client/jumanji/metadata.xml
+++ b/www-client/jumanji/metadata.xml
@@ -2,7 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="deprecated">Use x11-libs/gtk+:2 instead of x11-libs/gtk+:3</flag>
+</use>
+<upstream>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+</upstream>
+<longdescription>
+jumanji is a highly customizable and functional web browser based on the libwebkit web content engine and the gtk+ toolkit. The idea behind jumanji is a web browser that provides a minimalistic and space saving interface as well as an easy usage that mainly focuses on keyboard interaction like vimperator does.
+</longdescription>
 </pkgmetadata>