Clean up EAPI clean up #380249 by Michael. Add patch to fix up missing header includes fo func prototypes.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 73 insertions, 17 deletions

diff --git a/app-admin/socklog/ChangeLog b/app-admin/socklog/ChangeLog
index 600117c34611..32cba1c7366f 100644
--- a/app-admin/socklog/ChangeLog
+++ b/app-admin/socklog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/socklog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/ChangeLog,v 1.10 2011/06/15 02:47:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/ChangeLog,v 1.11 2011/08/28 22:43:50 vapier Exp $
+
+  28 Aug 2011; Mike Frysinger <vapier@gentoo.org> socklog-2.1.0.ebuild,
+  +files/socklog-2.1.0-headers.patch:
+  Clean up EAPI clean up #380249 by Michael. Add patch to fix up missing header
+  includes fo func prototypes.
 
   15 Jun 2011; Jeroen Roovers <jer@gentoo.org> -socklog-2.0.2.ebuild,
   -socklog-2.0.2-r1.ebuild, -files/socklog-2.0.2-tryto-race-fix.patch:
diff --git a/app-admin/socklog/Manifest b/app-admin/socklog/Manifest
index 501227e2e3c8..9954f3df1a27 100644
--- a/app-admin/socklog/Manifest
+++ b/app-admin/socklog/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX socklog-2.1.0-headers.patch 925 RMD160 4ec5485707ef3c81e2064e27b7d099f1909fe594 SHA1 8cbecbcd7cbc36b172c3a3fb8b2aed4831c0fa1a SHA256 6687d9d7c93c993b99f47948999c03b6b1402cda78d5f854d093ac881171ddf3
 DIST socklog-2.1.0.tar.gz 56942 RMD160 375c2992dcbc0d3639e3f8c215ef7f13959bdd5b SHA1 27a117eae00105f491e6ef301206f7b92d7438ce SHA256 aa869a787ee004da4e5509b5a0031bcc17a4ab4ac650c2ce8d4e488123acb455
-EBUILD socklog-2.1.0.ebuild 1053 RMD160 65572c31bc781fac9302a0c56be34b65549e0fa7 SHA1 552418f4d38b428c6fdc54860fb5ee7558cd29f7 SHA256 fd76230edbfdc7985fd412bb9689bb61196ae39063c842beff3f3c16e7b571cc
-MISC ChangeLog 1657 RMD160 c275a6fd8b42336aa57256f108cf004bc636f3ba SHA1 4332e19f5a2923d65d51386ae25e7b463fed3c04 SHA256 e924392e892edc1a4026675ce0a30aff300142192743a6517413ded489e37891
+EBUILD socklog-2.1.0.ebuild 991 RMD160 6dc03634def18cd66b51043fb461be330b56bc44 SHA1 3c72cdd4bd142bb46e69a53cd0fc9884b3ce904a SHA256 4fa52f108b93880d1f69596c94226b1bb8a63297f5b95d1d9274be41e54cc723
+MISC ChangeLog 1882 RMD160 3aa4ec2e480f27697b8b272126140614d5437d5f SHA1 c828cd0debde30f7f02172e9dd329891fc38a1db SHA256 8f4f22c396ce72efb1007ff9cd604b4669ac129a2689d19ced55bf24b3ff28c4
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk34HTwACgkQVWmRsqeSphNOhQCeLMtQeiwtg1ekEDNjEcDj60M5
-A9wAn17zYcw76frCtILCZZuDhYfHWE6U
-=/1y7
+iF4EAREIAAYFAk5axJ4ACgkQaC/OocHi7JYUIwD+JBhT+CCThxBCtE63AkhxsMo8
+mUSIH3JzMj3TlmRJxqkA/23f2r1TqPPBM6aIQvTkeOaiS15gRP30LlRscQEPw2ZH
+=9A99
 -----END PGP SIGNATURE-----
diff --git a/app-admin/socklog/files/socklog-2.1.0-headers.patch b/app-admin/socklog/files/socklog-2.1.0-headers.patch
new file mode 100644
index 000000000000..b7c10e3da606
--- /dev/null
+++ b/app-admin/socklog/files/socklog-2.1.0-headers.patch
@@ -0,0 +1,54 @@
+add missing headers for misc funcs and types
+
+--- a/chkshsgr.c
++++ b/chkshsgr.c
+@@ -1,10 +1,11 @@
+ /* Public domain. */
+ 
+ #include <unistd.h>
++#include <grp.h>
+ 
+ int main()
+ {
+-  short x[4];
++  gid_t x[4];
+ 
+   x[0] = x[1] = 0;
+   if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1);
+--- a/pathexec_run.c
++++ b/pathexec_run.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include "error.h"
+ #include "stralloc.h"
+ #include "str.h"
+--- a/prot.c
++++ b/prot.c
+@@ -1,12 +1,15 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
++#include <grp.h>
++
+ #include "hasshsgr.h"
+ #include "prot.h"
+ 
+ int prot_gid(int gid)
+ {
+ #ifdef HASSHORTSETGROUPS
+-  short x[2];
++  gid_t x[2];
+   x[0] = gid; x[1] = 73; /* catch errors */
+   if (setgroups(1,x) == -1) return -1;
+ #else
+--- a/seek_set.c
++++ b/seek_set.c
+@@ -1,5 +1,6 @@
+ /* Public domain. */
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include "seek.h"
+ 
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index 4194b029685a..26116a45cfbb 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/socklog-2.1.0.ebuild,v 1.1 2011/06/15 02:43:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/socklog/socklog-2.1.0.ebuild,v 1.2 2011/08/28 22:43:50 vapier Exp $
 
 EAPI="3"
 
@@ -20,21 +20,17 @@ RDEPEND=">=sys-process/runit-1.4.0"
 S=${WORKDIR}/admin/${P}/src
 
 src_prepare() {
-#	epatch "${FILESDIR}"/${P}-tryto-race-fix.patch #122784
+	epatch "${FILESDIR}"/${PN}-2.1.0-headers.patch
 	use static && append-ldflags -static
-	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc
 	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
 }
 
-src_compile() {
-	emake || die "make failed"
-}
-
 src_install() {
-	dobin tryto uncat socklog-check || die "dobin"
-	dosbin socklog socklog-conf || die "dosbin"
+	dobin tryto uncat socklog-check || die
+	dosbin socklog socklog-conf || die
 
-	cd "${S}"
+	cd ..
 	dodoc package/CHANGES
 	dohtml doc/*.html
 	doman man/*