Version bump. Remove old version.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

4 files changed, 16 insertions, 49 deletions

diff --git a/media-radio/fldigi/ChangeLog b/media-radio/fldigi/ChangeLog
index 7766a693c718..ebf65d9d4a84 100644
--- a/media-radio/fldigi/ChangeLog
+++ b/media-radio/fldigi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-radio/fldigi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/ChangeLog,v 1.8 2010/09/12 15:22:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/ChangeLog,v 1.9 2010/11/17 12:27:22 tomjbe Exp $
+
+*fldigi-3.20.29 (17 Nov 2010)
+
+  17 Nov 2010; Thomas Beierlein <tomjbe@gentoo.org> -fldigi-3.12.5.ebuild,
+  -files/fldigi-3.12.5-libpng14.patch, +fldigi-3.20.29.ebuild:
+  Version bump. Remove old versions
 
   12 Sep 2010; Markos Chandras <hwoarang@gentoo.org> fldigi-3.20.21.ebuild:
   Stable on amd64 wrt bug #335263
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 099874f0af5e..3789fe68ecdc 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,20 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX fldigi-3.12.5-libpng14.patch 336 RMD160 89cf0018921a3b554933be3ece0d9d6c7e151b13 SHA1 ae8c65c6668c675f92cb0ddec558e6eecdd76f92 SHA256 d4124a3652623d175f1a1cb6538cbd4df4ebd9fe6a19ca639ed87b490cb85f77
-DIST fldigi-3.12.5.tar.gz 1264031 RMD160 700dcb9c0214ccb4c704afa7c7ca48954d701352 SHA1 555458aaca5fec762f5ecf7b16d5f9e465344b3a SHA256 d7986077a331afe124bf0efb47f82cfa1b4983c6c9da400205a694a6823cf8ed
-DIST fldigi-3.12.pdf 4416220 RMD160 a2e9b0c43e3edcfca5e94ed231e99c5987b8a59e SHA1 a40e8c754590eda42683103eb490db3f7bb2676f SHA256 46db6b31f7717e6766db59ea9f15ccb1a4063d46ae4e281e95b110064988115c
 DIST fldigi-3.20.21.tar.gz 1363442 RMD160 0aad7ece6de972148e0b0681e50f1d0230c45185 SHA1 69daff3908fbd09a6cd4e9a252cab3289a131c15 SHA256 ca45f8a1766b7d9b21905622661dfee3969a05c4e69a49eb62f432fe8d20a0f2
 DIST fldigi-3.20.28.tar.gz 1377667 RMD160 9194a21c1e156c7f92e81b8d48e969047eb9b1d4 SHA1 bcef314c4aa91eaa0f32c24e4c9dd29545a021c8 SHA256 4f220049589f8cc8fafd6b2076656e86553be0a8fe79d29ea13ac2b4893a1707
-EBUILD fldigi-3.12.5.ebuild 1638 RMD160 944e73fe8afed15140fd989d2fc516fe780ee27f SHA1 6d2b7ea7c81542eeb88a5c30831c5ff656a91c68 SHA256 a4ef3a4e61af3433ad6d9ac70ef6549dee3082fa5ce7de0f1aa0dfb253930591
+DIST fldigi-3.20.29.tar.gz 1388726 RMD160 2628fa9c84f073a74ad0f69092e9b96cd76b21cd SHA1 ec3e86fa5df7e67edadb522ad80de1ea79817634 SHA256 f51377e8b47763b26b37bf685069fb3f921180d4837c1ddbd26ae79bdd9263a9
 EBUILD fldigi-3.20.21.ebuild 1324 RMD160 6c94c54a6cccf2c688b83a0941c8e0872b4abb27 SHA1 3bc4980316ee5f96a3399b37fba84eaa76ba9585 SHA256 26604780ed1a4cd93ec1756265d3b0ba06c1927e425a7bd91471000052db18c3
 EBUILD fldigi-3.20.28.ebuild 1337 RMD160 b02c920a6fa8cf6a47ed1cf6164487181b9cd852 SHA1 a9d2b77fb34d7478b72aa1d24d95258582c2bf27 SHA256 6cb49eab772fa47fa7f39607edcc14dcaab49689d0b5ebfaf150b47dddff0045
-MISC ChangeLog 1469 RMD160 948745a52196a34c7123e2604b6d976e17e32a9d SHA1 42ff27d4d02c5d843494a56b8eb97707ab2603ef SHA256 fc1fd722a8e01e8c6fc4a6d84d4f8d39572a24dfef3af440e4425d03953112a3
+EBUILD fldigi-3.20.29.ebuild 1331 RMD160 e10b164453c31af782978513d877658679ced280 SHA1 5f019ddbbff70ade36df5b6b98bb88c67889ada3 SHA256 b257ab7ed253ae319a041304f711a05efc06e0dba5d99c3837760b1d2256a47c
+MISC ChangeLog 1673 RMD160 5170074429c4ffa255d364fa850bb3879818257e SHA1 57018d90cf7bca232efd8b2a93608377591c9419 SHA256 f0ba8a9911ff6e4fa401d89c86021b911fbccd244c8caccd503ff72d21c448b5
 MISC metadata.xml 427 RMD160 11a4d509ef32b3b97ea6bddd1b70f6aea4ea74e1 SHA1 484c3f7b2725ad22fd1269b4da7a19724d4abdc9 SHA256 a75082876433eed2f71c0a1664d1abf0113a9b9d8725241007739c6ebbe19461
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyM8D0ACgkQ9/cejkQaxBAAhgCcCnYpzEbiXyaSQft3UIt9lTCr
-RLsAnjSRAEBTAbaBB3cX+xgfnH4ycaWW
-=8aWd
------END PGP SIGNATURE-----
diff --git a/media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch b/media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch
deleted file mode 100644
index ff91b013785b..000000000000
--- a/media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixing build with libpng-1.4
-
-https://bugs.gentoo.org/321201
-
---- src/widgets/picture.cxx
-+++ src/widgets/picture.cxx
-@@ -279,7 +279,7 @@
- 		return -1;
- 	}
- 	if ((info = png_create_info_struct(png)) == NULL) {
--		png_destroy_write_struct(&png, png_infopp_NULL);
-+		png_destroy_write_struct(&png, NULL);
- 		fclose(fp);
- 		return -1;
- 	}
diff --git a/media-radio/fldigi/fldigi-3.12.5.ebuild b/media-radio/fldigi/fldigi-3.20.29.ebuild
index 1322b424ae4f..9d81b731d046 100644
--- a/media-radio/fldigi/fldigi-3.12.5.ebuild
+++ b/media-radio/fldigi/fldigi-3.20.29.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.12.5.ebuild,v 1.2 2010/05/24 11:46:24 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/fldigi/fldigi-3.20.29.ebuild,v 1.1 2010/11/17 12:27:22 tomjbe Exp $
 
 EAPI=2
 
-inherit eutils versionator
-
-MY_DOC_PN=${PN}-$(get_version_component_range 1-2)
-
 DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
 HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
-SRC_URI="http://www.w1hkj.com/${PN}-distro/${P}.tar.gz
-	doc? ( http://www.w1hkj.com/${PN}-distro/${MY_DOC_PN}.pdf )"
+SRC_URI="http://www.w1hkj.com/downloads/fldigi/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc hamlib nls portaudio pulseaudio sndfile xmlrpc"
+IUSE="hamlib nls portaudio pulseaudio sndfile xmlrpc"
 
-RDEPEND="|| ( >=x11-libs/fltk-1.1.9:1.1[threads] <x11-libs/fltk-1.1.9:1.1 )
+RDEPEND=">=x11-libs/fltk-1.1.9:1.1[threads,xft]
 	media-libs/libsamplerate
 	media-libs/libpng
 	x11-misc/xdg-utils
@@ -33,10 +28,6 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-}
-
 src_configure() {
 	econf $(use_with sndfile) \
 		$(use_with portaudio) \
@@ -49,8 +40,5 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README  || die "dodoc failed"
-	if use doc ; then
-		dodoc "${DISTDIR}"/${MY_DOC_PN}.pdf || die "dodoc failed"
-	fi
+	dodoc AUTHORS ChangeLog NEWS README  || die "dodoc failed"
 }