fix deprectated AM_CONFIG_HEADER macro. remove old

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

4 files changed, 14 insertions, 92 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index 6a88649d24fa..48936ef23c5e 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/xastir
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.33 2013/01/25 20:01:49 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.34 2013/05/10 16:27:03 tomjbe Exp $
+
+  10 May 2013; Thomas Beierlein <tomjbe@gentoo.org> -xastir-2.0.0-r1.ebuild,
+  xastir-2.0.4.ebuild:
+  fix deprectated AM_CONFIG_HEADER macro. remove old
 
   25 Jan 2013; Thomas Beierlein <tomjbe@gentoo.org> xastir-2.0.4.ebuild:
   Respect AR (bug #453244). Thanks ago.
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index ea01fcd9d94e..ede585eefaa7 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -14,15 +14,14 @@ AUX xastir-2.0.4-no-builtin-shapelib.diff 2552 SHA256 599ed97bd2e1a60ccbff5a04fd
 AUX xastir-2.0.4-scripts.diff 3589 SHA256 c9016531585c45c0259d8b5cd04d8cf5102c0eee1c29e36812f5ad5309c4c4dd SHA512 c2647694e71c75f702d98ef9ff9743bc711a692e67994cf1a650405f9800c3bd1c463ed9d70f2042191873842029c1b15735b291a52a55b3bdd2d22cb7a55eb8 WHIRLPOOL e36c952216ebfb8dd7f0280a7296616373b6b589520c158e3700e4835bfacb52d4f86b5e57a88c142f53384ccbe09cdc68518a6f10d07a46f5d1890393a934db
 DIST xastir-2.0.0.tar.gz 2544827 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281 SHA512 60051a1cf9a49b172fe13340f82b73426bed11b7b785f91c8d33f69b03ef03a19443ec02c9cc86c0bad990266fcb7edc170b8a70883cca85095edebd65453e63 WHIRLPOOL 3edce24e200d5695c31f58fa3cb70a6d0187105af9205c2d46402c9c0181a3954a3321e17a6b57345fa9927cc558729bb7b68751e1f2c537fb81b143cf4c3c23
 DIST xastir-2.0.4.tar.gz 2655250 SHA256 975f1cbe1ee32334e579588dcf2e19bcc607ad7b5f9d0848075f6d283d65af86 SHA512 766124ae717742e93bef24cd4c84946e146c3ba8a61775afada25a1c60f225edf91fc8eb4f59881564b14187e523c98a07d515adea74d73e03e2ab10dbae92b3 WHIRLPOOL 640616e698e2e3cfe2bdd6619ac601017c37d4d18cd1fa3ab5391ade170b6108a845a4fe2860b618a5cd2281e884399874b554c3960e1f5ad6420f016c88260c
-EBUILD xastir-2.0.0-r1.ebuild 2306 SHA256 502ad679f36eef7b98540018295224e612954b043456b30f90886a16f4a0116e SHA512 f297363236006811af276d8efcbf36d654f9e0bdf3285fc4dce904e3d45367c85fa3c83cc2420ebc11e2912d36d676260fbd5a842e586359dbe9489c90d5b768 WHIRLPOOL 80642be5ac9254c5e3859f9ae010d3cdb8e1a3accf850f34b4d5f1818ba6440d6a011aaf9309e80b5480767cd6d252bd0bf78e8e0f673a0bcc5bce5ec25aa259
 EBUILD xastir-2.0.0-r2.ebuild 2307 SHA256 13593d705b4328ddbb6e51ff50710386ba098bdc900151244aafc3ab2f339cda SHA512 5df2c6f7a00f35f1b4616e74d7a447c4f2ffce5e8e1715de9a0a610884aff635c93446a86ebc0e3b90ccab796f9bad9778df66732bce35d4b1e8aa1303b7391e WHIRLPOOL 69fc8f042b922943996a4f7792e6c9239a6f376d40b2bf65f91b855a689247d54a1676448c1610b5d9b462c0d5a6890f8e7a7fee455bfb7730288d5321b8b003
-EBUILD xastir-2.0.4.ebuild 2169 SHA256 673d71edf8c3784b91763bf8321074e303bbb995edf3bb5cc56bdbe707f1afd6 SHA512 c6b6dc6cdaecc9a31acd96bff4078f8c32f8259e83add33341412a2750f215e27e804b142217ada8ed7885f1758cf5c60aefc08bfee6a99aeb855c347460e262 WHIRLPOOL eccc2ce1f2503448df9fda42ab7574afc526c4724baf0311b2f26baee0e0ffb0c013a8f3eed67f60fde2322f6a2d620f8d4b9f88313e1f30be5ebeec2991bdf0
-MISC ChangeLog 3904 SHA256 678c1edebf892a7371d6e8b8860529ef6358c482ef336037faae25a8e143df08 SHA512 9f7cbd4aef97835f95a7d95104e98f13223271398e4b756a0bcedb9bb2f2cfe0b8dc2799b9762c604a9c8f985472243f82f596d9508947fc7438f9291e04e07f WHIRLPOOL a525f4f98e929c60fdf30b204f7fdf65699eb2badc829ecd461111e7ba72357fc57f98a0cacc7c753cbbc94932877974fee1183d854dffcf1f60939ed6d1f601
+EBUILD xastir-2.0.4.ebuild 2283 SHA256 d8d8c1e427b5c332cd9208b1838a85833f9f029c2d10d9ee572f4b606ca29040 SHA512 377a9c87fd2df285594df7c93b8b0f1d25439bae64ae3dca99f00a223092e60404399b29c96235cbb94bbe8f88bfdf22a7ced0753bcb32e94cf4702ca001d392 WHIRLPOOL 66a67ce46cb29cf3934971a386ea5c54fea66944a69793fdd519a89d758efeda74f43aa2e28d857a7fde0e5c0c7cfe5b53413bc2a7e90f390a733d9193c16777
+MISC ChangeLog 4058 SHA256 7ad68ddf72415dd5da5987d48dd9142cba6d0c15f7cd8b3ad96cacad8d46e85b SHA512 801e5d63d42fbae6bccb1d412fdc6fee5a7d4485e31eb0086391527e486dd220b8d2484921348c9c5ceda3d1767d0b2c352b903e144a98609d6fef61c6d474d8 WHIRLPOOL bd839a7e8c5dfd3ebd982e5a32fa3c64f1ef00aefea3a77371d7d268e50481dcf2dff2b26dc6f9b02a77b8c0a7fcfc701e8d6c5f04ef333a6fa05fb78246c335
 MISC metadata.xml 601 SHA256 9c8d4aeeaa3a07d451671c9646a777c7029fd5ab09217b00b85e6571571f1773 SHA512 371ee7f590a846b095776f687c7bbb3920509923949121872875b8fa7ab22912cf806019998e16ea8443e2efdff3734ec9dbb8aaf9737bd17556eacae9478fa8 WHIRLPOOL d2de0305aee8d707a736a4d03b972a2470cd6dec1f34a1c011e0ef7d62fa42d34a61dab74658e8ae93ad5995768af5cf202a711fcc6c5e51cedaec5426cf68cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEC5LgACgkQQe4uqXYgU9W7VgCfXq8DNzob7/zHxvlCxfsmQfjg
-foMAoNzwet9KCMl8ip59b1Ef8fKnoRTN
-=Tl/I
+iEYEAREIAAYFAlGNH+EACgkQQe4uqXYgU9Vg9QCdFbgdtlqkWBf1lgo34RtPkvBy
+k68AoJsSJs907ekoJ1PQ5gCqHybWSfKB
+=1Kj2
 -----END PGP SIGNATURE-----
diff --git a/media-radio/xastir/xastir-2.0.0-r1.ebuild b/media-radio/xastir/xastir-2.0.0-r1.ebuild
deleted file mode 100644
index aa27e884f855..000000000000
--- a/media-radio/xastir/xastir-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r1.ebuild,v 1.5 2012/10/24 19:15:33 ulm Exp $
-
-EAPI=2
-inherit autotools eutils multilib
-
-DESCRIPTION="X Amateur Station Tracking and Information Reporting"
-HOMEPAGE="http://xastir.sourceforge.net/"
-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/libXpm
-	x11-apps/xfontsel
-	dev-libs/libpcre
-	net-misc/curl
-	sys-libs/db
-	sci-libs/shapelib
-	!graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] )
-	graphicsmagick? ( media-gfx/graphicsmagick[-q32] )
-	geotiff? ( sci-libs/proj
-		sci-libs/libgeotiff
-		media-libs/tiff )
-	gdal? ( sci-libs/gdal )
-	festival? ( app-accessibility/festival )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix hardcoded /usr/local paths in scripts
-	epatch "${FILESDIR}"/${PN}-1.9.8-scripts.diff
-	# and patch libdir
-	for f in scripts/permutations.pl scripts/test_coord.pl \
-		scripts/toporama250k.pl scripts/toporama50k.pl; do
-		sed -i -e "s:/usr/lib:/usr/$(get_libdir):g" "${f}" \
-			|| die "sed failed on ${f}"
-	done
-
-	# fix __FORTIFY_SOURCE warning (bug #337365)
-	epatch 	"${FILESDIR}"/${PN}-1.9.8-fortify.diff
-
-	# fix for DESTDIR
-	epatch 	"${FILESDIR}"/${P}-Destdir.diff
-
-	# fix breakage with >=sci-libs/proj-4.8
-	epatch "${FILESDIR}"/${P}-proj48.diff
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --without-graphicsmagick \
-		--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_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	rm -rf "${D}"/usr/share/doc/${PN}
-	dodoc AUTHORS ChangeLog FAQ README README.Contributing \
-		README.Getting-Started README.MAPS || die "dodoc failed"
-}
-
-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"
-	elog "and /usr/$(get_libdir)/xastir."
-}
diff --git a/media-radio/xastir/xastir-2.0.4.ebuild b/media-radio/xastir/xastir-2.0.4.ebuild
index ab7c93209e99..e658c5d88208 100644
--- a/media-radio/xastir/xastir-2.0.4.ebuild
+++ b/media-radio/xastir/xastir-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.4.ebuild,v 1.4 2013/01/25 20:01:49 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.4.ebuild,v 1.5 2013/05/10 16:27:03 tomjbe Exp $
 
 EAPI=4
 inherit autotools eutils toolchain-funcs
@@ -46,6 +46,9 @@ src_prepare() {
 	# do not filter duplicate flags (see bug 411095)
 	epatch "${FILESDIR}"/${PN}-2.0.0-dont-filter-flags.diff
 
+	# fix deprectated AM_CONFIG_HEADER macro
+	sed -i -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die
+
 	eautoreconf
 }