Revbump to fix as-needed, doxygen and freetype linkage (bug 514584, thanks Hendrik v. Raven).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 117 insertions, 3 deletions

diff --git a/app-text/paps/ChangeLog b/app-text/paps/ChangeLog
index e8812ff52118..f8ab97ab962c 100644
--- a/app-text/paps/ChangeLog
+++ b/app-text/paps/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/paps
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/paps/ChangeLog,v 1.4 2012/05/21 09:51:53 phajdan.jr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/paps/ChangeLog,v 1.5 2014/11/24 21:45:46 xmw Exp $
+
+*paps-0.6.8-r1 (24 Nov 2014)
+
+  24 Nov 2014; Michael Weber <xmw@gentoo.org>
+  +files/paps-0.6.8-fix-as-needed-build.patch,
+  +files/paps-0.6.8-fix-doxygen-acinclude.patch,
+  +files/paps-0.6.8-fix-freetype-include.patch, +paps-0.6.8-r1.ebuild:
+  Revbump to fix as-needed, doxygen and freetype linkage (bug 514584, thanks
+  Hendrik v. Raven).
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> paps-0.6.8.ebuild:
   x86 stable wrt bug #415463
@@ -17,4 +26,3 @@
   +metadata.xml:
   Initial import, fixed bug 134367. Thanks to Ed Catmur <ed@catmur.co.uk> and
   Petr Pisar <petr.pisar@atlas.cz> for their ebuild.
-
diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
new file mode 100644
index 000000000000..ec4ba8b2b180
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
@@ -0,0 +1,36 @@
+--- paps-0.6.8/configure.in
++++ paps-0.6.8/configure.in
+@@ -18,4 +18,6 @@
+ 
+ DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc)
+ 
++PKG_CHECK_MODULES([PANGO], [pangoft2])
++
+ AC_OUTPUT(Makefile src/Makefile)
+--- paps-0.6.8/src/Makefile.am
++++ paps-0.6.8/src/Makefile.am
+@@ -7,21 +7,19 @@
+ bin_PROGRAMS = paps
+ paps_CFLAGS  = -Wall 
+ paps_SOURCES = paps.c
+-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+-paps_LDFLAGS = `pkg-config --libs pangoft2`
++paps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS)
+ paps_DEPENDENCIES = $(lib_LIBRARIES)
+ 
+ EXTRA_DIST = test_libpaps.c paps.1
+ 
+ # set the include path found by configure
+-INCLUDES= $(all_includes) `pkg-config --cflags pangoft2`
++INCLUDES= $(all_includes) $(PANGO_CFLAGS)
+ 
+ # Test program
+ noinst_PROGRAMS = test_libpaps
+ 
+ 
+ test_libpaps_SOURCES = test_libpaps.c
+-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+-test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
++test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS)
+ test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
+ 
diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
new file mode 100644
index 000000000000..baba74b4b8bb
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
@@ -0,0 +1,20 @@
+--- paps-0.6.8/acinclude.m4
++++ paps-0.6.8/acinclude.m4
+@@ -78,7 +78,7 @@
+ AC_PATH_TOOL([$1], [$2])
+ if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
+     AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
+-    AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
++    AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
+ fi
+ ])
+ 
+@@ -101,7 +101,7 @@
+ # ----------------------------------------------------------
+ # Turn off the DX_CURRENT_FEATURE if the required feature is off.
+ AC_DEFUN([DX_CLEAR_DEPEND], [
+-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
++test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
+ ])
+ 
+ # DX_FEATURE_ARG(FEATURE, DESCRIPTION,
diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
new file mode 100644
index 000000000000..30b456e77416
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -0,0 +1,13 @@
+--- paps-0.6.8/src/libpaps.c
++++ paps-0.6.8/src/libpaps.c
+@@ -25,8 +25,8 @@
+ 
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ftglyph.h>
++#include <ftoutln.h>
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/app-text/paps/paps-0.6.8-r1.ebuild b/app-text/paps/paps-0.6.8-r1.ebuild
new file mode 100644
index 000000000000..edda11331042
--- /dev/null
+++ b/app-text/paps/paps-0.6.8-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/paps/paps-0.6.8-r1.ebuild,v 1.1 2014/11/24 21:45:46 xmw Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Unicode-aware text to PostScript converter"
+HOMEPAGE="http://paps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fix-as-needed-build.patch \
+		"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \
+		"${FILESDIR}"/${P}-fix-freetype-include.patch
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin src/paps
+	doman src/paps.1
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}