app-text/xmlroff: added missing metadata.xml, fixed dependencies, added src_compile, improvements...

svn path=/sunrise/; revision=8044

4 files changed, 48 insertions, 20 deletions

diff --git a/app-text/xmlroff/ChangeLog b/app-text/xmlroff/ChangeLog
index 01c4e95a4..48fb262d9 100644
--- a/app-text/xmlroff/ChangeLog
+++ b/app-text/xmlroff/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Mar 2009; Christian Ruppert <idl0r@gentoo.org> xmlroff-0.6.1.ebuild,
+  +metadata.xml:
+  added missing metadata.xml, fixed dependencies, added src_compile,
+  improvements...
+
   09 Mar 2009; Martin von Gagern (MvG) <Martin.vGagern@gmx.net>
   +xmlroff-0.6.1.ebuild:
   Initial xmlroff commit to sunrise. Bug #124339.
diff --git a/app-text/xmlroff/Manifest b/app-text/xmlroff/Manifest
index ec48ab23d..a6f6af8d7 100644
--- a/app-text/xmlroff/Manifest
+++ b/app-text/xmlroff/Manifest
@@ -1,3 +1,4 @@
 DIST xmlroff-0.6.1.tar.gz 2849962 RMD160 086051e8eadf926a965175d6984ad7b5084e85f4 SHA1 fd64faebfefeec2bd67f120fc5a7915df393a2f2 SHA256 5ebd44c7490a8512274d238c901ff5ee96557119d9ef25423cf647dabde8a19d
-EBUILD xmlroff-0.6.1.ebuild 874 RMD160 bebb555eddcdbd55370fb89590e22e1437f01e3a SHA1 397bf835ecb79372d7680f01d0312b334e8fdd83 SHA256 fdeb2e6436b8826439cc8bf77170e10459fe172c50a587f62645a6888c95ba8a
-MISC ChangeLog 296 RMD160 8ee44d40ba5c5483c6eafed5ffed44913b371356 SHA1 3e4afe11f6eba257aabe3d00dfa558be1cf46419 SHA256 4d451f0fb038fc883c0a5ff7c15b441e1f9963d42891d033f1b3ac908942c50c
+EBUILD xmlroff-0.6.1.ebuild 1166 RMD160 1d298f070772b03dd1f2c262742a0b022a479571 SHA1 2dfb1fa85724024931c36887e4edde839e251652 SHA256 fac3406f611c503e67868017f0ab64b2b8ef6bffe6abf6df50d1e9253ac019d4
+MISC ChangeLog 475 RMD160 55f31d506bf052f43d5116042406d530910bb0f5 SHA1 255cf3c83b67d5ea5b90e029f14d09e8837d95db SHA256 4d0da797ef6308d0e3a7549f66cff3bab840f5133caf9ca631f1126e8ab66a1a
+MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-text/xmlroff/metadata.xml b/app-text/xmlroff/metadata.xml
new file mode 100644
index 000000000..7e3286984
--- /dev/null
+++ b/app-text/xmlroff/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>
diff --git a/app-text/xmlroff/xmlroff-0.6.1.ebuild b/app-text/xmlroff/xmlroff-0.6.1.ebuild
index 9b29dcc69..509774a12 100644
--- a/app-text/xmlroff/xmlroff-0.6.1.ebuild
+++ b/app-text/xmlroff/xmlroff-0.6.1.ebuild
@@ -2,33 +2,50 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 DESCRIPTION="A fast, free, high-quality, multi-platform XSL formatter"
 HOMEPAGE="http://xmlroff.org/"
 SRC_URI="http://xmlroff.org/download/${P}.tar.gz"
 
 LICENSE="sun-xmlroff"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-
-DEPEND=">=x11-libs/pango-1.6.0
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2.0
-	>=dev-libs/glib-2.2.0
-	>=dev-libs/libxml2-2.6.7
-	>=dev-libs/libxslt-1.1.2
-	>=gnome-base/libgnomeprint-2.8.0
-	>=x11-libs/cairo-1.6.4-r1
-	x11-libs/gtk+"
-RDEPEND="${DEPEND}"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo debug doc svg truetype"
+
+# at least ciaro or gnome-print is required (as backend)
+
+RDEPEND="x11-libs/gtk+
+	x11-libs/pango
+	dev-libs/glib:2
+	dev-libs/libxml2
+	dev-libs/libxslt
+	cairo? ( x11-libs/cairo )
+	!cairo? ( gnome-base/libgnomeprint )
+	svg? ( gnome-base/librsvg )
+	truetype? ( media-libs/freetype )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_compile() {
+	econf \
+		$(use_enable cairo) \
+		$(use_enable !cairo gp) \
+		$(use_enable debug libfo-debug)
+
+	emake || die "emake failed"
+}
 
 src_install() {
-	einstall HTML_DIR="${D}/usr/share/doc/${P}" || die
+	local docdir="/usr/share/doc/${PF}"
+
+	emake DESTDIR="${D}" HTML_DIR="${docdir}" install || die "emake install failed"
+
 	if use doc; then
-		mv "${D}/usr/share/doc/${P}/${PN}" "${D}/usr/share/doc/${P}/html" || die
-		dodoc ChangeLog
+		mv "${D}/${docdir}/${PN}" "${D}/${docdir}/html" || die
 	else
-		rm -r "${D}/usr/share/doc/${P}/${PN}" || die
+		rm -r "${D}/${docdir}/${PN}" || die
 	fi
-	dodoc AUTHORS NEWS README TODO
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
 }