dont use pmake/base/glibc

4 files changed, 6 insertions, 40 deletions

diff --git a/media-radio/ax25-tools/ax25-tools-0.0.8-r1.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.8-r1.ebuild
index 7e8e59c5c087..37a0916b722d 100644
--- a/media-radio/ax25-tools/ax25-tools-0.0.8-r1.ebuild
+++ b/media-radio/ax25-tools/ax25-tools-0.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-tools/ax25-tools-0.0.8-r1.ebuild,v 1.4 2004/06/24 23:47:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-tools/ax25-tools-0.0.8-r1.ebuild,v 1.5 2004/06/30 02:11:56 vapier Exp $
 
 DESCRIPTION="Basic AX.25 (Amateur Radio) administrative tools and daemons"
 HOMEPAGE="http://ax25.sourceforge.net/"
@@ -11,14 +11,14 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE="X"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib
 	>=dev-libs/libax25-0.0.5
 	X? ( virtual/x11 )"
 
 src_compile() {
 	# If X is disabled, do not build smdiag
-	COMPFLAGS=""
+	local COMPFLAGS=""
 	use X || COMPFLAGS="--without-x"
 	econf ${COMPFLAGS} || die
 	emake || die
@@ -30,7 +30,7 @@ src_install() {
 
 	rm -rf ${D}/usr/share/doc/ax25-tools
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README tcpip/ttylinkd.README \
+	dodoc AUTHORS ChangeLog NEWS README tcpip/ttylinkd.README \
 	user_call/README.user_call yamdrv/README.yamdrv dmascc/README.dmascc \
 	ax25-tools/ttylinkd.INSTALL
 
@@ -40,5 +40,4 @@ src_install() {
 	newexe ${FILESDIR}/rip98d.rc rip98d
 	newexe ${FILESDIR}/rxecho.rc rxecho
 	newexe ${FILESDIR}/ttylinkd.rc ttylinkd
-
 }
diff --git a/media-radio/ax25-tools/ax25-tools-0.0.8.ebuild b/media-radio/ax25-tools/ax25-tools-0.0.8.ebuild
deleted file mode 100644
index a1cf57761703..000000000000
--- a/media-radio/ax25-tools/ax25-tools-0.0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-tools/ax25-tools-0.0.8.ebuild,v 1.3 2004/06/24 23:47:33 agriffis Exp $
-
-DESCRIPTION="XASTIR"
-HOMEPAGE="http://xastir.sourceforge.net/"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/ax25/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/glibc
-	dev-libs/libax25"
-
-src_compile() {
-	econf || die
-	pmake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-radio/ax25-tools/files/digest-ax25-tools-0.0.8 b/media-radio/ax25-tools/files/digest-ax25-tools-0.0.8
deleted file mode 100644
index 4bb32ec79816..000000000000
--- a/media-radio/ax25-tools/files/digest-ax25-tools-0.0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 70172b979b38a9434f21d2e8152f0d5e ax25-tools-0.0.8.tar.gz 254019
diff --git a/media-radio/xastir/xastir-1.2.0.ebuild b/media-radio/xastir/xastir-1.2.0.ebuild
index 8f8b31a8bede..8fa91898ca5b 100644
--- a/media-radio/xastir/xastir-1.2.0.ebuild
+++ b/media-radio/xastir/xastir-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-1.2.0.ebuild,v 1.5 2004/06/24 23:47:54 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-1.2.0.ebuild,v 1.6 2004/06/30 02:12:33 vapier Exp $
 
 DESCRIPTION="XASTIR"
 HOMEPAGE="http://xastir.sourceforge.net/"
@@ -11,18 +11,10 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	x11-libs/openmotif"
 
-src_compile() {
-	cd ${S}
-	./configure --host=${CHOST} \
-	   --prefix=/usr || die
-	pmake || die
-}
-
 src_install() {
-	into /
 	make DESTDIR=${D} install || die
 	mkdir -p ${D}/usr/local
 	dosym ../xastir usr/local/xastir