Remove USE="deprecated" because SLOT="2" of dev-libs/girara is going away by upstream decision since version 0.2.0

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

5 files changed, 17 insertions, 74 deletions

diff --git a/www-client/jumanji/ChangeLog b/www-client/jumanji/ChangeLog
index e330eb2ff9c6..6b099258b8ba 100644
--- a/www-client/jumanji/ChangeLog
+++ b/www-client/jumanji/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/jumanji
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/ChangeLog,v 1.10 2014/04/03 15:26:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/ChangeLog,v 1.11 2014/04/04 20:49:27 ssuominen Exp $
+
+  04 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/jumanji-0.0.0_p20130103-r1-gtk2.patch,
+  jumanji-0.0.0_p20130103-r1.ebuild, jumanji-9999.ebuild, metadata.xml:
+  Remove USE="deprecated" because SLOT="2" of dev-libs/girara is going away by
+  upstream decision since version 0.2.0
 
 *jumanji-0.0.0_p20130103-r1 (03 Apr 2014)
 
diff --git a/www-client/jumanji/files/jumanji-0.0.0_p20130103-r1-gtk2.patch b/www-client/jumanji/files/jumanji-0.0.0_p20130103-r1-gtk2.patch
deleted file mode 100644
index 5e7504ec0f7a..000000000000
--- a/www-client/jumanji/files/jumanji-0.0.0_p20130103-r1-gtk2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- jumanji-0.0.0_p20130103/config.mk
-+++ jumanji-0.0.0_p20130103/config.mk
-@@ -8,14 +8,14 @@
- 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)
-@@ -24,14 +24,14 @@
- 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_p20130103-r1.ebuild b/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild
index 58e41283b8fe..7da56b10bf47 100644
--- a/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild
+++ b/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/04/03 15:26:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/jumanji-0.0.0_p20130103-r1.ebuild,v 1.2 2014/04/04 20:49:27 ssuominen Exp $
 
 EAPI=5
 
@@ -13,26 +13,18 @@ SRC_URI="https://git.pwmt.org/?p=jumanji.git;a=snapshot;h=963b309e9f91c6214f36c7
 LICENSE="ZLIB"
 SLOT="develop"
 KEYWORDS="~amd64 ~x86"
-IUSE="+deprecated"
+IUSE=""
 
 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 )
+	dev-libs/girara:3
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
 	!${CATEGORY}/${PN}:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	use deprecated && \
-		epatch "${FILESDIR}"/${PF}-gtk2.patch
-
 	restore_config config.h
 }
 
diff --git a/www-client/jumanji/jumanji-9999.ebuild b/www-client/jumanji/jumanji-9999.ebuild
index 79ee651d2f90..af994b0f69e3 100644
--- a/www-client/jumanji/jumanji-9999.ebuild
+++ b/www-client/jumanji/jumanji-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.9 2014/04/03 15:26:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/jumanji/jumanji-9999.ebuild,v 1.10 2014/04/04 20:49:27 ssuominen Exp $
 
 EAPI=5
 
@@ -14,26 +14,18 @@ EGIT_BRANCH=develop
 LICENSE="ZLIB"
 SLOT="develop"
 KEYWORDS=""
-IUSE="+deprecated"
+IUSE=""
 
 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 )
+	dev-libs/girara:3
+	net-libs/webkit-gtk:3
+	x11-libs/gtk+:3
 	!${CATEGORY}/${PN}:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	use deprecated && \
-		epatch "${FILESDIR}"/${PN}-0.0.0_p20130103-r1-gtk2.patch
-
 	restore_config config.h
 }
 
diff --git a/www-client/jumanji/metadata.xml b/www-client/jumanji/metadata.xml
index f1a793421fde..ea66a4b19921 100644
--- a/www-client/jumanji/metadata.xml
+++ b/www-client/jumanji/metadata.xml
@@ -5,9 +5,6 @@
 	<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>