Marked stable on amd64, removed old version.

(Portage version: 2.1.3_rc8)

6 files changed, 8 insertions, 229 deletions

diff --git a/sci-geosciences/gpsbabel/ChangeLog b/sci-geosciences/gpsbabel/ChangeLog
index 534185a28847..56d6dccecad9 100644
--- a/sci-geosciences/gpsbabel/ChangeLog
+++ b/sci-geosciences/gpsbabel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gpsbabel
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.9 2007/03/28 11:55:28 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.10 2007/07/18 02:02:04 cryos Exp $
+
+  18 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/gpsbabel-1.3.2.patch, -files/gpsbabel.patch,
+  -gpsbabel-1.3.2.ebuild, gpsbabel-1.3.3.ebuild:
+  Marked stable on amd64, removed old version.
 
   28 Mar 2007; Marcus D. Hanwell <cryos@gentoo.org> gpsbabel-1.3.3.ebuild:
   Rekeyworded ~amd64, please do not remove keywords on bumps unless there is a
diff --git a/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.3.2 b/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.3.2
deleted file mode 100644
index aca5bd3bdd8e..000000000000
--- a/sci-geosciences/gpsbabel/files/digest-gpsbabel-1.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5a9c442bc681035b1dfdbb32b1d3fa8b gpsbabel-1.3.2.tar.gz 2983808
-RMD160 0f0c05e67eaa77f8325b22ac8ed874ac5cee28e7 gpsbabel-1.3.2.tar.gz 2983808
-SHA256 31c4991810eb12744c2c908b2b7efa6f311a0bfe5e36f8cc2b1c545bede9c045 gpsbabel-1.3.2.tar.gz 2983808
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-1.3.2.patch b/sci-geosciences/gpsbabel/files/gpsbabel-1.3.2.patch
deleted file mode 100644
index d15ab8da8032..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel-1.3.2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru ./Makefile.in ./Makefile.in
---- ./Makefile.in	2006-11-06 00:54:07.000000000 +0100
-+++ ./Makefile.in	2006-11-24 22:01:04.000000000 +0100
-@@ -36,7 +36,8 @@
- GBCFLAGS=$(EXTRA_CFLAGS) $(DEBUGGING) -I. -I@srcdir@/coldsync \
- 	$(OPTIMIZATION) @CFLAGS@
- LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@
--DESTDIR=/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.
-@@ -136,10 +137,12 @@
- # This will only work on UNIX-like substances.
- #
- install: @INSTALL_DEBUG@
--	install gpsbabel  $(DESTDIR)/bin
-+	@mkdir -p $(INSTALL_DIR)/bin
-+	install gpsbabel  $(INSTALL_DIR)/bin/
- 
- install-debug:
--	install gpsbabel-debug  $(DESTDIR)/bin
-+	@mkdir -p $(INSTALL_DIR)/bin
-+	install gpsbabel-debug  $(INSTALL_DIR)/bin/
- 
- # Nerdy release stuff that needs to work only on Linux.
- 
diff --git a/sci-geosciences/gpsbabel/files/gpsbabel.patch b/sci-geosciences/gpsbabel/files/gpsbabel.patch
deleted file mode 100644
index 00ce1f2c0bd8..000000000000
--- a/sci-geosciences/gpsbabel/files/gpsbabel.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- ./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.2.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.3.2.ebuild
deleted file mode 100644
index b36baec0f9ff..000000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.3.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.3.2.ebuild,v 1.3 2007/03/01 14:34:51 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="~amd64 ~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}"
-	epatch "${FILESDIR}"/gpsbabel-${PV}.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
-}
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild
index 224349337d47..17e631af9ac3 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild,v 1.2 2007/03/28 11:55:28 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.3.3.ebuild,v 1.3 2007/07/18 02:02:04 cryos Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="doc usb debug"