Punt dietlibc cruft.

(Portage version: 2.0.51.22-r2)

4 files changed, 25 insertions, 62 deletions

diff --git a/net-misc/slidentd/ChangeLog b/net-misc/slidentd/ChangeLog
index 3d7a6b91a026..caa52aa11c4a 100644
--- a/net-misc/slidentd/ChangeLog
+++ b/net-misc/slidentd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/slidentd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/ChangeLog,v 1.13 2005/03/03 18:33:41 ciaranm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/ChangeLog,v 1.14 2005/08/28 06:26:45 vapier Exp $
+
+  28 Aug 2005; Mike Frysinger <vapier@gentoo.org> -slidentd-0.0.15.ebuild,
+  slidentd-1.0.0.ebuild:
+  Punt dietlibc cruft.
 
   03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> slidentd-0.0.15.ebuild:
   Dependency update: sys-apps/daemontools -> sys-process/daemontools.
diff --git a/net-misc/slidentd/files/digest-slidentd-0.0.15 b/net-misc/slidentd/files/digest-slidentd-0.0.15
deleted file mode 100644
index 1b5019462d96..000000000000
--- a/net-misc/slidentd/files/digest-slidentd-0.0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c5254bc4b679d7f41d5737123f4cf7b slidentd-0.0.15.tar.gz 33978
diff --git a/net-misc/slidentd/slidentd-0.0.15.ebuild b/net-misc/slidentd/slidentd-0.0.15.ebuild
deleted file mode 100644
index 4fff89011db2..000000000000
--- a/net-misc/slidentd/slidentd-0.0.15.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/slidentd-0.0.15.ebuild,v 1.13 2005/03/03 18:33:41 ciaranm Exp $
-
-DESCRIPTION="A secure, lightweight ident daemon."
-SRC_URI="http://www.uncarved.com/slidentd/${P}.tar.gz"
-HOMEPAGE="http://www.uncarved.com/slidentd/"
-KEYWORDS="x86 sparc "
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="dev-libs/dietlibc
-	dev-libs/libowfat"
-
-RDEPEND="sys-process/daemontools
-	sys-apps/ucspi-tcp"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s:^\tCFLAGS=\$(diet_cflag.*:\tCFLAGS=${CFLAGS} \${diet_cflags}:" \
-		-e "s:^\tCC\:=diet -Os \$(CC):\tCC\:=diet -Os gcc:" \
-		Makefile.orig > Makefile
-}
-
-src_compile() {
-	make build_mode=diet INCLUDES=-I/usr/include/libowfat LIBDIRS=-L/usr/lib || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	exeinto /var/lib/supervise/slidentd
-	newexe ${FILESDIR}/slidentd-run run
-}
-
-pkg_postinst() {
-	echo -e "\e[32;01m You need to start your supervise service:\033[0m"
-	echo ' # ln -s /var/lib/supervise/slidentd/ /service'
-	echo
-}
diff --git a/net-misc/slidentd/slidentd-1.0.0.ebuild b/net-misc/slidentd/slidentd-1.0.0.ebuild
index 1abdd64d7530..7e82b88e580d 100644
--- a/net-misc/slidentd/slidentd-1.0.0.ebuild
+++ b/net-misc/slidentd/slidentd-1.0.0.ebuild
@@ -1,33 +1,36 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/slidentd-1.0.0.ebuild,v 1.5 2004/08/31 08:38:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/slidentd/slidentd-1.0.0.ebuild,v 1.6 2005/08/28 06:26:45 vapier Exp $
 
-DESCRIPTION="A secure, lightweight ident daemon."
-SRC_URI="http://www.uncarved.com/slidentd/${P}.tar.gz"
+DESCRIPTION="A secure, lightweight ident daemon"
 HOMEPAGE="http://www.uncarved.com/slidentd/"
-KEYWORDS="x86 sparc ~ppc"
+SRC_URI="http://www.uncarved.com/slidentd/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~ppc sparc x86"
 IUSE=""
-DEPEND="dev-libs/dietlibc
-	dev-libs/libowfat
-	>=sys-apps/sed-4"
 
-RDEPEND="virtual/inetd"
+DEPEND="dev-libs/libowfat"
+RDEPEND="${DEPEND}
+	virtual/inetd"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-	sed -i -e "s:^\tCFLAGS=\$(diet_cflag.*:\tCFLAGS=${CFLAGS} \${diet_cflags}:" \
-		-e "s:^\tCC\:=diet -Os \$(CC):\tCC\:=diet -Os gcc:" \
-		Makefile
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/^normal_cflags/s:=.*:-DNDEBUG ${CFLAGS} -I/usr/include/libowfat:" \
+		-e '/ALL=/s:stripobjects::' \
+		-e '/ALL=/s:strip::' \
+		Makefile || die
 }
 
 src_compile() {
-	make build_mode=diet INCLUDES=-I/usr/include/libowfat LIBDIRS=-L/usr/lib || die
+	emake -j1 build_mode=normal || die
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	exeinto /var/lib/supervise/slidentd
 	newexe ${FILESDIR}/slidentd-run run
@@ -35,6 +38,5 @@ src_install () {
 
 pkg_postinst() {
 	einfo "You need to start your supervise service:"
-	einfo '# ln -s /var/lib/supervise/slidentd/ /service'
-	einfo
+	einfo '# ln -s /var/lib/supervise/slidentd /service/'
 }