Improved paps ebuild

app-text/paps/files/0001-Fixed-pango-ft2-check-and-fixed-Makefile.am.patch

@@ -0,0 +1,63 @@
+From 640d67a1e5aa9cf5da4506579ebbb9da07505eda Mon Sep 17 00:00:00 2001
+From: Fabiano Francesconi <fabiano.francesconi@gmail.com>
+Date: Wed, 3 Feb 2010 18:27:30 +0100
+Subject: [PATCH 1/2] Fixed pango-ft2 check and fixed Makefile.am
+
+---
+ configure.in    |    7 +++++++
+ src/Makefile.am |   11 ++++-------
+ 2 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index c9b3ae0..6730123 100644
+--- a/configure.in
++++ b/configure.in
+@@ -7,6 +7,13 @@ AC_LANG_C
+ AC_PROG_CC
+ AM_PROG_LIBTOOL
+
++PANGOFT2_REQUIRED=1.26.0
++AC_SUBST(PANGOFT2_REQUIRED)
++
++PKG_CHECK_MODULES(pangoft2, pangoft2 >= $PANGOFT2_REQUIRED)
++AC_SUBST(pangoft2_CFLAGS)
++AC_SUBST(pangoft2_LIBS)
++
+ DX_HTML_FEATURE(ON)
+ DX_CHM_FEATURE(OFF)
+ DX_CHI_FEATURE(OFF)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 8f4bf0d..3848e1d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -5,23 +5,20 @@ libpaps_a_inc_HEADERS = libpaps.h
+ libpaps_a_incdir = $(includedir)
+
+ bin_PROGRAMS = paps
+-paps_CFLAGS  = -Wall 
++paps_CFLAGS  = -Wall $(pangoft2_CFLAGS) 
+ paps_SOURCES = paps.c
+-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+-paps_LDFLAGS = `pkg-config --libs pangoft2`
++paps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(pangoft2_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) $(pangoft2_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) $(pangoft2_LIBS)
+ test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
+-
+-- 
+1.6.4.4
+

app-text/paps/files/0002-Fixed-acinclude.m4.patch

@@ -0,0 +1,75 @@
+From f7636b6b15ca0d64c47507bc60654845f6ef19b5 Mon Sep 17 00:00:00 2001
+From: Fabiano Francesconi <fabiano.francesconi@gmail.com>
+Date: Wed, 3 Feb 2010 18:28:42 +0100
+Subject: [PATCH 2/2] Fixed acinclude.m4
+
+---
+ acinclude.m4 |   41 +++--------------------------------------
+ 1 files changed, 3 insertions(+), 38 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index e4688de..33f20a5 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1,39 +1,4 @@
+-# This file is part of Autoconf.                       -*- Autoconf -*-
+-
+-# Copyright (C) 2004 Oren Ben-Kiki
+-# This file is distributed under the same terms as the Autoconf macro files.
+-
+-# Generate automatic documentation using Doxygen. Works in concert with the
+-# aminclude.m4 file and a compatible doxygen configuration file. Defines the
+-# following public macros:
+-#
+-# DX_???_FEATURE(ON|OFF) - control the default setting fo a Doxygen feature.
+-# Supported features are 'DOXYGEN' itself, 'DOT' for generating graphics,
+-# 'HTML' for plain HTML, 'CHM' for compressed HTML help (for MS users), 'CHI'
+-# for generating a seperate .chi file by the .chm file, and 'MAN', 'RTF',
+-# 'XML', 'PDF' and 'PS' for the appropriate output formats. The environment
+-# variable DOXYGEN_PAPER_SIZE may be specified to override the default 'a4wide'
+-# paper size.
+-#
+-# By default, HTML, PDF and PS documentation is generated as this seems to be
+-# the most popular and portable combination. MAN pages created by Doxygen are
+-# usually problematic, though by picking an appropriate subset and doing some
+-# massaging they might be better than nothing. CHM and RTF are specific for MS
+-# (note that you can't generate both HTML and CHM at the same time). The XML is
+-# rather useless unless you apply specialized post-processing to it.
+-#
+-# The macro mainly controls the default state of the feature. The use can
+-# override the default by specifying --enable or --disable. The macros ensure
+-# that contradictory flags are not given (e.g., --enable-doxygen-html and
+-# --enable-doxygen-chm, --enable-doxygen-anything with --disable-doxygen, etc.)
+-# Finally, each feature will be automatically disabled (with a warning) if the
+-# required programs are missing.
+-#
+-# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN with
+-# the following parameters: a one-word name for the project for use as a
+-# filename base etc., an optional configuration file name (the default is
+-# 'Doxyfile', the same as Doxygen's default), and an optional output directory
+-# name (the default is 'doxygen-doc').
++#serial 9
+
+ ## ----------##
+ ## Defaults. ##
+@@ -78,7 +43,7 @@ AC_DEFUN([DX_REQUIRE_PROG], [
+ 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 +66,7 @@ test "$DX_FLAG_$1" = "$2" \
+ # ----------------------------------------------------------
+ # 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,
+-- 
+1.6.4.4
+