diff options
| -rw-r--r-- | dev-util/devhelp/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-2.32.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-3.2.0.ebuild | 67 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-3.4.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/devhelp/devhelp-3.6.1-r1.ebuild | 62 | ||||
| -rw-r--r-- | dev-util/devhelp/files/devhelp-3.6.1-libm.patch | 45 | ||||
| -rw-r--r-- | dev-util/devhelp/metadata.xml | 3 |
7 files changed, 123 insertions, 72 deletions
diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog index f8663c655808..3e39cc4254a8 100644 --- a/dev-util/devhelp/ChangeLog +++ b/dev-util/devhelp/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/devhelp # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.141 2012/10/28 15:48:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.142 2012/12/17 10:08:13 tetromino Exp $ + +*devhelp-3.6.1-r1 (17 Dec 2012) + + 17 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> + devhelp-2.32.0.ebuild, -devhelp-3.2.0.ebuild, devhelp-3.4.1.ebuild, + +devhelp-3.6.1-r1.ebuild, +files/devhelp-3.6.1-libm.patch, metadata.xml: + Version bump for gnome-3.6. Stop requiring python at runtime when you don't + use gedit. Update license. Drop old. 28 Oct 2012; Raúl Porcel <armin76@gentoo.org> devhelp-3.4.1.ebuild: alpha/ia64/sparc stable wrt #427544 diff --git a/dev-util/devhelp/devhelp-2.32.0.ebuild b/dev-util/devhelp/devhelp-2.32.0.ebuild index dccd5e7c6520..0bb7e87eb178 100644 --- a/dev-util/devhelp/devhelp-2.32.0.ebuild +++ b/dev-util/devhelp/devhelp-2.32.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.11 2012/07/05 17:52:54 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-2.32.0.ebuild,v 1.12 2012/12/17 10:08:13 tetromino Exp $ EAPI="3" GCONF_DEBUG="no" @@ -10,7 +10,7 @@ inherit eutils gnome2 python toolchain-funcs DESCRIPTION="An API documentation browser for GNOME" HOMEPAGE="http://live.gnome.org/devhelp" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-fbsd" IUSE="" diff --git a/dev-util/devhelp/devhelp-3.2.0.ebuild b/dev-util/devhelp/devhelp-3.2.0.ebuild deleted file mode 100644 index 61afb9ab8ceb..000000000000 --- a/dev-util/devhelp/devhelp-3.2.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.2.0.ebuild,v 1.9 2012/07/15 18:38:42 armin76 Exp $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2" - -inherit eutils gnome2 python toolchain-funcs - -DESCRIPTION="An API documentation browser for GNOME" -HOMEPAGE="http://live.gnome.org/devhelp" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~x86-fbsd" -IUSE="" - -COMMON_DEPEND=">=gnome-base/gconf-2.6:2 - >=dev-libs/glib-2.25.11:2 - >=x11-libs/gtk+-3.0.2:3 - x11-libs/libwnck:3 - net-libs/webkit-gtk:3" -# libgnome is needed for /desktop/gnome/interface/* gconf keys -RDEPEND="${COMMON_DEPEND} - gnome-base/libgnome" -DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 - >=dev-util/intltool-0.40 - virtual/pkgconfig" - -pkg_setup() { - DOCS="AUTHORS NEWS README" - # ICC is crazy, silence warnings (bug #154010) - if [[ $(tc-getCC) == "icc" ]] ; then - G2CONF="${G2CONF} --with-compile-warnings=no" - fi - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - gnome2_src_prepare - - # disable pyc compiling - echo '#!/bin/sh' > build-aux/py-compile -} - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libdevhelp-2.so.1 -} - -pkg_postinst() { - gnome2_pkg_postinst - python_need_rebuild - python_mod_optimize /usr/$(get_libdir)/gedit/plugins - # Keep all the notify calls around so that users get reminded to delete them - preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-1.so.1 - preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-2.so.1 -} - -pkg_postrm() { - gnome2_pkg_postrm - python_mod_cleanup /usr/$(get_libdir)/gedit/plugins -} diff --git a/dev-util/devhelp/devhelp-3.4.1.ebuild b/dev-util/devhelp/devhelp-3.4.1.ebuild index 06aab534b187..5c8e643cb128 100644 --- a/dev-util/devhelp/devhelp-3.4.1.ebuild +++ b/dev-util/devhelp/devhelp-3.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.4.1.ebuild,v 1.9 2012/10/28 15:48:19 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.4.1.ebuild,v 1.10 2012/12/17 10:08:13 tetromino Exp $ EAPI="4" GCONF_DEBUG="no" @@ -12,7 +12,7 @@ inherit eutils gnome2 python toolchain-funcs DESCRIPTION="An API documentation browser for GNOME" HOMEPAGE="http://live.gnome.org/devhelp" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="" diff --git a/dev-util/devhelp/devhelp-3.6.1-r1.ebuild b/dev-util/devhelp/devhelp-3.6.1-r1.ebuild new file mode 100644 index 000000000000..f6478224e8e7 --- /dev/null +++ b/dev-util/devhelp/devhelp-3.6.1-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.6.1-r1.ebuild,v 1.1 2012/12/17 10:08:13 tetromino Exp $ + +EAPI="5" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit autotools eutils 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="gedit" + +# FIXME: automagic python dependency +COMMON_DEPEND=">=gnome-base/gconf-2.6:2 + >=dev-libs/glib-2.32:2 + >=x11-libs/gtk+-3.4:3 + >=net-libs/webkit-gtk-1.6: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} + >=sys-devel/gettext-0.17 + >=dev-util/intltool-0.40 + virtual/pkgconfig" + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + # ICC is crazy, silence warnings (bug #154010) + if [[ $(tc-getCC) == "icc" ]] ; then + G2CONF="${G2CONF} --with-compile-warnings=no" + fi + + use gedit || sed -e '/SUBDIRS/ s/gedit-plugin//' -i misc/Makefile.{am,in} || die + + # https://bugzilla.gnome.org/show_bug.cgi?id=688919 + epatch "${FILESDIR}/${PN}-3.6.1-libm.patch" + eautoreconf + + gnome2_src_prepare +} + +pkg_postinst() { + gnome2_pkg_postinst + # Keep all the notify calls around so that users get reminded to delete them + preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-1.so.1 + preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-2.so.1 +} diff --git a/dev-util/devhelp/files/devhelp-3.6.1-libm.patch b/dev-util/devhelp/files/devhelp-3.6.1-libm.patch new file mode 100644 index 000000000000..727ed4a15f83 --- /dev/null +++ b/dev-util/devhelp/files/devhelp-3.6.1-libm.patch @@ -0,0 +1,45 @@ +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 + diff --git a/dev-util/devhelp/metadata.xml b/dev-util/devhelp/metadata.xml index da6fd63d0085..2bbccce04951 100644 --- a/dev-util/devhelp/metadata.xml +++ b/dev-util/devhelp/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> +<use> + <flag name="gedit">Install plugin for <pkg>app-editors/gedit</pkg></flag> +</use> </pkgmetadata> |