+++ /dev/null
-From 80c9532e39fac397960fc59eb407e596d9e8d2e4 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 2 Jun 2014 22:41:14 -0400
-Subject: [PATCH] build: Explicitly link libgladeui with libm
-
-Fixes underlinking failure with ld.gold.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=724104
----
- configure.ac | 6 ++++++
- gladeui/Makefile.am | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c86e947..7bf65e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -133,6 +133,12 @@ AC_TRY_LINK([#include <stdarg.h>], [va_list ap1, ap2; va_copy(ap1, ap2);],
- ])
-
- dnl ================================================================
-+dnl libm
-+dnl ================================================================
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
-+dnl ================================================================
- dnl Check for gtk-doc
- dnl ================================================================
- GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
-diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am
-index c63b6a3..77af09c 100644
---- a/gladeui/Makefile.am
-+++ b/gladeui/Makefile.am
-@@ -145,7 +145,7 @@ libgladeui_2_la_CFLAGS = \
- $(AM_CFLAGS)
-
- libgladeui_2_la_LDFLAGS = -version-info $(GLADE_CURRENT):$(GLADE_REVISION):$(GLADE_AGE) $(AM_LDFLAGS)
--libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS)
-+libgladeui_2_la_LIBADD = $(GTK_LIBS) $(GTK_MAC_LIBS) $(LIBM)
-
- libgladeuiincludedir=$(includedir)/libgladeui-2.0/gladeui
- libgladeuiinclude_HEADERS = \
---
-2.0.0
-
+++ /dev/null
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1 versionator virtualx
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="https://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+introspection python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- dev-libs/atk[introspection?]
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2.4.0:2
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.12:3[introspection?]
- x11-libs/pango[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-1.32 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools
- dev-libs/libxslt
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.41.0
- virtual/pkgconfig
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf requires:
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # To avoid file collison with other slots, rename help module.
- # Prevent the UI from loading glade:3's gladeui devhelp documentation.
- epatch "${FILESDIR}"/${PN}-3.14.1-doc-version.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=724104
- epatch "${FILESDIR}"/${PN}-3.18.1-underlinking.patch
-
- eautoreconf
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-gladeui \
- --enable-libtool-lock \
- $(use_enable introspection) \
- $(use_enable python) \
- ITSTOOL=$(type -P true)
-}
-
-src_test() {
- Xemake check
-}
-
-src_install() {
- # modify Name in .desktop file to avoid confusion with other slots
- sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
- -i data/glade.desktop || die "sed of data/glade.desktop failed"
- # modify name in .devhelp2 file to avoid shadowing with glade:3 docs
- sed -e 's:name="gladeui":name="gladeui-2":' \
- -i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
- gnome2_src_install
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if ! has_version dev-util/devhelp ; then
- elog "You may want to install dev-util/devhelp for integration API"
- elog "documentation support."
- fi
-}