Clean up ebuild a bit and disable test #96903.

(Portage version: 2.0.51.22-r1)

3 files changed, 29 insertions, 27 deletions

diff --git a/app-admin/sysklogd/ChangeLog b/app-admin/sysklogd/ChangeLog
index 1c005a03dc3c..0e6dcce02b40 100644
--- a/app-admin/sysklogd/ChangeLog
+++ b/app-admin/sysklogd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sysklogd
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.37 2005/02/12 00:59:21 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/ChangeLog,v 1.38 2005/06/26 07:19:40 vapier Exp $
+
+  26 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  files/sysklogd-1.4.1-mips.patch, sysklogd-1.4.1-r11.ebuild:
+  Clean up ebuild a bit and disable test #96903.
 
   11 Feb 2005; Mike Frysinger <vapier@gentoo.org> files/sysklogd.rc6:
   Add custom reload() func by Cory Visi to init.d script #52044.
diff --git a/app-admin/sysklogd/files/sysklogd-1.4.1-mips.patch b/app-admin/sysklogd/files/sysklogd-1.4.1-mips.patch
index 14dfeae277ce..6cffe07272ee 100644
--- a/app-admin/sysklogd/files/sysklogd-1.4.1-mips.patch
+++ b/app-admin/sysklogd/files/sysklogd-1.4.1-mips.patch
@@ -1,10 +1,12 @@
---- /home/portage/sysklogd-1.4.1-r7/work/sysklogd-1.4.1/ksym_mod.c	2000-09-12 23:15:28.000000000 +0200
-+++ /tmp/ksym_mod.c	2003-10-16 19:04:21.000000000 +0200
-@@ -93,6 +93,7 @@
+--- sysklogd/ksym_mod.c
++++ sysklogd/ksym_mod.c
+@@ -93,6 +93,9 @@
  #include <linux/time.h>
  #include <linux/module.h>
  #else /* __GLIBC__ */
++#ifdef __mips__
 +#include <linux/linkage.h>
++#endif
  #include <linux/module.h>
  extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
  extern int get_kernel_syms __P ((struct kernel_sym *__table));
diff --git a/app-admin/sysklogd/sysklogd-1.4.1-r11.ebuild b/app-admin/sysklogd/sysklogd-1.4.1-r11.ebuild
index a3ddb702dcb2..98482421d60b 100644
--- a/app-admin/sysklogd/sysklogd-1.4.1-r11.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.4.1-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r11.ebuild,v 1.4 2005/01/01 11:29:42 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysklogd/sysklogd-1.4.1-r11.ebuild,v 1.5 2005/06/26 07:19:40 vapier Exp $
 
 inherit eutils
 
@@ -10,10 +10,11 @@ SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 x86 sparc"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
+RESTRICT="test"
 
-DEPEND="virtual/libc"
+DEPEND=""
 RDEPEND="dev-lang/perl
 	sys-apps/debianutils"
 PROVIDE="virtual/logger"
@@ -21,18 +22,15 @@ PROVIDE="virtual/logger"
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
-	sed -i "s:-O3:${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE:" Makefile
+	cd "${S}"
+	sed -i \
+		-e "s:-O3:${CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE:" \
+		Makefile || die "sed CFLAGS"
 
 	# Handle SO_BSDCOMPAT being depricated in 2.5+ kernels.
-	cd ${S}; epatch ${FILESDIR}/${P}-SO_BSDCOMPAT.patch
-	cd ${S}; epatch ${FILESDIR}/${P}-2.6.headers.patch
-
-	if [ "${ARCH}" = "mips" ]
-	then
-		cd ${S}
-		epatch ${FILESDIR}/${PN}-1.4.1-mips.patch
-	fi
+	epatch "${FILESDIR}"/${P}-SO_BSDCOMPAT.patch
+	epatch "${FILESDIR}"/${P}-2.6.headers.patch
+	epatch "${FILESDIR}"/${PN}-1.4.1-mips.patch
 }
 
 src_compile() {
@@ -40,16 +38,14 @@ src_compile() {
 }
 
 src_install() {
-	dosbin syslogd klogd ${FILESDIR}/syslogd-listfiles
-	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
+	dosbin syslogd klogd "${FILESDIR}"/syslogd-listfiles || die "dosbin"
+	doman *.[1-9] "${FILESDIR}"/syslogd-listfiles.8
 	exeinto /etc/cron.daily
-	newexe ${FILESDIR}/syslog-cron syslog.cron
+	newexe "${FILESDIR}"/syslog-cron syslog.cron
 	dodoc ANNOUNCE CHANGES MANIFEST NEWS README.1st README.linux
-	dodoc ${FILESDIR}/syslog.conf
+	dodoc "${FILESDIR}"/syslog.conf
 	insinto /etc
-	doins ${FILESDIR}/syslog.conf
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/sysklogd.rc6 sysklogd
-	insinto /etc/conf.d
-	newins ${FILESDIR}/sysklogd.confd sysklogd
+	doins "${FILESDIR}"/syslog.conf
+	newinitd "${FILESDIR}"/sysklogd.rc6 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd sysklogd
 }