4 files changed, 16 insertions, 62 deletions
diff --git a/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild
index 1d5baa897a79..cff8d3e927aa 100644
--- a/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild
+++ b/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild,v 1.5 2009/09/07 18:59:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/cwdaemon/cwdaemon-0.9.2.ebuild,v 1.6 2009/09/23 15:27:56 ssuominen Exp $
 
 DESCRIPTION="A morse daemon for the parallel or serial port"
 HOMEPAGE="http://www.qsl.net/pg4i/linux/cwdaemon.html"
 SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="virtual/libc"
+RDEPEND=""
 DEPEND="sys-apps/gawk"
 
-src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 }
diff --git a/media-radio/gmfsk/gmfsk-0.6-r1.ebuild b/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
index b2f628e32a59..b822180e1891 100644
--- a/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
+++ b/media-radio/gmfsk/gmfsk-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6-r1.ebuild,v 1.6 2009/07/20 16:38:39 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/gmfsk/gmfsk-0.6-r1.ebuild,v 1.7 2009/09/23 15:27:26 ssuominen Exp $
 
 inherit eutils gnome2
 
@@ -13,23 +13,23 @@ SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64"
 IUSE="doc"
 
-RDEPEND="virtual/libc
-	>=gnome-base/gconf-2.6
+RDEPEND=">=gnome-base/gconf-2.6
 	>=gnome-base/libgnomeui-2.0
 	gnome-extra/yelp
 	>=media-libs/hamlib-1.2.0
 	<sci-libs/fftw-3"
-
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.5
 	dev-util/pkgconfig"
 
-G2CONF="${G2CONF} --enable-hamlib"
-DOCS="AUTHORS COPYING COPYING-DOCS ChangeLog INSTALL NEWS README"
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-hamlib"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
 
 src_unpack(){
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/"${PN}"-patch-mt63_dsp.h
-	epatch "${FILESDIR}"/"${P}"-gcc44.patch
+	epatch "${FILESDIR}"/${PN}-patch-mt63_dsp.h
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
diff --git a/media-radio/xconvers/xconvers-0.8.2.ebuild b/media-radio/xconvers/xconvers-0.8.2.ebuild
deleted file mode 100644
index 54eb8dd7284d..000000000000
--- a/media-radio/xconvers/xconvers-0.8.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xconvers/xconvers-0.8.2.ebuild,v 1.10 2008/10/05 21:14:40 loki_val Exp $
-
-inherit eutils
-
-DESCRIPTION="Hamradio convers client for X/GTK"
-HOMEPAGE="http://www.qsl.net/pg4i/linux/xconvers.html"
-SRC_URI="http://www.qsl.net/pg4i/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-RDEPEND="virtual/libc
-	x11-libs/libXi
-	=x11-libs/gtk+-1.2*"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	dodoc README
-	make_desktop_entry xconvers Xconvers xconvers HamRadio
-}
diff --git a/media-radio/xconvers/xconvers-0.8.3.ebuild b/media-radio/xconvers/xconvers-0.8.3.ebuild
index 874657ef81a1..ffc122919bb2 100644
--- a/media-radio/xconvers/xconvers-0.8.3.ebuild
+++ b/media-radio/xconvers/xconvers-0.8.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xconvers/xconvers-0.8.3.ebuild,v 1.5 2008/10/05 21:14:40 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xconvers/xconvers-0.8.3.ebuild,v 1.6 2009/09/23 15:25:04 ssuominen Exp $
 
 DESCRIPTION="Hamradio convers client for X/GTK"
 HOMEPAGE="http://www.qsl.net/pg4i/linux/xconvers.html"
@@ -11,21 +11,12 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-RDEPEND="virtual/libc
-	x11-libs/libXi
+RDEPEND="x11-libs/libXi
 	=x11-libs/gtk+-1.2*"
-
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_compile() {
-
-	econf || die "configure failed"
-	emake || die "emake failed"
-}
-
 src_install() {
-
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	dodoc README ChangeLog || die "dodoc failed"
 }