From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 018AA139694 for ; Fri, 10 Mar 2017 01:15:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E00DE0C9A; Fri, 10 Mar 2017 01:15:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D18BE0C9A for ; Fri, 10 Mar 2017 01:15:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9CFA341421 for ; Fri, 10 Mar 2017 01:15:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23AC962CC for ; Fri, 10 Mar 2017 01:15:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1489108520.117d90998da0fe7b1128b6638e3b74515ac6fa4c.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/gpsbabel/, sci-geosciences/gpsbabel/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/gpsbabel/Manifest sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild X-VCS-Directories: sci-geosciences/gpsbabel/files/ sci-geosciences/gpsbabel/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 117d90998da0fe7b1128b6638e3b74515ac6fa4c X-VCS-Branch: master Date: Fri, 10 Mar 2017 01:15:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 868f8522-a3ad-485e-a9cf-327957c86065 X-Archives-Hash: a9a9886d8d3d28dc908344898b11dffd commit: 117d90998da0fe7b1128b6638e3b74515ac6fa4c Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Mar 10 01:15:20 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Mar 10 01:15:20 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117d9099 sci-geosciences/gpsbabel: Drop old Package-Manager: Portage-2.3.3, Repoman-2.3.1 sci-geosciences/gpsbabel/Manifest | 1 - .../gpsbabel-disable_statistic_uploading.patch | 12 --- .../files/gpsbabel-disable_update_check.patch | 110 --------------------- .../files/gpsbabel-disable_version_check.patch | 47 --------- .../gpsbabel/files/gpsbabel-freebsd.patch | 11 --- .../files/gpsbabel-use_system_shapelib.patch | 76 -------------- .../gpsbabel/files/gpsbabel-xmldoc.patch | 14 --- sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild | 100 ------------------- 8 files changed, 371 deletions(-) diff --git a/sci-geosciences/gpsbabel/Manifest b/sci-geosciences/gpsbabel/Manifest index 3ea15a21663..4fc921d511f 100644 --- a/sci-geosciences/gpsbabel/Manifest +++ b/sci-geosciences/gpsbabel/Manifest @@ -1,3 +1,2 @@ -DIST gpsbabel-1.4.4.tar.gz 7811264 SHA256 9dd2a06e887cb286c9a07164a8f2ede11aed1147e6419007370c528412321944 SHA512 07b12dfe2127a399d973fa793fe3437cbda8f3425f3317100767b7fda549d9ea6bdda1429822ade671e219c99d95bc7feb16a8d177779b457aafb373141c515a WHIRLPOOL 576c60b0868648500552b4058c385af7912d0eaf1f63541cbcdf568c5dc96f46a5f204a981e525eced267a2060aeb4f04935ae45f67f0236c03f57f3a52bfaf9 DIST gpsbabel-1.5.4.tar.gz 9099765 SHA256 59e29b83a16af16556fffc9315d3d3626d11fc7f2f50d6ec1f99dfc64412989e SHA512 5fdc3bc07ad52d6c1e3532b287dcb506aba612ae9bc8db393b4837d79d773d6e22ad31f8f8e65770ec52b1afbda556e452af20dada1e411de93ca6e18054225b WHIRLPOOL a3de57048f43582fa64b85a3d37de5d378226842c7eca634f4334481f3dbbc99cee8b9d14bccb949fdc1976116a5b9bcc6318033138501e197c44b48cc244aec DIST gpsbabel.org-style3.css 2171 SHA256 3f87b917e014e94562b44070c2b885abeef56e6459ce08d2cac785db197964ff SHA512 33b843e0431de6d71a83c58da35ede28435e5a4746f59e52350c6e4451659e1b443d3c0dd52df1c68001e9937787820fb96afc363ec1ae7d23430bfed31dbc83 WHIRLPOOL 419e1b8c386e3cbf96247ec231873bb0263e35e540451dfcda50e6c6f6452cef03825f527e3c970e452600d869721260e7970dabbe89070b9117d09c95da815a diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch deleted file mode 100644 index 2d26f64aa13..00000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_statistic_uploading.patch +++ /dev/null @@ -1,12 +0,0 @@ -Make statistics reporting an opt-in option. ---- a/gui/babeldata.h -+++ b/gui/babeldata.h -@@ -64,7 +64,7 @@ public: - upgradeOffers(0), - runCount(0), - startupVersionCheck(true), -- reportStatistics(true), -+ reportStatistics(false), - allowBetaUpgrades(false), - ignoreVersionMismatch(true), - disableDonateDialog(false), diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch deleted file mode 100644 index a429fdf1fba..00000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_update_check.patch +++ /dev/null @@ -1,110 +0,0 @@ -Disable check for newer versions on start. - ---- a/gui/preferences.ui -+++ b/gui/preferences.ui -@@ -40,13 +40,6 @@ - - - -- -- -- Check for newer version on start. -- -- -- -- - - - Anonymously report usage data. ---- a/gui/preferences.cpp -+++ b/gui/preferences.cpp -@@ -39,7 +39,6 @@ Preferences::Preferences(QWidget* parent - { - ui_.setupUi(this); - -- ui_.startupCheck->setChecked(bd_.startupVersionCheck); - ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics); - // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. - if (VERSION == "1.4.1") -@@ -81,7 +80,6 @@ void Preferences::acceptClicked() - formatList_[i].setHidden(item->checkState() == Qt::Unchecked); - } - -- bd_.startupVersionCheck = ui_.startupCheck->isChecked(); - bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked(); - accept(); - } ---- a/gui/babeldata.h -+++ b/gui/babeldata.h -@@ -63,7 +63,7 @@ public: - upgradeErrors(0), - upgradeOffers(0), - runCount(0), -- startupVersionCheck(true), -+ startupVersionCheck(false), - reportStatistics(false), - allowBetaUpgrades(false), - ignoreVersionMismatch(true), ---- a/gui/mainwinui.ui -+++ b/gui/mainwinui.ui -@@ -641,7 +641,6 @@ - - - -- - - - -@@ -670,11 +669,6 @@ - Preferences... - - -- -- -- Check for Upgrade -- -- - - - Visit Website... ---- a/gui/mainwindow.cpp -+++ b/gui/mainwindow.cpp -@@ -153,7 +153,6 @@ MainWindow::MainWindow(QWidget* parent): - connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT(aboutActionX())); - connect(ui.actionVisit_Website, SIGNAL(triggered()), this, SLOT(visitWebsiteActionX())); - connect(ui.actionMake_a_Donation, SIGNAL(triggered()), this, SLOT(donateActionX())); -- connect(ui.actionUpgradeCheck, SIGNAL(triggered()), this, SLOT(upgradeCheckActionX())); - connect(ui.actionPreferences, SIGNAL(triggered()), this, SLOT(preferencesActionX())); - - connect(ui.inputFormatCombo, SIGNAL(currentIndexChanged(int)), -@@ -197,19 +196,8 @@ MainWindow::MainWindow(QWidget* parent): - - //--- Restore from registry - restoreSettings(); -- - upgrade = new UpgradeCheck(parent, formatList, bd); -- if (bd.startupVersionCheck) { -- upgrade->checkForUpgrade(babelVersion, bd.upgradeCheckTime, -- allowBetaUpgrades()); -- } -- -- if (!bd.ignoreVersionMismatch && babelVersion != VERSION) { -- VersionMismatch vm(0, babelVersion, QString(VERSION)); - -- vm.exec(); -- bd.ignoreVersionMismatch = vm.neverAgain(); -- } - } - - //------------------------------------------------------------------------ -@@ -926,10 +914,6 @@ void MainWindow::applyActionX() - //------------------------------------------------------------------------ - void MainWindow::closeActionX() - { -- QDateTime wt= upgrade->getUpgradeWarningTime(); -- if (wt.isValid()) { -- bd.upgradeCheckTime = wt; -- } - bd.runCount++; - - QDateTime now = QDateTime::currentDateTime(); diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch b/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch deleted file mode 100644 index b4bd1a9e2a7..00000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-disable_version_check.patch +++ /dev/null @@ -1,47 +0,0 @@ -Disable version mismatch check. - ---- a/gui/preferences.ui -+++ b/gui/preferences.ui -@@ -53,13 +53,6 @@ - - - -- -- -- -- Ignore mismatch between command line and GUI version. -- -- -- - - - ---- a/gui/preferences.cpp -+++ b/gui/preferences.cpp -@@ -41,7 +41,6 @@ Preferences::Preferences(QWidget* parent - - ui_.startupCheck->setChecked(bd_.startupVersionCheck); - ui_.reportStatisticsCheck->setChecked(bd_.reportStatistics); -- ui_.ignoreVersionMismatchCheck->setChecked(bd_.ignoreVersionMismatch); - // Because of an unfortunate bug in 1.4.0, we turn this off in 1.4.1. - if (VERSION == "1.4.1") - bd_.ignoreVersionMismatch = false; -@@ -84,7 +83,6 @@ void Preferences::acceptClicked() - - bd_.startupVersionCheck = ui_.startupCheck->isChecked(); - bd_.reportStatistics = ui_.reportStatisticsCheck->isChecked(); -- bd_.ignoreVersionMismatch = ui_.ignoreVersionMismatchCheck->isChecked(); - accept(); - } - ---- a/gui/babeldata.h -+++ b/gui/babeldata.h -@@ -66,7 +66,7 @@ public: - startupVersionCheck(true), - reportStatistics(true), - allowBetaUpgrades(false), -- ignoreVersionMismatch(false), -+ ignoreVersionMismatch(true), - disableDonateDialog(false), - donateSplashed(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0))) - { diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch b/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch deleted file mode 100644 index 2467c2ee041..00000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-freebsd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2009-11-17 15:32:05.846189916 +0200 -+++ configure.in 2009-11-17 15:33:11.111187610 +0200 -@@ -277,7 +276,7 @@ - fi - ;; - *-gentoo-freebsd*) -- EXPAT_LIB=-lexpa -+ EXPAT_LIB=-lexpat - ;; - *-*-freebsd*) - if test -f /usr/local/lib/libexpat.a ; then diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch b/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch deleted file mode 100644 index 68ea430e368..00000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-use_system_shapelib.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -urN gpsbabel-1.4.2.old/configure.in gpsbabel-1.4.2/configure.in ---- gpsbabel-1.4.2.old/configure.in 2011-06-10 10:30:54.888410566 +0200 -+++ gpsbabel-1.4.2/configure.in 2011-06-10 10:42:08.800985499 +0200 -@@ -421,6 +421,6 @@ - else - AC_MSG_RESULT(no) - fi --AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty]) -+AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) - AC_OUTPUT - -diff -urN gpsbabel-1.4.2.old/Makefile.in gpsbabel-1.4.2/Makefile.in ---- gpsbabel-1.4.2.old/Makefile.in 2011-06-10 10:30:54.899410428 +0200 -+++ gpsbabel-1.4.2/Makefile.in 2011-06-10 10:43:13.973170735 +0200 -@@ -87,7 +87,7 @@ - - @PALM_DB_CMT@PALM_DB=pdbfile.o - --SHAPE=shapelib/shpopen.o shapelib/dbfopen.o -+SHAPE=-lshp - - ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ - zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ -@@ -98,7 +98,7 @@ - uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \ - inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \ - gbfile.o parse.o avltree.o session.o \ -- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS) -+ $(PALM_DB) $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS) - OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@ - - .c.o: -@@ -113,10 +113,10 @@ - all: gpsbabel$(EXEEXT) - - gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ -- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - gpsbabel-debug: $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(SHAPE) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ - - Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \ - gbversion.h.in gui/setup.iss.in -@@ -818,8 +818,7 @@ - session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ - zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h - shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ -- zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ -- shapelib/shapefil.h -+ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h - skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ - zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h - skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ -@@ -1092,8 +1091,6 @@ - jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ - jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ - jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h --shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h --shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h - zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h - zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h - zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ -diff -urN gpsbabel-1.4.2.old/shape.c gpsbabel-1.4.2/shape.c ---- gpsbabel-1.4.2.old/shape.c 2011-06-10 10:30:54.932410016 +0200 -+++ gpsbabel-1.4.2/shape.c 2011-06-10 10:42:08.802985475 +0200 -@@ -20,7 +20,7 @@ - - */ - #include "defs.h" --#include "shapelib/shapefil.h" -+#include - - #if SHAPELIB_ENABLED - static SHPHandle ihandle; diff --git a/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch b/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch deleted file mode 100644 index 2373fe125c8..00000000000 --- a/sci-geosciences/gpsbabel/files/gpsbabel-xmldoc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-xmldoc/Makefile.in ---- gpsbabel-1.4.2/Makefile.in 2011-01-11 17:57:47.075777307 +0100 -+++ gpsbabel-1.4.2-xmldoc/Makefile.in 2011-01-11 17:58:53.134094491 +0100 -@@ -234,8 +234,8 @@ - xsltproc \ - --output $@ \ - --stringparam toc.section.depth "1" \ -- --stringparam html.stylesheet \ -- "http://www.gpsbabel.org/style3.css" \ -+ --nonet \ -+ --stringparam html.stylesheet "gpsbabel.org-style3.css" \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl \ - xmldoc/readme.xml - diff --git a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild b/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild deleted file mode 100644 index dae61aaa742..00000000000 --- a/sci-geosciences/gpsbabel/gpsbabel-1.4.4.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils qt4-r2 autotools - -DESCRIPTION="GPS waypoints, tracks and routes converter" -HOMEPAGE="http://www.gpsbabel.org/" -SRC_URI=" - https://dev.gentoo.org/~patrick/${P}.tar.gz - doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )" -LICENSE="GPL-2" - -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~x86-fbsd" -IUSE="doc qt4" - -RDEPEND=" - dev-libs/expat - sci-libs/shapelib - virtual/libusb:0 - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtwebkit: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}-1.4.3-fix_binary_name.patch" - "${FILESDIR}/${PN}-freebsd.patch" - "${FILESDIR}/${PN}-use_system_shapelib.patch" - "${FILESDIR}/${PN}-xmldoc.patch" -) - -RESTRICT="test" # bug 421699 - -src_prepare() { - epatch "${PATCHES[@]}" - epatch_user - 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 || die - lrelease *.ts || die - eqmake4 - popd > /dev/null - fi -} - -src_compile() { - emake - if use qt4; then - pushd "${S}/gui" > /dev/null || die - emake - popd > /dev/null - fi - - if use doc; then - perl xmldoc/makedoc || die - 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 -}