Version bump for Gnome 3.14. Clean up old revisions.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 13 insertions, 111 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 32d0015bb8d7..7740d8c5effa 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.174 2014/12/19 13:44:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.175 2014/12/22 18:45:41 eva Exp $
+
+*devhelp-3.14.0 (22 Dec 2014)
+
+  22 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -devhelp-3.10.2.ebuild,
+  -devhelp-3.12.1.ebuild, +devhelp-3.14.0.ebuild,
+  -files/devhelp-3.6.1-libm.patch:
+  Version bump for Gnome 3.14. Clean up old revisions.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> devhelp-3.12.1-r1.ebuild:
   amd64 stable, bug 529964
diff --git a/dev-util/devhelp/devhelp-3.10.2.ebuild b/dev-util/devhelp/devhelp-3.10.2.ebuild
deleted file mode 100644
index 3365a573a73a..000000000000
--- a/dev-util/devhelp/devhelp-3.10.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.10.2.ebuild,v 1.5 2014/03/09 11:56:11 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-# gedit-3.8 is python3 only, this also per:
-# https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_2,3_3} )
-
-inherit gnome2 python-single-r1 toolchain-funcs
-
-DESCRIPTION="An API documentation browser for GNOME"
-HOMEPAGE="http://live.gnome.org/devhelp"
-
-LICENSE="GPL-2+"
-SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gedit"
-REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
-
-# FIXME: automagic python dependency
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gtk+-3.9.8:3
-	>=net-libs/webkit-gtk-2:3
-"
-RDEPEND="${COMMON_DEPEND}
-	gedit? (
-		${PYTHON_DEPS}
-		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+[introspection] )
-	gnome-base/gsettings-desktop-schemas
-"
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-pkg_setup() {
-	use gedit && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if ! use gedit ; then
-		sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=""
-	# ICC is crazy, silence warnings (bug #154010)
-	if [[ $(tc-getCC) == "icc" ]] ; then
-		myconf="--with-compile-warnings=no"
-	fi
-	gnome2_src_configure ${myconf}
-}
diff --git a/dev-util/devhelp/devhelp-3.12.1.ebuild b/dev-util/devhelp/devhelp-3.14.0.ebuild
index 8c363db1bfb0..64ce79cf380b 100644
--- a/dev-util/devhelp/devhelp-3.12.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.14.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.12.1.ebuild,v 1.3 2014/07/23 15:15:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.14.0.ebuild,v 1.1 2014/12/22 18:45:41 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 # gedit-3.8 is python3 only, this also per:
 # https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_2,3_3} )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
 inherit gnome2 python-single-r1 toolchain-funcs
 
@@ -15,15 +15,15 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-2+"
 SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="gedit"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
 # FIXME: automagic python dependency
 COMMON_DEPEND="
 	>=dev-libs/glib-2.37.3:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=net-libs/webkit-gtk-2:3
+	>=x11-libs/gtk+-3.13.4:3
+	>=net-libs/webkit-gtk-2:4
 "
 RDEPEND="${COMMON_DEPEND}
 	gedit? (
diff --git a/dev-util/devhelp/files/devhelp-3.6.1-libm.patch b/dev-util/devhelp/files/devhelp-3.6.1-libm.patch
deleted file mode 100644
index 727ed4a15f83..000000000000
--- a/dev-util/devhelp/files/devhelp-3.6.1-libm.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 7ead1d4b000df6f5d31e0df93b8172839c06736d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 23 Nov 2012 02:33:53 -0500
-Subject: [PATCH] libdevhelp: explicitly link with libm for sqrt() in
- dh-window.c
-
-Prevents linking failure when using GNU gold.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=688919
----
- configure.ac    | 3 +++
- src/Makefile.am | 3 ++-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e9c9e87..8849c70 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,6 +71,9 @@ else
- fi
- AM_CONDITIONAL(WITH_WEBKIT2, test "x$with_webkit2" != xno)
- 
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- PKG_CHECK_MODULES(DEVHELP, [
-   gthread-2.0 >= 2.10.0
-   gtk+-3.0 >= 3.4
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e6b1716..419c31c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -107,7 +107,8 @@ libdevhelp_3_la_CFLAGS =				\
- 
- libdevhelp_3_la_LIBADD =				\
- 	$(LIBDEVHELP_LIBS)				\
--	$(ZLIB_LIBS)
-+	$(ZLIB_LIBS)					\
-+	$(LIBM)
- 
- libdevhelp_3_la_LDFLAGS =				\
- 	-no-undefined					\
--- 
-1.8.0
-