old, qa

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

5 files changed, 20 insertions, 132 deletions

diff --git a/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild b/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild
index bad99e640264..4dfad265b9e1 100644
--- a/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild
+++ b/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild,v 1.1 2005/05/10 04:21:09 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild,v 1.2 2009/09/23 08:30:16 ssuominen Exp $
+
+EAPI=2
+MY_PV=${PV}-2004-07-20-0047
 
-MY_PV="${PV}-2004-07-20-0047"
 DESCRIPTION="a bunch of modules for the naim im client"
 HOMEPAGE="http://site.n.ml.org/info/naim/"
 SRC_URI="http://site.n.ml.org/download/20050313142544/naim/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=net-im/naim-0.11.7.3"
+RDEPEND=">=net-im/naim-0.11.7.3"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
-src_compile() {
-	econf --with-pkgdocdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "make failed"
+src_configure() {
+	econf \
+		--with-pkgdocdir=/usr/share/doc/${PF}
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild b/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild
deleted file mode 100644
index 79e04a7e2cf5..000000000000
--- a/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild,v 1.1 2005/01/25 19:12:00 rizzo Exp $
-
-MY_PV="${PV}-2004-07-20-0047"
-DESCRIPTION="a bunch of modules for the naim im client"
-HOMEPAGE="http://site.n.ml.org/info/naim/"
-SRC_URI="http://site.n.ml.org/download/20050124143557/naim/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-IUSE=""
-
-DEPEND=">=net-im/naim-0.11.7.3"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_compile() {
-	econf --with-pkgdocdir=/usr/share/doc/${PF} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-im/naim/naim-0.11.7.2.ebuild b/net-im/naim/naim-0.11.7.2.ebuild
deleted file mode 100644
index 4133a377571c..000000000000
--- a/net-im/naim/naim-0.11.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.7.2.ebuild,v 1.16 2009/05/09 20:13:29 gentoofan23 Exp $
-
-DESCRIPTION="An ncurses based AOL Instant Messenger"
-HOMEPAGE="http://naim.n.ml.org"
-SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~sparc x86"
-IUSE="debug"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	app-misc/screen"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	# --enable-profile
-	local myconf=""
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	econf \
-		--with-pkgdocdir=/usr/share/doc/${PF} \
-		--enable-detach \
-		${myconf}
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp
-}
diff --git a/net-im/naim/naim-0.11.8.2.1.ebuild b/net-im/naim/naim-0.11.8.2.1.ebuild
deleted file mode 100644
index d2edbdd69627..000000000000
--- a/net-im/naim/naim-0.11.8.2.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.2.1.ebuild,v 1.6 2009/05/09 20:13:29 gentoofan23 Exp $
-
-DESCRIPTION="An ncurses based AOL Instant Messenger"
-HOMEPAGE="http://naim.n.ml.org"
-SRC_URI="http://naim.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug screen"
-
-# the tests dont work
-RESTRICT=test
-
-DEPEND=">=sys-libs/ncurses-5.2
-		screen? ( app-misc/screen )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Alter makefile so firetalk-int.h is installed
-	sed -i 's/include_HEADERS = firetalk.h/include_HEADERS = firetalk.h firetalk-int.h/' \
-		libfiretalk/Makefile.am \
-		libfiretalk/Makefile.in || die "Sed failed!"
-}
-
-src_compile() {
-	# --enable-profile
-	local myconf=""
-
-	use debug && myconf="${myconf} --enable-debug"
-	use screen && myconf="${myconf} --enable-detach"
-
-	econf \
-		--with-pkgdocdir=/usr/share/doc/${PF} \
-		${myconf}
-
-	# Use -j1, because naim doesn't compile with ${MAKEOPTS} > 1
-	# see bug #139329
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp
-}
diff --git a/net-im/naim/naim-0.11.8.3.1.ebuild b/net-im/naim/naim-0.11.8.3.1.ebuild
index b75b6cd4119e..686ec2be6f70 100644
--- a/net-im/naim/naim-0.11.8.3.1.ebuild
+++ b/net-im/naim/naim-0.11.8.3.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.3.1.ebuild,v 1.3 2009/05/09 20:13:29 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.8.3.1.ebuild,v 1.4 2009/09/23 08:32:57 ssuominen Exp $
+
+EAPI=2
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
 HOMEPAGE="http://naim.n.ml.org"
@@ -14,21 +16,17 @@ IUSE="debug screen"
 RESTRICT="test"
 
 DEPEND=">=sys-libs/ncurses-5.2
-		screen? ( app-misc/screen )"
+	screen? ( app-misc/screen )"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# Alter makefile so firetalk-int.h is installed
 	sed -i 's/include_HEADERS = firetalk.h/include_HEADERS = firetalk.h firetalk-int.h/' \
 		libfiretalk/Makefile.am \
-		libfiretalk/Makefile.in || die "Sed failed!"
+		libfiretalk/Makefile.in || die
 }
 
-src_compile() {
-	# --enable-profile
+src_configure() {
 	local myconf=""
 
 	use debug && myconf="${myconf} --enable-debug"
@@ -37,11 +35,9 @@ src_compile() {
 	econf \
 		--with-pkgdocdir=/usr/share/doc/${PF} \
 		${myconf}
-
-	emake || die "make failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp
 }