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 CF2C51382FE for ; Tue, 12 Jul 2016 05:25:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 208C7E0A86; Tue, 12 Jul 2016 05:25:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 9E9D6E0A86 for ; Tue, 12 Jul 2016 05:25:41 +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 1F3A1340E9C for ; Tue, 12 Jul 2016 05:25:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9D71E60 for ; Tue, 12 Jul 2016 05:25:37 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1468301101.dbae9a64201ff5546f5cd3e56d7623eb5fc8a115.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-radio/xastir/, media-radio/xastir/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-radio/xastir/Manifest media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff media-radio/xastir/files/xastir-2.0.8-scripts.diff media-radio/xastir/xastir-2.0.8.ebuild X-VCS-Directories: media-radio/xastir/ media-radio/xastir/files/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: dbae9a64201ff5546f5cd3e56d7623eb5fc8a115 X-VCS-Branch: master Date: Tue, 12 Jul 2016 05:25:37 +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: 71cad034-2ceb-4c00-9cee-db6e7c6f0526 X-Archives-Hash: 919edab8880255f9a08651cf00603ebe commit: dbae9a64201ff5546f5cd3e56d7623eb5fc8a115 Author: Thomas Beierlein gentoo org> AuthorDate: Tue Jul 12 05:25:01 2016 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Tue Jul 12 05:25:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbae9a64 media-radio/xastir: Version bump Package-Manager: portage-2.3.0 media-radio/xastir/Manifest | 1 + .../files/xastir-2.0.8-no-builtin-shapelib.diff | 58 ++++++++++++++ media-radio/xastir/files/xastir-2.0.8-scripts.diff | 91 ++++++++++++++++++++++ media-radio/xastir/xastir-2.0.8.ebuild | 85 ++++++++++++++++++++ 4 files changed, 235 insertions(+) diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest index b630719..bdf87d5 100644 --- a/media-radio/xastir/Manifest +++ b/media-radio/xastir/Manifest @@ -1 +1,2 @@ DIST xastir-2.0.6.tar.gz 2662042 SHA256 e46debd3f67ea5c08e2f85f03e26653871a9cdd6d692c8eeee436c3bc8a8dd43 SHA512 422bfd5c243ce2761279908b2294f94598df4e51e8dc9eea1eede12c460934c97392e8d99d40d67d92b4e31fe09806e9c33190e146696a49d968df6562e858f3 WHIRLPOOL 39a097dba585d5bcdcdb880ddb5e530eb118bd1645abf911948ed2c0b562a4b12cf4b453b0295db1f37d00380873440e251466f7b12440cd41f50578ae90f170 +DIST xastir-2.0.8.tar.gz 2697256 SHA256 775db0e3c4355051a9030b8398a1d995d48b3b721fa1c9bce5e3010300c1ebb6 SHA512 fd98a880392e9fcb049c6049ebc6a6a5e600571b7b59fd7061a72404abd68530ae6f152c9eabdc39be0458b33b363ce7fa3fdd5330003298bca8eaac62a6982f WHIRLPOOL 970750a3cc0d1ab51bd754450ab348a88efba26d6e8e3c3ced95b9885e63dffbc2d4ed94ced42d1a309b2fa8d23f203fb98bae6021c5556d3e39bcc79835be89 diff --git a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff new file mode 100644 index 0000000..8cbdbc2 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff @@ -0,0 +1,58 @@ +--- configure.ac.orig 2016-07-12 07:08:17.988160777 +0200 ++++ configure.ac 2016-07-12 07:11:42.591138389 +0200 +@@ -382,27 +382,17 @@ + + # Check for Shapelib + use_shapelib=yes +-force_internal_shapelib=no + shapelib_desired=yes + LIBSHP="" + SUBSHP="" + # This symbol will be blank if the proj library hasn't been found, and will + # have the three programs that need proj if it has + CONTSHP="" +-AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval) + AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval) + if test "${shapelib_desired}" = "no"; then + use_shapelib=no +- force_internal_shapelib=no + fi +-if test "${force_internal_shapelib}" = "yes"; then +- AC_MSG_WARN([***************************************************************** ]) +- AC_MSG_WARN([Internal Shapelib library has been forced. ]) +- AC_MSG_WARN([***************************************************************** ]) +- # Temporary setting to get into if block below +- use_shapelib=no +-fi +-if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then ++if test "${shapelib_desired}" = "yes" ; then + use_shapelib=no + AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes + LIBS="$LIBS -lshp" +@@ -411,26 +401,6 @@ + AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) + break)]) + fi +-if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then +- AC_MSG_WARN([**************************************************************** ]) +- AC_MSG_WARN([Your system does not have shapelib installed. Using an internal ]) +- AC_MSG_WARN([version. This may lead to a larger filesize for the executable. ]) +- AC_MSG_WARN([Install shapelib on your system to eliminate this warning. ]) +- AC_MSG_WARN([**************************************************************** ]) +- LIBSHP="-Lshapelib -lshape" +- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS" +- SUBSHP="shapelib" +- use_shapelib=yes +- force_internal_shapelib=yes +- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) +- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) +- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. ) +- +- if test $use_proj = "yes" +- then +- CONTSHP="shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT) shpwkb$(EXEEXT)" +- fi +-fi + AC_SUBST(SUBSHP) + AC_SUBST(CONTSHP) + AC_SUBST(LIBSHP) diff --git a/media-radio/xastir/files/xastir-2.0.8-scripts.diff b/media-radio/xastir/files/xastir-2.0.8-scripts.diff new file mode 100644 index 0000000..35c7324 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-scripts.diff @@ -0,0 +1,91 @@ +# patch scripts location (bug #407185). partially backported from upstream. +--- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27 05:41:23.000000000 +0100 ++++ xastir-2.0.0/scripts/Makefile.am 2012-12-05 06:21:59.000000000 +0100 +@@ -43,10 +41,8 @@ + values \ + values.pl \ + waypoint-get.pl \ +- xastir-fixcfg.sh \ +- xastir-migrate.sh \ + Xastir_tigerpoly.py + + install-data-hook: + cd $(DESTDIR)$(scriptsdir) && \ +- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash ++ chmod a+x *.pl *.py get-* gpx2* *.bash +diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl +--- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000 ++++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000 +@@ -26,7 +26,7 @@ + # + + +-use lib "${prefix}/lib"; ++use lib /usr/share/xastir/scripts; + use Coordinate; # WE7U's Coordinate.pm module + + +diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl +--- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000 ++++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000 +@@ -34,7 +34,7 @@ + # + + +-use lib "/usr/local/lib"; ++use lib "/usr/share/xastir/scripts"; + use Coordinate; # WE7U's Coordinate.pm module + + +diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl +--- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000 +@@ -33,7 +33,7 @@ + + #------------------------------------------------------------------------------------------------ + +-use lib "/usr/local/lib"; ++use lib "/usr/share/xastir/scripts"; + use Coordinate; # Snag WE7U's Coordinate module + + +diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl +--- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000 +@@ -28,14 +28,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local/share/xastir/maps" ++# - "cd /usr/share/xastir/maps" + # + # - Assure you have write privileges in the directory above either + # by becoming root using the "su" command, using "sudo", or + # temporarily changing ownership and/or privileges on the + # "maps" directory. + # +-# - "/usr/local/lib/xastir/toporama250k.pl" ++# - "/usr/share/xastir/scripts/toporama250k.pl" + # + # - The script will create/populate this directory heirarchy: + # .../maps/toporama/images/ +diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl +--- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000 +@@ -27,14 +27,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local/share/xastir/maps" ++# - "cd /usr/share/xastir/maps" + # + # - Assure you have write privileges in the directory above either + # by becoming root using the "su" command, using "sudo", or + # temporarily changing ownership and/or privileges on the + # "maps" directory. + # +-# - "/usr/local/lib/xastir/toporama50k.pl" ++# - "/usr/share/xastir/scripts/toporama50k.pl" + # + # - The script will create/populate this directory heirarchy: + # .../maps/toporama/images/ diff --git a/media-radio/xastir/xastir-2.0.8.ebuild b/media-radio/xastir/xastir-2.0.8.ebuild new file mode 100644 index 0000000..a69122e --- /dev/null +++ b/media-radio/xastir/xastir-2.0.8.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils flag-o-matic toolchain-funcs + +DESCRIPTION="X Amateur Station Tracking and Information Reporting" +HOMEPAGE="http://xastir.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="festival gdal geotiff graphicsmagick" + +DEPEND=">=x11-libs/motif-2.3:0 + x11-libs/libXt + x11-libs/libX11 + x11-libs/libXpm + x11-apps/xfontsel + dev-libs/libpcre + net-misc/curl + sys-libs/db:4.8 + sci-libs/shapelib + !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) + graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) + geotiff? ( sci-libs/proj + sci-libs/libgeotiff + media-libs/tiff:0 ) + gdal? ( sci-libs/gdal ) + festival? ( app-accessibility/festival )" +RDEPEND="${DEPEND}" + +src_prepare() { + # fix script location (bug #407185) + epatch "${FILESDIR}"/${P}-scripts.diff + + # fix __FORTIFY_SOURCE warning (bug #337365) + epatch "${FILESDIR}"/${PN}-2.0.4-fortify.diff + + # do not use builtin shapelib if sci-libs/shapelib is not installed + # instead build without shapelib support (bug #430704) + epatch "${FILESDIR}"/${P}-no-builtin-shapelib.diff + + # do not filter duplicate flags (see bug 411095) + epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff + + eautoreconf +} + +src_configure() { + # provide include path to GraphicsMagic for configure stage + use graphicsmagick && append-cflags -I/usr/include/GraphicsMagick + econf --with-pcre \ + --with-shapelib \ + --with-dbfawk \ + --without-ax25 \ + --without-gpsman \ + $(use_with !graphicsmagick imagemagick) \ + $(use_with graphicsmagick) \ + $(use_with geotiff libproj) \ + $(use_with geotiff) \ + $(use_with gdal) \ + $(use_with festival) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + emake DESTDIR="${D}" install + + rm -rf "${D}"/usr/share/doc/${PN} + dodoc AUTHORS ChangeLog FAQ README README.Contributing \ + README.Getting-Started README.MAPS +} + +pkg_postinst() { + elog "Kernel mode AX.25 and GPSman library not supported." + elog + elog "Remember you have to be root to add addditional scripts," + elog "maps and other configuration data under /usr/share/xastir." +}