summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2010-11-17 12:27:22 +0000
committerThomas Beierlein <tomjbe@gentoo.org>2010-11-17 12:27:22 +0000
commit93ff2f242d1ab7f25d1aa315bb07b8632525483b (patch)
treea3439197a6d1444260d2d73229dcd6bd134f8579 /media-radio/fldigi
parentMask USE=aria sci-chemistry/cns (diff)
downloadgentoo-2-93ff2f242d1ab7f25d1aa315bb07b8632525483b.tar.gz
gentoo-2-93ff2f242d1ab7f25d1aa315bb07b8632525483b.tar.bz2
gentoo-2-93ff2f242d1ab7f25d1aa315bb07b8632525483b.zip
Version bump. Remove old version.
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'media-radio/fldigi')
-rw-r--r--media-radio/fldigi/ChangeLog8
-rw-r--r--media-radio/fldigi/files/fldigi-3.12.5-libpng14.patch15
-rw-r--r--media-radio/fldigi/fldigi-3.20.29.ebuild (renamed from media-radio/fldigi/fldigi-3.12.5.ebuild)24
3 files changed, 13 insertions, 34 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/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"
}