From e3b6267ff5622661928492d0f03903f3062699e6 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer@gentoo.org>
Date: Tue, 12 Jun 2007 21:35:06 +0000
Subject: Fix NLS (bug #181737). Clean up. (Portage version: 2.1.2.7)

---
 app-admin/sysstat/ChangeLog                       |  6 +++-
 app-admin/sysstat/files/sysstat-7.1.4-strip.patch | 11 +++++++
 app-admin/sysstat/sysstat-7.1.4.ebuild            | 35 +++++++----------------
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 app-admin/sysstat/files/sysstat-7.1.4-strip.patch

(limited to 'app-admin/sysstat')

diff --git a/app-admin/sysstat/ChangeLog b/app-admin/sysstat/ChangeLog
index b6da722ab281..eae9b17b9931 100644
--- a/app-admin/sysstat/ChangeLog
+++ b/app-admin/sysstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/sysstat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.55 2007/06/10 21:09:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/ChangeLog,v 1.56 2007/06/12 21:35:06 jer Exp $
+
+  12 Jun 2007; Jeroen Roovers <jer@gentoo.org>
+  +files/sysstat-7.1.4-strip.patch, sysstat-7.1.4.ebuild:
+  Fix NLS (bug #181737). Clean up.
 
 *sysstat-7.1.4 (10 Jun 2007)
 
diff --git a/app-admin/sysstat/files/sysstat-7.1.4-strip.patch b/app-admin/sysstat/files/sysstat-7.1.4-strip.patch
new file mode 100644
index 000000000000..94119d4549a5
--- /dev/null
+++ b/app-admin/sysstat/files/sysstat-7.1.4-strip.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.	2007-06-12 23:03:01.000000000 +0200
++++ Makefile.in	2007-06-12 23:03:08.000000000 +0200
+@@ -51,7 +51,7 @@
+ # Compiler flags
+ CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2 -fno-strength-reduce
+ DFLAGS = @DFLAGS@
+-LFLAGS =  -s
++
+ # DFLAGS may already contain SMP_RACE definition
+ DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
+ 
diff --git a/app-admin/sysstat/sysstat-7.1.4.ebuild b/app-admin/sysstat/sysstat-7.1.4.ebuild
index 0da532056a7b..3df0ae189bd6 100644
--- a/app-admin/sysstat/sysstat-7.1.4.ebuild
+++ b/app-admin/sysstat/sysstat-7.1.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-7.1.4.ebuild,v 1.1 2007/06/10 21:09:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-7.1.4.ebuild,v 1.2 2007/06/12 21:35:06 jer Exp $
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://perso.wanadoo.fr/sebastien.godard/"
@@ -17,36 +17,23 @@ RDEPEND="nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
-CONFIGVARS="PREFIX=\"${ROOT}usr\"
-		SA_LIB_DIR=\"${ROOT}usr/$(get_libdir)/sa\"
-		SA_DIR=\"${ROOT}var/log/sa\"
-		CRON_OWNER=\"root\"
-		DOC_DIR=\"${ROOT}usr/share/doc/${PF}\"
-		MAN_DIR=\"${ROOT}usr/share/man/\""
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-strip.patch || die "${P}-strip.patch failed"
+}
 
 src_compile() {
-	if ! use nls ; then
-		sed -i '19s:\(REQUIRE_NLS = \)[^\n]*:\1:' build/CONFIG || \
-			die "sed CONFIG failed"
-	fi
-	econf || die "econf failed"
-	emake LFLAGS="${LDFLAGS}" \
-		${CONFIGVARS} \
-		|| die "make failed"
+	econf $(use_enable nls) || die "econf failed"
+	emake LFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
 	keepdir /var/log/sa
 
-	emake \
-		LFLAGS="${LDFLAGS}" \
-		DESTDIR="${D}" \
-		${CONFIGVARS} \
-		install || die "make install failed"
+	emake DESTDIR=${D} DOC_DIR=/usr/share/doc/${PF} install || die "make install failed"
 
-	rm "${D}/usr/share/doc/${PF}/COPYING"
-	ecompress "${D}/usr/share/doc/${PF}/"*[^mz]
 	newdoc sysstat.crond.sample crontab.example
-	newdoc sysstat.crond
 	newinitd "${FILESDIR}"/sysstat.init.d sysstat
 }
-- 
cgit v1.2.3-65-gdbad