Version bump fixing bug #144169

(Portage version: 2.1.1)

5 files changed, 210 insertions, 2 deletions

diff --git a/sci-geosciences/gpsbabel/ChangeLog b/sci-geosciences/gpsbabel/ChangeLog
index 5ae1043e59cc..c3dccf19c743 100644
--- a/sci-geosciences/gpsbabel/ChangeLog
+++ b/sci-geosciences/gpsbabel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-geosciences/gpsbabel
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.1 2005/09/08 02:49:42 ribosome Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.2 2006/09/30 15:38:15 djay Exp $
+
+*gpsbabel-1.3.1 (30 Sep 2006)
+
+  30 Sep 2006; <djay@gentoo.org> +files/gpsbabel.patch,
+  +gpsbabel-1.3.1.ebuild:
+  Version Bump, thanks jakub and ranaldo@unina.it for their help.
 
 *gpsbabel-1.2.7 (08 Sep 2005)
 
diff --git a/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.2.7 b/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.2.7
index 6c212107dc44..9f1ba34fca60 100644
--- a/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.2.7
+++ b/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.2.7
@@ -1 +1,3 @@
 MD5 535da9798714e53a9584e22ac7d651d3 gpsbabel-1.2.7.tar.gz 1643528
+RMD160 bb4c1323bca8fcf0b6facbb11df37bfb611eada2 gpsbabel-1.2.7.tar.gz 1643528
+SHA256 08a28e8fb6e04eab170c8983da1601a2636a2a27f4d9aca90e3048c3e15f9d02 gpsbabel-1.2.7.tar.gz 1643528
diff --git a/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.3.1 b/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.3.1
new file mode 100644
index 000000000000..2ef9962ef7b0
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.3.1
@@ -0,0 +1,3 @@
+MD5 0f108ae0eb32ba440124cebe8cb6e95a gpsbabel-1.3.1.tar.gz 2817202
+RMD160 d428a9937d004258319e8e27e92407feb8dfe97b gpsbabel-1.3.1.tar.gz 2817202
+SHA256 07ac75975166616af4134b72efeda23d47be992cee875faa46b1bdee0b8afd57 gpsbabel-1.3.1.tar.gz 2817202
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel.patch b/sci-geosciences/gpsbabel/files/gpsbabel.patch
new file mode 100644
index 000000000000..00ce1f2c0bd8
--- /dev/null
+++ b/sci-geosciences/gpsbabel/files/gpsbabel.patch
@@ -0,0 +1,126 @@
+--- ./gpsbabel-1.3.1/configure.in	2006-09-03 01:41:01.000000000 +0200
++++ ./gpsbabel-1.3.1-r4/configure.in	2006-09-30 12:29:50.000000000 +0200
+@@ -227,9 +227,26 @@
+ AC_CHECK_LIB([expat], [XML_ParserCreate], 
+   AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+   AC_SUBST(EXPAT_LIB)
+-#  [EXPAT_LIB="$LDFLAGS -lexpat"]
+ )
+ 
++AC_MSG_CHECKING(for efence)
++AC_ARG_ENABLE(efence,
++  [  --enable-efence=[yes|(no)]],
++  [ if test "$enable_efence" != "no" ; then
++  	EFENCE_LIB=-lefence
++	GPSBABEL_DEBUG=gpsbabel-debug
++	INSTALL_DEBUG=install-debug
++    fi])
++AC_SUBST(EFENCE_LIB)
++AC_SUBST(GPSBABEL_DEBUG)
++AC_SUBST(INSTALL_DEBUG)
++AC_MSG_RESULT($EFENCE_LIB)
++
++AC_MSG_CHECKING(for docdir)
++AC_ARG_WITH(doc,[  --with-doc=DIR        Path where the documentation will be stored.],
++             DOCDIR="$withval", DOCDIR="../babelweb/")
++AC_SUBST(DOCDIR)
++
+ # Checks for header files.
+ # AC_HEADER_STDC
+ 
+@@ -256,5 +273,5 @@
+ # AC_CHECK_FUNCS([atexit floor localtime_r memmove memset pow select sqrt strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul])
+ AC_CHECK_FUNCS([nanosleep sleep])
+ 
+-AC_CONFIG_FILES([Makefile win32/gpsbabel.rc coldsync/Makefile jeeps/Makefile shapelib/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc coldsync/Makefile jeeps/Makefile shapelib/Makefile zlib/empty])
+ AC_OUTPUT
+--- ./gpsbabel-1.3.1/Makefile.in	2006-09-03 01:41:01.000000000 +0200
++++ ./gpsbabel-1.3.1-r4/Makefile.in	2006-09-30 12:52:13.000000000 +0200
+@@ -36,7 +36,8 @@
+ GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I. -I@srcdir@/coldsync \
+ 	$(OPTIMIZATION) @CFLAGS@
+ LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@
+-INSTALL_TARGETDIR=/usr/local/
++PREFIX=@prefix@
++INSTALL_DIR=$(DESTDIR)/$(PREFIX)
+ 
+ # OTHER_ROOT=/opt/local	# For DarwinPorts on OSX
+ # OTHER_ROOT=/sw		# Uncomment For Fink on OS X.
+@@ -93,14 +94,17 @@
+ 
+ 
+ # Directory of local web doc.  Traditionally a sibling to the GPSBabel tree.
+-WEB=../babelweb/
++WEB=@DOCDIR@
+ 
+ 
+ all: gpsbabel$(EXEEXT)
+ 
+-gpsbabel$(EXEEXT): $(OBJS)
++gpsbabel$(EXEEXT): $(OBJS) @GPSBABEL_DEBUG@
+ 	$(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ 
++gpsbabel-debug: $(OBJS)
++	$(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
++
+ Makefile: Makefile.in config.status
+ 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
+ 
+@@ -132,8 +136,13 @@
+ #
+ # This will only work on UNIX-like substances.
+ #
+-install:
+-	install gpsbabel  $(INSTALL_TARGETDIR)/bin
++install: @INSTALL_DEBUG@
++	@mkdir -p $(INSTALL_DIR)/bin
++	install gpsbabel  $(INSTALL_DIR)/bin
++
++install-debug:
++	@mkdir -p $(INSTALL_DIR)/bin
++	install gpsbabel-debug  $(INSTALL_DIR)/bin
+ 
+ # Nerdy release stuff that needs to work only on Linux.
+ 
+@@ -157,6 +166,7 @@
+ 	 --stringparam root.filename "readme" \
+ 	 xmldoc/babelmain.xsl \
+ 	 xmldoc/readme.xml
++	chmod 755 tools/mkcapabilities
+ 	tools/mkcapabilities
+ 
+ gpsbabel.html: FORCE
+--- ./gpsbabel-1.3.1/xmldoc/chapters/build.xml	2006-09-03 00:51:54.000000000 +0200
++++ ./gpsbabel-1.3.1-r4/xmldoc/chapters/build.xml	2006-09-30 12:29:50.000000000 +0200
+@@ -44,6 +44,12 @@
+   <option>--disable-filters</option> Excludes all filter support.
+ </para>
+ <para>
++  <option>--enable-efence</option> Activate debugging mode for gpsbabel-debug.
++</para>
++<para>
++  <option>--with-doc=dir</option> Specify that the doc should be created and installed in <option>dir</option>.
++</para>
++<para>
+   <option>--without-libusb</option> Disables use of libusb, even it's it's available.
+ </para>
+ <para>
+--- ./gpsbabel-1.3.1/tools/mkcapabilities.in	2006-09-17 19:49:34.000000000 +0200
++++ ./gpsbabel-1.3.1-r4/tools/mkcapabilities.in	2006-09-30 12:29:50.000000000 +0200
+@@ -28,4 +28,4 @@
+ }
+ 
+ getcap($1, $2, $3, $5)
+-' > ../babelweb/capabilities.inc > ../babelweb/capabilities.inc
++' > @DOCDIR@capabilities.inc > @DOCDIR@capabilities.inc
+--- ./gpsbabel-1.3.1/xmldoc/makedoc.in	2006-09-17 19:48:31.000000000 +0200
++++ ./gpsbabel-1.3.1-r4/xmldoc/makedoc.in	2006-09-30 12:29:50.000000000 +0200
+@@ -64,6 +64,7 @@
+ 
+ 
+ 
++@dir=`mkdir -p @DOCDIR@`;
+ $dir = $0;
+ $dir =~ s:/.*$::;
+ 
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.3.1.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.3.1.ebuild
new file mode 100644
index 000000000000..b005a6098017
--- /dev/null
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.3.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.3.1.ebuild,v 1.1 2006/09/30 15:38:15 djay Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="GPSBabel is a waypoints, tracks and routes converter in variety of form"
+
+HOMEPAGE="http://www.gpsbabel.org/"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~x86"
+
+IUSE="doc usb debug"
+
+RDEPEND="dev-libs/expat
+	usb? ( dev-libs/libusb )
+	debug? ( dev-util/efence )"
+
+DEPEND="doc? ( virtual/tetex dev-libs/libxslt dev-libs/libxml2 dev-lang/perl )
+	${RDEPEND}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	cp -p tools/mkcapabilities tools/mkcapabilities.in
+	mv xmldoc/makedoc xmldoc/makedoc.in
+	epatch "${FILESDIR}"/gpsbabel.patch || die "Unable to apply gpsbabel.patch"
+}
+
+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
+	eautoconf
+	econf ${myconf} $(use_enable debug efence)
+	emake || die "emake failed"
+	if use doc; then
+		emake doc || die "Documentation generation failed"
+		cd "${S}/doc"
+		make || die "Documentation generation failed"
+	fi
+}
+
+src_install() {
+	cd "${S}"
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc README* || die "Unable to install gpsbabel doc"
+	if use doc; then
+		cd "${S}"/doc/
+		dohtml ./manual/htmldoc-${PV}/* || die "Unable to install htmldoc"
+		docinto manual
+		dodoc doc.dvi babelfront2.eps || \
+			die "Unable to install gpsbabel documentation"
+	fi
+}
+
+pkg_postinst(){
+	if use debug; then
+		einfo "If you need gpsbabel in debuging mode, use : gpsbabel-debug"
+	fi
+}