Version bump, remove old.

(Portage version: 2.1.10.29/cvs/Linux x86_64)

4 files changed, 82 insertions, 90 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index ae0b5af340d9..2af0438e1af6 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.68 2011/08/06 09:05:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.69 2011/10/18 19:05:58 pacho Exp $
+
+*libproxy-0.4.7 (18 Oct 2011)
+
+  18 Oct 2011; Pacho Ramos <pacho@gentoo.org> +libproxy-0.4.7.ebuild,
+  -libproxy-0.4.6.ebuild, metadata.xml:
+  Version bump, remove old.
 
   06 Aug 2011; Zac Medico <zmedico@gentoo.org> libproxy-0.4.6-r3.ebuild:
   Add ~x86-linux keyword.
diff --git a/net-libs/libproxy/libproxy-0.4.6.ebuild b/net-libs/libproxy/libproxy-0.4.6.ebuild
deleted file mode 100644
index 5ffecf7990ed..000000000000
--- a/net-libs/libproxy/libproxy-0.4.6.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.6.ebuild,v 1.16 2011/03/26 14:26:11 ssuominen Exp $
-
-EAPI="2"
-PYTHON_DEPEND="python? 2:2.5"
-
-inherit cmake-utils eutils multilib python portability
-
-DESCRIPTION="Library for automatic proxy configuration management"
-HOMEPAGE="http://code.google.com/p/libproxy/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="gnome kde mono networkmanager perl python test webkit xulrunner"
-
-RDEPEND="
-	gnome? ( gnome-base/gconf:2 )
-	kde? ( >=kde-base/kdelibs-4.3 )
-	mono? ( dev-lang/mono )
-	networkmanager? ( net-misc/networkmanager )
-	perl? (	dev-lang/perl )
-	webkit? ( net-libs/webkit-gtk:2 )
-	xulrunner? ( =net-libs/xulrunner-1.9*:1.9 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS NEWS README ChangeLog"
-
-PATCHES=( "${FILESDIR}"/${P}-mozjs-link_directory.patch )
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-	fi
-}
-
-src_configure() {
-	mycmakeargs=(
-			-DPERL_VENDORINSTALL=ON
-			-DCMAKE_C_FLAGS="${CFLAGS}"
-			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-			$(cmake-utils_use_with gnome GNOME)
-			$(cmake-utils_use_with kde KDE4)
-			$(cmake-utils_use_with mono DOTNET)
-			$(cmake-utils_use_with networkmanager NM)
-			$(cmake-utils_use_with perl PERL)
-			$(cmake-utils_use_with python PYTHON)
-			-DWITH_VALA=OFF
-			$(cmake-utils_use_with webkit WEBKIT)
-			$(cmake-utils_use_with xulrunner MOZJS)
-			$(cmake-utils_use test BUILD_TESTING)
-			)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# Prevent access violation when building with mono support
-	export MONO_SHARED_DIR="${T}/shared"
-	cmake-utils_src_compile
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libproxy.so.0
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libproxy.so.0
-
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/${PN}.py
-	fi
-}
-
-pkg_postrm() {
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/${PN}.py
-	fi
-}
diff --git a/net-libs/libproxy/libproxy-0.4.7.ebuild b/net-libs/libproxy/libproxy-0.4.7.ebuild
new file mode 100644
index 000000000000..e2cc2c6b0593
--- /dev/null
+++ b/net-libs/libproxy/libproxy-0.4.7.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.7.ebuild,v 1.1 2011/10/18 19:05:58 pacho Exp $
+
+EAPI="4"
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit cmake-utils mono python
+
+DESCRIPTION="Library for automatic proxy configuration management"
+HOMEPAGE="http://code.google.com/p/libproxy/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-linux"
+IUSE="gnome kde mono networkmanager perl python test"
+
+# FIXME: Disable webkit support due problems like bug #366791
+# FIXME: Also disable xulrunner support due bug #360893, will be readded
+# in the future when only spidermonkey mozjs is provided.
+
+RDEPEND="gnome? ( >=dev-libs/glib-2.26:2 )
+	kde? ( >=kde-base/kdelibs-4.4.5 )
+	mono? ( dev-lang/mono )
+	networkmanager? ( net-misc/networkmanager )
+	perl? (	dev-lang/perl )"
+#	xulrunner? ( >=net-libs/xulrunner-1.9.1:1.9 )
+#	webkit? ( net-libs/webkit-gtk:2 )
+# Since 0.4.7, webkit gtk3 support is also available
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_configure() {
+	# WITH_VALA just copies the .vapi file over and needs no deps,
+	# hence always enable it unconditionally
+	local mycmakeargs=(
+			-DPERL_VENDORINSTALL=ON
+			-DCMAKE_C_FLAGS="${CFLAGS}"
+			-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
+			$(cmake-utils_use_with gnome GNOME)
+			$(cmake-utils_use_with gnome GNOME3)
+			$(cmake-utils_use_with kde KDE4)
+			$(cmake-utils_use_with mono DOTNET)
+			$(cmake-utils_use_with networkmanager NM)
+			$(cmake-utils_use_with perl PERL)
+			$(cmake-utils_use_with python PYTHON)
+			-DWITH_VALA=ON
+			-DWITH_WEBKIT=OFF
+			-DWITH_WEBKIT3=OFF
+			-DWITH_MOZJS=OFF
+			$(cmake-utils_use test BUILD_TESTING)
+	)
+			#$(cmake-utils_use_with webkit WEBKIT)
+			#$(cmake-utils_use_with xulrunner MOZJS)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize ${PN}.py
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
+}
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index eb8c45914f70..17487fac55ae 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -7,11 +7,7 @@
 </maintainer>
 <use>
 	<flag name='gnome'>Enable support for reading proxy settings from
-		GNOME using <pkg>gnome-base/gconf</pkg></flag>
+		GNOME</flag>
 	<flag name='kde'>Enable support for reading proxy settings from KDE</flag>
-	<flag name='webkit'>Enable support for reading proxy settings from
-		<pkg>net-libs/webkit-gtk</pkg></flag>
-	<flag name='xulrunner'>Enable support for reading proxy settings from
-		<pkg>net-libs/xulrunner</pkg></flag>
 </use>
 </pkgmetadata>