Stabilise latest on amd64 and x86. Punt older.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

4 files changed, 23 insertions, 112 deletions

diff --git a/sci-geosciences/gpsbabel/ChangeLog b/sci-geosciences/gpsbabel/ChangeLog
index 00eb25035f6b..8bb2ba7eb5f2 100644
--- a/sci-geosciences/gpsbabel/ChangeLog
+++ b/sci-geosciences/gpsbabel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gpsbabel
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.27 2012/05/21 19:49:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/ChangeLog,v 1.28 2012/05/24 16:34:36 scarabeus Exp $
+
+  24 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -gpsbabel-1.4.2.ebuild,
+  gpsbabel-1.4.3.ebuild:
+  Stabilise latest on amd64 and x86. Punt older.
 
   21 May 2012; Samuli Suominen <ssuominen@gentoo.org> gpsbabel-1.4.2.ebuild,
   gpsbabel-1.4.3.ebuild:
diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest
index b7be4ca916d9..d31aa55dde39 100644
--- a/sci-geosciences/gpsbabel/Manifest
+++ b/sci-geosciences/gpsbabel/Manifest
@@ -9,21 +9,25 @@ AUX gpsbabel-fix_binary_name.patch 243 RMD160 14f29d660151cee9ae39103d6bdf4d17df
 AUX gpsbabel-freebsd.patch 278 RMD160 3b7428b611170325a5d9151de7fa50a363c5669d SHA1 fc3f73b0d65905cdbe38153bd90820cfa2c7347c SHA256 0e4c0ddbfe80cb8ec69645add9cc86323944d59de6f235ca18ccddc5945ccc22
 AUX gpsbabel-use_system_shapelib.patch 3553 RMD160 709f3171250d2d3712b26a6bd5af8f3a2af65338 SHA1 be9c1fb49604ac3d2035cbda506ca10c1784262d SHA256 1592a3b12326fe42cde8904e8bc24782a3ea64988263fdb5b3a0bfe5c38688b2
 AUX gpsbabel-xmldoc.patch 556 RMD160 6fc9f7cb88b715ec532c2b40c13005ccb304bd36 SHA1 0cb00c6e6db539216f03bea6d26f9cdf5428248f SHA256 5e27e885d2b52b4b4ef14d4e18fe75198604b272daa6325d35acb81fac247197
-DIST gpsbabel-1.4.2.tar.gz 5551502 RMD160 45987878b811f7b146511e859e89d0e28ccc1fb3 SHA1 e97f949716d786638af7235d7a2979bf50547426 SHA256 e93d7a6620d4048a781e82c26e287db3e1dc525d4b293479546cf9887bc2800a
 DIST gpsbabel-1.4.3.tar.gz 5616398 RMD160 9ff2fee17e978fe7248d1c0d45ff1c7ffe3775d1 SHA1 bd6266eeef38755d49e6dc17330b58c68e5a32d7 SHA256 c9b81ebbd65a34e7fe741c18985c1ead65123fd09fa0ecbf882bc47a87c4f5d8
 DIST gpsbabel.org-style3.css 2171 RMD160 f7ce950309146439945adeea18b1ea3cc4e6542d SHA1 84418b3fbad1f362b43be73ca811803625595def SHA256 3f87b917e014e94562b44070c2b885abeef56e6459ce08d2cac785db197964ff
-EBUILD gpsbabel-1.4.2.ebuild 1913 RMD160 781c9bf9fed68aa9e35418423907886446c3582b SHA1 43e481caa966f4c8aed63a84e23fe65b93ea3719 SHA256 7f3f2feb0fa5cb3079146782114ea171f1f2ea58dfc1e7648f5fbee4c9ad4ee4
-EBUILD gpsbabel-1.4.3.ebuild 1914 RMD160 d63a70290d164e57b6a57728f31a2e88ade8ae2e SHA1 4fca8d1b4ab40d07ce2587b528b6248387f863b5 SHA256 1d5ee6978cef3f32205980429e20e1b98d4d70a4f525cab847fde6bcffbb043d
-MISC ChangeLog 4945 RMD160 dc5b2315287da8788894dd635da981b54662501e SHA1 dd2f8d1dbcb1ae1a9eae11a9382b8a1251946f41 SHA256 20fdad939a136ab537c92daadbf5818b020db220bad726465022533bcc04f0f3
+EBUILD gpsbabel-1.4.3.ebuild 1912 RMD160 5cbbebae8869c9c48017f8d136b697360bce40c2 SHA1 c173be7c05b3f928d0cdeab9f8998534f3a20f05 SHA256 1a09b5e1b2a5ccebc7cc4e1d3f31455561928a91ccceb1604f1cc78861d44b16
+MISC ChangeLog 5099 RMD160 b0955cca3257780a5ae651db572eb2790e60f2ae SHA1 d18ffe6fa3dd9c8c840d78909db4ec916607d2e2 SHA256 ca7ae82af3f60abe34ec5e415cf9b8af8d1581dabd79b0e014b1fb453572b92b
 MISC metadata.xml 169 RMD160 e1db75ae5d177dffc400468c7d76a7e1fe41876d SHA1 0c953712f9b97d5ab3f95ae71997ffbc96c4007d SHA256 36837b011d26f0b83477c7a8632cb0099aedbcba5a3e45c61f20292e079f6180
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPupuwAAoJEEdUh39IaPFNJ/0H/i79ZfmkziflegmAMNpPS+PW
-yoaY7Br6hzrMLomuo1JpfQVsaiPRRMHkBoOkFi54zuM24CAvmxVixSWcaB+M636v
-ancdk6XmiIO27BGY8Oxf7oF3IkjTaERt0NbyuVCCGUQGin312RIdJ0LIvexE2J9i
-1MSd6a4nmwZtI740j0+Pf4XsvAWOnYwVe13YYOdQFnXJXmIx99gZaaF81OHsmWrj
-nMiMyCWVYnVZmgQYjGRx1S9y2TdR2oz2XwhXbPH43mIpEQBZ0j4hJTkMaapvqqdr
-ptAjpPajM5hWgjO8BqnKhMRHY6920kLh5cCEujVjUNTq0YalS1axJqFibsV8oTI=
-=zb/l
+iQIcBAEBAgAGBQJPvmMjAAoJEOSiRoyO7jvoIcYQAIfugman9NxkIXb+n1wC0b5z
+Imcua7grqNfWSPe5hxGB0K45DhcgEiAu7YScioDhhko4keosu5Tpaooi8zo4m2Bi
+8j+oR2qm3kMEy2DP9rfPx5nxGQzHPwtc8HX8Mr1sJUKJybxwb6UJ3FfTAA3IqCQV
+0z2F5GRzBJTPUmtQEWcspq7gfddHCAYP1UPw/+X1eVe4vT6EmH/vlqUPFnvLFe6e
+I5m/QG3LSVPONJ7otwK/LaUrL8cx126ibe1RodwPi7AaLpS3XUkFY2k5rrITlmDQ
+s2O/43jiUzjQ45g8+2hLc4lRlMzXMMT3Srwrs3DuTr+K/tFr1bFH2sbbbP6y0xJ3
+SwebZX2ugtnQy7YZNyNRS6w9Z2gahZk+4lrg+fs+SZO26tlS/jaihReKgfJF8C2K
+GADx4PT6j3Mc6d2cfBsy4xFoOkIcIZlvn498Vu7e0XpvTJOkbBlDtNFx8RXTKUDH
+Dg3qTe7HQNqKKRlJBkS6zhbJKbw8+vX+cKr583gVerS3Xvd3qCycjwX65jm8s6Mi
+c5Csfgiwdnq7RnHd7fPKrHL31r+sBR6iVTUqOj4WnyzZE6pA3M6rWMCGYTUP4nbA
+heXG6EBSrtsSYIbddronMOm+Fu+AbPrY5WGCmbgpGq/U361siP/RCiPsnzEYk8iO
+/ur8fexWBybnVJ5+97CI
+=jIK0
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.2.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.2.ebuild
deleted file mode 100644
index 24643b0053d4..000000000000
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.2.ebuild,v 1.4 2012/05/21 19:49:56 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils qt4-r2 base autotools
-
-DESCRIPTION="GPS waypoints, tracks and routes converter"
-HOMEPAGE="http://www.gpsbabel.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc qt4"
-
-RDEPEND="
-	dev-libs/expat
-	sci-libs/shapelib
-	virtual/libusb:0
-	qt4? (
-		x11-libs/qt-gui:4
-		x11-libs/qt-webkit:4
-	)
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		dev-libs/libxslt
-		app-text/docbook-xml-dtd:4.1.2
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-disable_statistic_uploading.patch"
-	"${FILESDIR}/${PN}-disable_update_check.patch"
-	"${FILESDIR}/${PN}-disable_version_check.patch"
-	"${FILESDIR}/${PN}-fix_binary_name.patch"
-	"${FILESDIR}/${PN}-freebsd.patch"
-	"${FILESDIR}/${PN}-use_system_shapelib.patch"
-	"${FILESDIR}/${PN}-xmldoc.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-	rm -rf shapelib || die
-
-	use doc && cp "${DISTDIR}/gpsbabel.org-style3.css" "${S}"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with doc doc "${S}"/doc/manual) \
-		--with-zlib=system
-
-	if use qt4; then
-		pushd "${S}/gui" > /dev/null
-		lrelease *.ts || die
-		eqmake4
-		popd > /dev/null
-	fi
-}
-
-src_compile() {
-	emake
-	if use qt4; then
-		pushd "${S}/gui" > /dev/null
-		emake
-		popd > /dev/null
-	fi
-
-	if use doc; then
-		perl xmldoc/makedoc
-		emake gpsbabel.html
-	fi
-}
-
-src_install() {
-	default
-	dodoc README*
-
-	if use qt4; then
-		dobin gui/objects/gpsbabelfe
-		insinto /usr/share/qt4/translations/
-		doins gui/gpsbabel*_*.qm
-		newicon gui/images/appicon.png ${PN}.png
-		make_desktop_entry gpsbabelfe ${PN} ${PN} "Science;Geoscience"
-	fi
-
-	if use doc; then
-		dohtml gpsbabel.*
-	fi
-}
diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
index 867c37e975be..6b035853b80c 100644
--- a/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
+++ b/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild,v 1.2 2012/05/21 19:49:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsbabel/gpsbabel-1.4.3.ebuild,v 1.3 2012/05/24 16:34:36 scarabeus Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc qt4"
 
 RDEPEND="