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

Package-Manager: portage-2.2.0_alpha183/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

8 files changed, 301 insertions, 32 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/Manifest b/www-client/jumanji/Manifest
index 6d5859994b8a..b31d0ecc6b42 100644
--- a/www-client/jumanji/Manifest
+++ b/www-client/jumanji/Manifest
@@ -1,13 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD jumanji-9999.ebuild 908 SHA256 3019cb3ce0ec092c9acf4448c2dab8ca7968302afecea9ac24694f404e696d87 SHA512 5178be3c754aaa93b255f843d110e2aa4249945f2684d0a921fc54e90df1a78fcb4022593d3f2d6aa897fd66e32cd7492c9b68999723a7155378f982dbac4fcd WHIRLPOOL cc4fd2ba40840e2c51d9f41505b66352ce1c44c1432d0edcbd5f55403e2a9fd86be0ff978dadfc39b1dfea1c2d1a47aebd4434827f34224e70ded92f1635712a
-MISC ChangeLog 1116 SHA256 9797d19488725bae31a18d5b1810d7cdbfadc1e8aa2e1c1ab8d754429e241310 SHA512 a285bb98ef070eb60cc3266ab2e019afa836b69013acf3e206c279adca45b60e8581c84c6b98b20f8e1e586b1bb2c1fac615d3e6c5104a457ee487cd1f404e10 WHIRLPOOL 0af53c2073d5587f2aa8c8fbda1c00aa172118505f43859ba3f8dd954e60dea58b8198ee5f52087e14c519f536a4c48881f617e64182a7d6595468bbd0e13159
-MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
+AUX jumanji-0.0.0_p20111209-buildsystem.patch 2798 SHA256 eb8e8ce3841096af5832edb0016ea5d02742e7a972ad1ec6df1d537c5be2c2b7 SHA512 205fbe792b9951341e466c5ceaa9b96525e766040bd03dc524c6c6f90facb09b689ca96514e53751ffc61459515a3b7c4f3ce7031dcb9120e550f21a5106dedf WHIRLPOOL 72927912d4fd520c08cfb028f32c230173665b98f21dd540016eaf74ecd8be5d8c9ae75197a1f3207f16c087c48f70d363015a2cf07c0bc34a815def505f61ad
+AUX jumanji-0.0.0_p20130103-gtk2.patch 2061 SHA256 4ce174632c7ef7327604a567df86114020c2cc5a24d152f97d055eceefd48891 SHA512 f7a5550e610ae97727c4ba07c4546d5e2c6559ef0ffabb4b037067c053a5f8fc2f0bf5e41d3025b36c8eca6c98ef37651aa45e665224df0af579186362973c0d WHIRLPOOL 16bd8fcba8e106cb5029b2793f77c92969042ea8ab5e3f11ff027e2b1e2644d94d1696e7f5c263084b32e5ced71ccbbe043b2cea14b80a049ac958d5387a8867
+DIST jumanji-0.0.0_p20111209.tar.gz 33002 SHA256 0c3631bc213c8c7c8c208a557b12b6a1f99b2d3c2558b7d9ac433f802aa36781 SHA512 92f84a4d30261f5a1aaeb583be5b2bb28c9f3dd9c1c31176711e809a40cb406160fd563afc7e25cbf6e2e3b3822c2932915cec234e389bd6e85308bbe772ef0e WHIRLPOOL b291e1a4db44c43139695dc07da548f1633ce38e1e62a4299fbdb72a7266ef160e939ce1ebed28f0cd89a8d5af9522f64bb8fa421b6afd568b45a8d9f7726fe2
+DIST jumanji-0.0.0_p20130103.tar.gz 41811 SHA256 40622e73f2725f731a673aa8a1f010ba31e1b9044da26bd7738709884a9eacca SHA512 18de040acbacd8a285c6b959ad3a8857ba6265e6c1541ed05e4f35ce33b9ebd0c85e0d37ec1a71f725ca5621a0f913f207ea77e56e94d8689137963f42ce776f WHIRLPOOL 529ecc4a2762fd6f561480da7113ec689e79cc0b75a74a7ab1da8a69f4e5ffad0a7f5d946c90eb34b16105e47a5aada4044d09010bab5218454acec9832efebc
+EBUILD jumanji-0.0.0_p20111209.ebuild 1103 SHA256 ff27030cfae809d8516de9b09772fbf88c3d51bacb97fe0bdeeacd87805072f8 SHA512 7e12c7a5c1b3380cc960fbcbcc0e138d293ad120520b9733476aaac8b9449929df164fdf6ea889cd4d36fbbb9faff345efa27ab283590f5b52cd8a3fa0cac732 WHIRLPOOL c10a37e4254ce9d3d5ccc602ea315e5fc0be5586ef91b6796a71f6d7dbf686721374211cb792eb6538272019f4f9cf8ff7fb3fe994727eb31e36a35b4dff8b26
+EBUILD jumanji-0.0.0_p20130103.ebuild 1244 SHA256 baf8e604ff51abaf07318e520d4e9fb2c2d900062caab247e161013c10ab07ee SHA512 8bcda3592070c124983127dfc48d3a6a074655fb23f418f0106dc6a35e423f74bda5d32948806f19335d30c1df68ee96e554270959847213c532e910d0019499 WHIRLPOOL 326899baf117dc5556c1c5190eed4b729f7d9a9b65a4582646a837684a4e528f3fbd5cd4ea6bfadabddc19f3ee37651c804d07d0b12af8566663072652ca32b8
+EBUILD jumanji-9999.ebuild 1156 SHA256 b25e53bc676dafc3c59e74bd008315f56963b4454a49b1a2c168d1be179a5c57 SHA512 f9aefa7c5afaf9b8a7db677aaa81046bbec8f6a5118c62e5a6cdcdc20c37ad54e29c7442eadef0d52a8c03a52cae0f5c746afcfc0f30ad68254b6986a76e1bc1 WHIRLPOOL e89459ee1adc39f634a2da87354c81e6d9186699dd46dcde514781916203824130152d63d4fa0037863aff3593d8c8a46ee3a3d4cbd85d9a970c70965efb8837
+MISC ChangeLog 1550 SHA256 0be441a55533935039740e40eb7619c5cdbbd9562c64c6fb607c19b5b3c30fae SHA512 d9b13519577bb695ec8db4f8ee2b8a71d81dee83dbc17f548df49a5b9329aa98475c218bf00ced7ffdd798eb2f2af0bad8467bea56cc94015c700c359647c810 WHIRLPOOL 1940b361b194dbf430d89e3a9efef919dd7ecd8c2bff644cb10628599a4cabfb9e67d85473168ae00a201ada55cb18de5be8b662b4a6c5b1e4a49e156d6ac5f5
+MISC metadata.xml 731 SHA256 00a118e0df13223812f006be5d7cdadf3f8468de8158f430a23de27484d6e17c SHA512 7a9b38efd7a545602d4c7368c782395125504b1130612d4c810c84b5dfe49941763632f6df186b74a8c63d793ae2fc1716a396df2e01b64ad20d4fe082794118 WHIRLPOOL 82f8f2c50c37117da657ffe8a0974df9d42199641facb43ad398b7355fa2545feb1113e8353595d0c4115192b8d370c54cf27280cd827e6c5c9516951b5fda24
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlDQUhsACgkQknrdDGLu8JCAhAD8DkTMdrQ6QozKLdCcUUsxDFdc
-tdd9pyrSQ/f1XjGJwWwBAIvKkbqf8gWVps1q969TOcmTo7LTPenGVE9VWNHsv+bV
-=1BJg
+iF4EAREIAAYFAlHFlnYACgkQknrdDGLu8JCT8AD/bswn+PqJvJBFY00ls+kds4aR
+j6o2ILcAWr2fKlCi/CsA/iMxStSSJ/pUM6dv5cmXbvtGvag3tV4Kt+OUpdjt9wkC
+=ecig
 -----END PGP SIGNATURE-----
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>