Fix underlinking (bug #369117, thanks to flameeyes and Oschtan), and move to EAPI4 and drop .la files.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 232 insertions, 7 deletions

diff --git a/x11-libs/gtkmathview/ChangeLog b/x11-libs/gtkmathview/ChangeLog
index 4e9558af0e38..6ea9c2d8bd40 100644
--- a/x11-libs/gtkmathview/ChangeLog
+++ b/x11-libs/gtkmathview/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/gtkmathview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.37 2011/03/06 13:13:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/ChangeLog,v 1.38 2011/12/06 21:45:55 tetromino Exp $
+
+*gtkmathview-0.8.0-r1 (06 Dec 2011)
+
+  06 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtkmathview-0.8.0-r1.ebuild, +files/gtkmathview-0.8.0-underlinking.patch,
+  +files/binreloc.m4:
+  Fix underlinking (bug #369117, thanks to flameeyes and Oschtan), and move to
+  EAPI4 and drop .la files.
 
   06 Mar 2011; Pacho Ramos <pacho@gentoo.org> gtkmathview-0.8.0.ebuild,
   +files/gtkmathview-0.8.0-fix-template.patch:
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
index c7d070d8e197..06d84946a17e 100644
--- a/x11-libs/gtkmathview/Manifest
+++ b/x11-libs/gtkmathview/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX binreloc.m4 2563 RMD160 0a0706877bf00fe5a811443b9962ea7b3dc1ce7b SHA1 fb0f1adb23507c1aff03f80b58d35f534e2fc772 SHA256 cc9c0d1dd10f7664aaa37c7d77e426fa976eb8cd96a739760545c75db7c1096b
 AUX gtkmathview-0.8.0-cond-t1.patch 1270 RMD160 3a3cbeaa1882162116cb3e5b0ccb57f23341c6a8 SHA1 ef2e8ade3890fa682c47318483482fc3971261e5 SHA256 731894b852a8f692a3a1778bf6666a43e6afaa38e30b73d90272ae56d65bf709
 AUX gtkmathview-0.8.0-fix-template.patch 2209 RMD160 25dd051d49106f0bd2406a75fc6a5a657fd44980 SHA1 2d08f502427fec1b4e82b687018f61e04c52f680 SHA256 b5c43c185ec0920882eb8f27e46082baf32c0e9583c62bfc28d1c6a2ca4e0a7b
 AUX gtkmathview-0.8.0-gcc43.patch 2006 RMD160 bef4b3a2d9f93aa302b445c7a3157e3c1c786860 SHA1 6818e6d50d6bb739e0bcb9c89c879aebb730bee5 SHA256 3915f9f0d58e4eb5294b817bb5323cd9954676ff1044db3683fbaee94200688b
 AUX gtkmathview-0.8.0-gcc44.patch 259 RMD160 280e790b97442bee1c0f31d24961ebb5cea91762 SHA1 ea57cf665803d3bc901677d0a4df581a5676d433 SHA256 5972d8a65f1dc4253f83d082d3afc5d9dc36aa1d365bd66a0114834200d5adf5
+AUX gtkmathview-0.8.0-underlinking.patch 1926 RMD160 41a5a069d3ee3223749be021a6e72b2807d13a80 SHA1 029d883c3767cefe31e84654a0ff18e0d12613c8 SHA256 d0a466e074f0344529410f988a2097b0103cf86eca760c8f1a6da6a0a2cbd682
 DIST gtkmathview-0.8.0.tar.gz 987328 RMD160 6ed60ee9253fd0fdd9bc595a9178ede5100e1644 SHA1 dc6db75a64b8dcde05185c3c54eec310dd7b14d6 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43
+EBUILD gtkmathview-0.8.0-r1.ebuild 2018 RMD160 c4487ecaef17fbd7fe6a9e50fd672e2ddd41bb4b SHA1 971dbf4fd1f5dd219d63327eecacbee1a0dbc526 SHA256 7b3910267238f067f0b84083ef6a7de91115d40b6798dc71514213cfad0970aa
 EBUILD gtkmathview-0.8.0.ebuild 1624 RMD160 98399d419c3bfc611d84953eb8f9b1ab73d297e5 SHA1 267c172447b3e30f2efdad68d99b35d85927749f SHA256 65ac644fee9742e7136c467326f3f6c8eb12168002bf23cfc24e9b2c50a0e13e
-MISC ChangeLog 5319 RMD160 bdd332dbd44836c9bbccadf34c28a23604db2a33 SHA1 4baacbbc8f52920a81d6503d6e7aea8964cbc098 SHA256 cd746cc8976f632c2f73c0ded8ff5531a81716f90cfab2b6fb01b1b5de3a8e96
+MISC ChangeLog 5626 RMD160 592e41d121c6aa3835fbcbafeae1729dbd12cbd5 SHA1 f8cac62d439778a50b9241318d8fd4c862b8aabb SHA256 ff29947709bae41e3740b8f12ee46495e097d84a6d64de9d8dfd92de9448d413
 MISC metadata.xml 322 RMD160 93188106c96393134a42147325102285f84c2a34 SHA1 f2230e9e3e79fc0c31eb1e4eccf8cc79c095bb8a SHA256 704cac33a6aa221b157f52cbb9fd95cd46b8ba27e0b29a00f91f50c07e5200f5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1ziJUACgkQCaWpQKGI+9T4HACeNjI32WsGPOGYh2EzQ1i3IyED
-8qMAnjnhdWhb8KVJx2vLLlsFxhw5w8G9
-=dYjZ
+iF4EAREIAAYFAk7ejRgACgkQdjK8w9WeBnDGEQD/e+i3lPnisub7FUzNBaQpiOqz
+xV7eMl7q+UNt+4Sd+bkA/jx3bEn8n2NXG69poAgsH5CL3ZObh2DJfG4qHYooGEVI
+=B7FB
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtkmathview/files/binreloc.m4 b/x11-libs/gtkmathview/files/binreloc.m4
new file mode 100644
index 000000000000..46696bf64567
--- /dev/null
+++ b/x11-libs/gtkmathview/files/binreloc.m4
@@ -0,0 +1,77 @@
+# Check for binary relocation support
+# Hongli Lai
+# http://autopackage.org/
+
+AC_DEFUN([AM_BINRELOC],
+[
+	AC_ARG_ENABLE(binreloc,
+		[  --enable-binreloc       compile with binary relocation support
+                          (default=disable)],
+		enable_binreloc=$enableval,enable_binreloc=no)
+
+	AC_ARG_ENABLE(binreloc-threads,
+		[  --enable-binreloc-threads      compile binary relocation with threads support
+	                         (default=yes)],
+		enable_binreloc_threads=$enableval,enable_binreloc_threads=yes)
+
+	BINRELOC_CFLAGS=
+	BINRELOC_LIBS=
+	if test "x$enable_binreloc" = "xauto"; then
+		AC_CHECK_FILE([/proc/self/maps])
+		AC_CACHE_CHECK([whether everything is installed to the same prefix],
+			       [br_cv_valid_prefixes], [
+				if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
+					"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+					"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
+				then
+					br_cv_valid_prefixes=yes
+				else
+					br_cv_valid_prefixes=no
+				fi
+				])
+	fi
+	AC_CACHE_CHECK([whether binary relocation support should be enabled],
+		       [br_cv_binreloc],
+		       [if test "x$enable_binreloc" = "xyes"; then
+		       	       br_cv_binreloc=yes
+		       elif test "x$enable_binreloc" = "xauto"; then
+			       if test "x$br_cv_valid_prefixes" = "xyes" -a \
+			       	       "x$ac_cv_file__proc_self_maps" = "xyes"; then
+				       br_cv_binreloc=yes
+			       else
+				       br_cv_binreloc=no
+			       fi
+		       else
+			       br_cv_binreloc=no
+		       fi])
+
+	if test "x$br_cv_binreloc" = "xyes"; then
+		BINRELOC_CFLAGS="-DENABLE_BINRELOC"
+		AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?])
+		if test "x$enable_binreloc_threads" = "xyes"; then
+			AC_CHECK_LIB([pthread], [pthread_getspecific])
+		fi
+
+		AC_CACHE_CHECK([whether binary relocation should use threads],
+			       [br_cv_binreloc_threads],
+			       [if test "x$enable_binreloc_threads" = "xyes"; then
+					if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
+						br_cv_binreloc_threads=yes
+					else
+						br_cv_binreloc_threads=no
+					fi
+			        else
+					br_cv_binreloc_threads=no
+				fi])
+
+		if test "x$br_cv_binreloc_threads" = "xyes"; then
+			BINRELOC_LIBS="-lpthread"
+			AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?])
+		else
+			BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0"
+			AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?])
+		fi
+	fi
+	AC_SUBST(BINRELOC_CFLAGS)
+	AC_SUBST(BINRELOC_LIBS)
+])
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch
new file mode 100644
index 000000000000..35cb9bec6a9d
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch
@@ -0,0 +1,61 @@
+From 319c39458e72be82ed1ce60f0a386a146964f507 Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre@debian.org>
+Date: Sun, 13 Mar 2011 19:00:15 +0100
+Subject: [PATCH] Fix underlinking (required to build with gold link editor)
+
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554753
+---
+ mathmlps/Makefile.am  |    1 +
+ mathmlsvg/Makefile.am |    2 ++
+ viewer/Makefile.am    |    3 +++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/mathmlps/Makefile.am b/mathmlps/Makefile.am
+index 201f410..717cd20 100644
+--- a/mathmlps/Makefile.am
++++ b/mathmlps/Makefile.am
+@@ -17,6 +17,7 @@ mathmlps_LDADD = \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
+   $(NULL)
+ 
+ INCLUDES = \
+diff --git a/mathmlsvg/Makefile.am b/mathmlsvg/Makefile.am
+index 2290230..8007350 100644
+--- a/mathmlsvg/Makefile.am
++++ b/mathmlsvg/Makefile.am
+@@ -30,6 +30,8 @@ mathmlsvg_LDADD = \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
++  -lxml2 \
+   $(NULL)
+ 
+ INCLUDES = \
+diff --git a/viewer/Makefile.am b/viewer/Makefile.am
+index 7b950a0..67220b4 100644
+--- a/viewer/Makefile.am
++++ b/viewer/Makefile.am
+@@ -31,6 +31,7 @@ mathmlviewer_static_LDADD = \
+   $(DOM_LIBS) \
+   $(GTK_LIBS) \
+   $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(T1_LIBS) \
+   $(T1_LIBS_X) \
+   $(NULL)
+@@ -88,6 +89,8 @@ test_rendering_LDADD = \
+   $(T1_LIBS_X) \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++  $(top_builddir)/src/libmathview.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+   $(NULL)
+ 
+-- 
+1.7.8
+
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r1.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r1.ebuild
new file mode 100644
index 000000000000..0eb5ef32fafe
--- /dev/null
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview/gtkmathview-0.8.0-r1.ebuild,v 1.1 2011/12/06 21:45:55 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Rendering engine for MathML documents"
+HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
+SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk mathml svg t1lib"
+
+RDEPEND=">=dev-libs/glib-2.2.1:2
+	>=dev-libs/popt-1.7
+	>=dev-libs/libxml2-2.6.7:2
+	gtk? ( >=x11-libs/gtk+-2.2.1:2
+		>=media-libs/t1lib-5:5
+		>=dev-libs/gmetadom-0.1.8
+		x11-libs/pango )
+	mathml? ( media-fonts/texcm-ttf )
+	t1lib?	( >=media-libs/t1lib-5:5 )"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	DOCS="ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-cond-t1.patch
+
+	# Fix building against libxml2[icu], bug #356095
+	epatch "${FILESDIR}"/${P}-fix-template.patch
+
+	# Fix building with gold, bug #369117; requires eautoreconf
+	epatch "${FILESDIR}/${P}-underlinking.patch"
+
+	# m4 macros from upstream git, required for eautoreconf
+	if [[ ! -d ac-helpers ]]; then
+		mkdir ac-helpers || die "mkdir failed"
+		cp "${FILESDIR}/binreloc.m4" ac-helpers || die "cp failed"
+	fi
+
+	AT_M4DIR=ac-helpers eautoreconf
+}
+
+src_configure() {
+	# --disable-popt will build only the library and not the frontend
+	# TFM is needed for SVG, default value is 2
+	econf $(use_enable gtk) $(use_enable gtk gmetadom) \
+		$(use_enable svg) \
+		$(use_with t1lib) \
+		--with-popt \
+		--enable-libxml2 \
+		--enable-libxml2-reader \
+		--enable-ps \
+		--enable-tfm=2 \
+		--enable-builder-cache \
+		--enable-breaks \
+		--enable-boxml \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -exec rm -f {} +
+}