[patch] Improved patch on 1.3.5

gpsbabel-1.3.6.patch (text/plain), 2.27 KB, created by Christian Faulhammer (RETIRED) on 2009-01-27 11:37:46 UTC

--- gpsbabel-1.3.5.ebuild	2009-01-09 23:36:53.000000000 +0100
+++ gpsbabel-1.3.6.ebuild	2009-01-27 10:29:38.000000000 +0100
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.3.5.ebuild,v 1.3 2009/01/09 22:36:25 josejx Exp $
 
-inherit eutils
+EAPI=2
 
-DESCRIPTION="GPSBabel is a waypoints, tracks and routes converter in variety of form"
+DESCRIPTION="GPS waypoints, tracks and routes converter"
 HOMEPAGE="http://www.gpsbabel.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://www.gpsbabel.org/plan9.php?dl=${P}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -15,42 +15,36 @@
 RDEPEND="dev-libs/expat
 	usb? ( dev-libs/libusb )
 	debug? ( dev-util/efence )"
-DEPEND="doc? ( virtual/latex-base dev-libs/libxslt dev-libs/libxml2 dev-lang/perl )
+DEPEND="doc? ( dev-java/fop
+		virtual/latex-base
+		dev-libs/libxslt
+		dev-libs/libxml2
+		dev-lang/perl
+		app-text/docbook-xml-dtd:4.1.2 )
 	${RDEPEND}"
 
-src_unpack(){
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-dont-install-pdf.diff"
-	epatch "${FILESDIR}/${PN}-1.3.3-freebsd.patch"
+src_configure() {
+	econf $(use_with doc doc "${S}"/doc/manual) $(use_with usb libusb) \
+		$(use_enable debug efence) --with-zlib=system || die
 }
 
 src_compile() {
-	local myconf="";
-	if ! use usb;then
-		myconf="${myconf} --with-libusb=no"
-	fi
-	if use doc; then
-		myconf="${myconf} --with-doc=${S}/doc/manual"
-	fi
-	econf ${myconf} $(use_enable debug efence) || die
-	emake || die "emake failed"
+	emake || die
 	if use doc; then
-		emake doc || die "Documentation generation failed"
+		emake doc || die
 		cd "${S}/doc"
-		make || die "Documentation generation failed"
+		emake || die
 	fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Install failed"
-	dodoc README* || die "Unable to install gpsbabel doc"
+	emake DESTDIR="${D}" install || die
+	dodoc README* || die
 	if use doc; then
 		cd "${S}"/doc/
-		dohtml ./manual/htmldoc-${PV}/* || die "Unable to install htmldoc"
+		dohtml ./manual/htmldoc-development/* || die
 		docinto manual
-		dodoc doc.dvi babelfront2.eps || \
-			die "Unable to install gpsbabel documentation"
+		dodoc doc.dvi babelfront2.eps ../gpsbabel.pdf || die
 	fi
 }