Fix a bunch of QA problems: compressed patch file in FILESDIR, double-patched autotools, symlinked scripts for autotools that might not be there, compile happening during install phase, redundant S assignments.

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

5 files changed, 40 insertions, 13 deletions

diff --git a/sys-libs/libservicelog/ChangeLog b/sys-libs/libservicelog/ChangeLog
index 8afb3daf74c7..eb1b91563b78 100644
--- a/sys-libs/libservicelog/ChangeLog
+++ b/sys-libs/libservicelog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libservicelog
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libservicelog/ChangeLog,v 1.2 2009/03/30 20:22:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libservicelog/ChangeLog,v 1.3 2009/06/20 23:33:38 flameeyes Exp $
+
+  20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  libservicelog-1.0.1.ebuild, +files/libservicelog-1.0.1.patch,
+  -files/libservicelog-1.0.1.patch.gz:
+  Fix a bunch of QA problems: compressed patch file in FILESDIR,
+  double-patched autotools, symlinked scripts for autotools that might not
+  be there, compile happening during install phase, redundant S assignments.
 
   30 Mar 2009; Brent Baude <ranger@gentoo.org> libservicelog-1.0.1.ebuild:
   Marking ppc now
diff --git a/sys-libs/libservicelog/Manifest b/sys-libs/libservicelog/Manifest
index e645ac96e619..37885cd3a66b 100644
--- a/sys-libs/libservicelog/Manifest
+++ b/sys-libs/libservicelog/Manifest
@@ -1,5 +1,15 @@
-AUX libservicelog-1.0.1.patch.gz 425 RMD160 642795b784b1b20e4d133d7a05f53d7a75e793bd SHA1 a2c7bb1a31d67ce9b9c602dab7fba77b165729d6 SHA256 0742a853f27cd562415dd4b309e0337a139de4960caf167bc233355ad139c30b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libservicelog-1.0.1.patch 479 RMD160 bb8d73858638a19b64b8f8db531a429724bbe2ab SHA1 1e0eaf32372aace45bdc037f798b1f2dfb20aba0 SHA256 94b390327234efd1a322c97ac232c08eb8b4b6117606d51cdedcbee9e0791258
 DIST libservicelog-1.0.1.tar.gz 673264 RMD160 7a9d15b44996759de1266ccc279d70a0b23f7acd SHA1 a11b52d4c6753296b276b3df7c25e47c35f99880 SHA256 562d0160da772732002fb749e7f704b5e20ab57a8b73908638afd1a75d8cf944
-EBUILD libservicelog-1.0.1.ebuild 756 RMD160 2a605eaf0c982836caae0d2930bc26a4f59ad575 SHA1 69d92a7e19ef76e15b237915ab0dce99e077b968 SHA256 ca81c7adeb13b6c65717ff02601d67c3009548dcf3b0045238dd87b396123f06
-MISC ChangeLog 499 RMD160 c4ac57fdaea65b75951b40c701d904eb0934cb5a SHA1 e66eff3acea79f35061dfb8ef631c161542de4a0 SHA256 f2e68b19f4e46f896dbcb8627f72c830d3e8db50616b4042b4b8b7fd5eb21c54
+EBUILD libservicelog-1.0.1.ebuild 756 RMD160 0e5b9a499ccc3410ebdba8397074088d112bf258 SHA1 f9fcb80587164b76c1cc7053e514104f9d0a3807 SHA256 a5e74edd79df219a6ec79bf1669f4e4e17754f3328f9d80c74b322b40e91848c
+MISC ChangeLog 879 RMD160 6206158ad38e064479ba9b148fb2da48cabc3d23 SHA1 8e2b1585c4f4d4dfbaf2a0464e943ebcad64d321 SHA256 1161a144f72c2fb2a047e722a3f9fbb6f6b7e23ffaccc846ed6d4c4c2d9b2696
 MISC metadata.xml 247 RMD160 282c3d114ab6dd535174fb9902cafa6ecdde00f0 SHA1 7fabbfe2c436526b26f2f95dfcc22f0e184cc02c SHA256 3d6f2840d94929bb08842b3fae1578779374595d786b4c35bb113ceb6e092644
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko9cdgACgkQAiZjviIA2XhwaACgns/wLaRefqsmjWnq41ZpYKVH
+tAAAnjKu2lS7mQyeTU2kTSHJwyjt1YPZ
+=P+xR
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/libservicelog/files/libservicelog-1.0.1.patch b/sys-libs/libservicelog/files/libservicelog-1.0.1.patch
new file mode 100644
index 000000000000..712421271ed0
--- /dev/null
+++ b/sys-libs/libservicelog/files/libservicelog-1.0.1.patch
@@ -0,0 +1,10 @@
+diff -Naur libservicelog-1.0.1.orig/Makefile.am libservicelog-1.0.1/Makefile.am
+--- libservicelog-1.0.1.orig/Makefile.am	2008-08-16 19:01:37.000000000 -0500
++++ libservicelog-1.0.1/Makefile.am	2008-10-20 19:11:17.000000000 -0500
+@@ -19,5 +19,5 @@
+ library_include_HEADERS = servicelog-1/servicelog.h
+ 
+ install-exec-hook:
+-	install -D --mode=754 --group=service servicelog.db \
++	install -D --mode=754 --group=wheel servicelog.db \
+ 		${DESTDIR}/var/lib/servicelog/servicelog.db
diff --git a/sys-libs/libservicelog/files/libservicelog-1.0.1.patch.gz b/sys-libs/libservicelog/files/libservicelog-1.0.1.patch.gz
deleted file mode 100644
index af3c80188cb3..000000000000
--- a/sys-libs/libservicelog/files/libservicelog-1.0.1.patch.gz
+++ /dev/null
diff --git a/sys-libs/libservicelog/libservicelog-1.0.1.ebuild b/sys-libs/libservicelog/libservicelog-1.0.1.ebuild
index 27f7c051ab84..c607896041c1 100644
--- a/sys-libs/libservicelog/libservicelog-1.0.1.ebuild
+++ b/sys-libs/libservicelog/libservicelog-1.0.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libservicelog/libservicelog-1.0.1.ebuild,v 1.3 2009/03/30 20:22:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libservicelog/libservicelog-1.0.1.ebuild,v 1.4 2009/06/20 23:33:38 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
-S=${WORKDIR}/${PN}-${PV}
 DESCRIPTION="Provides a library for logging service-related events"
 SRC_URI="mirror://sourceforge/linux-diag/${P}.tar.gz"
 HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
@@ -22,13 +21,14 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	epatch "${FILESDIR}"/libservicelog-1.0.1.patch.gz
-}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/libservicelog-1.0.1.patch
 
-src_compile() {
-	econf
+	eautoreconf
 }
+
 src_install () {
-	emake install DESTDIR="${D}"
-	dodoc ChangeLog
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog || die
 }