diff options
| author |   Christian Ruppert <idl0r@gentoo.org> | 2009-03-14 10:02:59 +0000 |
|---|---|---|
| committer | Christian Ruppert <idl0r@gentoo.org> | 2009-03-14 10:02:59 +0000 |
| commit | b02003f3dea85294c011effa583eca1c04dd2db3 (patch) | |
| tree | 20601454210bcc3c3ba28e72572b8ff2d47ed92e /app-text | |
| parent | app-text/xmlroff: fixed cairo dependency, use EAPI 2. (diff) | |
| download | sunrise-reviewed-b02003f3dea85294c011effa583eca1c04dd2db3.tar.gz sunrise-reviewed-b02003f3dea85294c011effa583eca1c04dd2db3.tar.bz2 sunrise-reviewed-b02003f3dea85294c011effa583eca1c04dd2db3.zip | |
app-text/xmlroff: Added automagic patch, fixed unrecognized --disable-libfo-debug.
svn path=/sunrise/; revision=8081
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/xmlroff/ChangeLog | 4 | ||||
| -rw-r--r-- | app-text/xmlroff/Manifest | 5 | ||||
| -rw-r--r-- | app-text/xmlroff/files/automagic.patch | 61 | ||||
| -rw-r--r-- | app-text/xmlroff/xmlroff-0.6.1.ebuild | 16 |
4 files changed, 83 insertions, 3 deletions
diff --git a/app-text/xmlroff/ChangeLog b/app-text/xmlroff/ChangeLog index a9202038b..da7a2546c 100644 --- a/app-text/xmlroff/ChangeLog +++ b/app-text/xmlroff/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 14 Mar 2009; Christian Ruppert <idl0r@gentoo.org> xmlroff-0.6.1.ebuild, + +files/automagic.patch: + Added automagic patch, fixed unrecognized --disable-libfo-debug. + 14 Mar 2009; Christian Ruppert <idl0r@gentoo.org> xmlroff-0.6.1.ebuild: fixed cairo dependency, use EAPI 2. diff --git a/app-text/xmlroff/Manifest b/app-text/xmlroff/Manifest index 827a5197c..4501852ca 100644 --- a/app-text/xmlroff/Manifest +++ b/app-text/xmlroff/Manifest @@ -1,4 +1,5 @@ +AUX automagic.patch 1991 RMD160 e0d6b710b2acce2a14e9159171630ffa4a2f2cd8 SHA1 72eeaa23a10406232a0e92f1a06ba3c9d59983c1 SHA256 e1eab327829241676e602aadf7029e9425405da405f742efaff27b837f37c578 DIST xmlroff-0.6.1.tar.gz 2849962 RMD160 086051e8eadf926a965175d6984ad7b5084e85f4 SHA1 fd64faebfefeec2bd67f120fc5a7915df393a2f2 SHA256 5ebd44c7490a8512274d238c901ff5ee96557119d9ef25423cf647dabde8a19d -EBUILD xmlroff-0.6.1.ebuild 1138 RMD160 548eec8a849420f59b0905bebbfbbf9974c928b0 SHA1 1a23bf466e97ad1d656eadbc9ac31d15aed5eb82 SHA256 f784f0a3f2a0124c2f540af27e4c4671eadac3a331a1a1b05423e13971660d6d -MISC ChangeLog 678 RMD160 c68a745496f9e1f31a993f303a7926863110a862 SHA1 c334fefde246be3a62abb217c1d8c41f0e5faa0b SHA256 92c5b1a17963ec4fb0b365e9f4891cb283404a3667f44a88ef1de23a2fe502fa +EBUILD xmlroff-0.6.1.ebuild 1327 RMD160 af1e6c1b602139139cdb7edbce645d2fdad9dbb9 SHA1 180c7237146187c4a0864d7d099332e7bea71d21 SHA256 382c27421c08f6fa32add593e8a151435277cebd44133985ac6d56ccab6c0dd6 +MISC ChangeLog 846 RMD160 dcd82ec0e0b1271cb3c4e313af368ffd13555e83 SHA1 c91b82d79fbd86e92b168f2055cddcbc73bbccb9 SHA256 7d0a1e5efe81bea06f628e798916762ff6b7f970f8c7111d91b6bb303b540606 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/app-text/xmlroff/files/automagic.patch b/app-text/xmlroff/files/automagic.patch new file mode 100644 index 000000000..38d35c745 --- /dev/null +++ b/app-text/xmlroff/files/automagic.patch @@ -0,0 +1,61 @@ +--- configure.ac.old 2009-03-14 10:11:23.433773837 +0100 ++++ configure.ac 2009-03-14 10:51:28.760028278 +0100 +@@ -280,14 +280,20 @@ AC_SUBST(REBUILD) + FREETYPE_LIBS= + FREETYPE_CFLAGS= + have_freetype=false +-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) +-if test "x$FREETYPE_CONFIG" != "xno" ; then +- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` + +- AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true +- ,:,$FREETYPE_LIBS) ++AC_ARG_WITH([freetype], AS_HELP_STRING([--without-freetype], [Build without freetype support (default: test)])) ++ ++if test "x$with_freetype" != "xno"; then ++ AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) ++ if test "x$FREETYPE_CONFIG" != "xno" ; then ++ FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` ++ FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` ++ ++ AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true ++ ,:,$FREETYPE_LIBS) ++ fi + fi ++ + AC_SUBST(FREETYPE_LIBS) + AC_SUBST(FREETYPE_CFLAGS) + AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) +@@ -394,15 +400,23 @@ AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) + AM_CONDITIONAL(HAVE_CAIRO_WIN32, $have_cairo_win32 && $have_win32) + AM_CONDITIONAL(HAVE_CAIRO_FREETYPE, $have_cairo_freetype && $have_freetype) + +-AH_TEMPLATE(HAVE_LIBRSVG, +- [Whether Cairo can render SVG files]) +-have_librsvg=false +-if $enable_cairo ; then +- PKG_CHECK_MODULES(LIBRSVG, +- librsvg-2.0 >= 2.4.0, +- have_librsvg=true, +- :) ++AC_ARG_WITH([svg], AS_HELP_STRING([--without-svg], [Build without svg support (default: test)])) ++ ++if test "x$with_svg" != "xno"; then ++ AH_TEMPLATE(HAVE_LIBRSVG, ++ [Whether Cairo can render SVG files]) ++ have_librsvg=false ++ if $enable_cairo ; then ++ PKG_CHECK_MODULES(LIBRSVG, ++ librsvg-2.0 >= 2.4.0, ++ have_librsvg=true, ++ :) ++ if $have_librsvg; then ++ AC_DEFINE(HAVE_LIBRSVG, 1) ++ fi ++ fi + fi ++ + AM_CONDITIONAL(HAVE_LIBRSVG, $have_librsvg) + AC_SUBST(HAVE_LIBRSVG, [$have_librsvg]) + AC_SUBST(LIBRSVG_LIBS) diff --git a/app-text/xmlroff/xmlroff-0.6.1.ebuild b/app-text/xmlroff/xmlroff-0.6.1.ebuild index 81c1db4cd..f6f4f9251 100644 --- a/app-text/xmlroff/xmlroff-0.6.1.ebuild +++ b/app-text/xmlroff/xmlroff-0.6.1.ebuild @@ -4,6 +4,8 @@ EAPI="2" +inherit eutils autotools + DESCRIPTION="A fast, free, high-quality, multi-platform XSL formatter" HOMEPAGE="http://xmlroff.org/" SRC_URI="http://xmlroff.org/download/${P}.tar.gz" @@ -27,11 +29,23 @@ RDEPEND="x11-libs/gtk+ DEPEND="${RDEPEND} dev-util/pkgconfig" +src_prepare() { + epatch "${FILESDIR}/automagic.patch" + + eautoreconf +} + src_configure() { + local myconf + + use debug && myconf="--enable-libfo-debug" + econf \ $(use_enable cairo) \ $(use_enable !cairo gp) \ - $(use_enable debug libfo-debug) + $(use_with svg) \ + $(use_with truetype freetype) \ + ${myconf} } src_install() { |