app-admin/jailkit: version bump, moved to EAPI=2

svn path=/sunrise/; revision=9462

7 files changed, 81 insertions, 16 deletions

diff --git a/app-admin/jailkit/ChangeLog b/app-admin/jailkit/ChangeLog
index f059a4937..fdf9fb7a1 100644
--- a/app-admin/jailkit/ChangeLog
+++ b/app-admin/jailkit/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for app-admin/jailkit
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  -jailkit-2.3.ebuild, -files/jailkit-2.3-destdir.patch,
+  -files/jailkit-2.3-nostrip.patch, +jailkit-2.10.ebuild,
+  +files/jailkit-2.10-destdir.patch, +files/jailkit-2.10-ldflags.patch,
+  +files/jailkit-2.10-nostrip.patch, +files/jailkit-2.10-pyc.patch:
+  version bump, moved to EAPI=2
+
   16 Feb 2008; Tiago Cunha (tcunha) <me@tiagocunha.org> jailkit-2.3.ebuild:
   Zap weird character
 
diff --git a/app-admin/jailkit/Manifest b/app-admin/jailkit/Manifest
index a741a65d8..a862d7163 100644
--- a/app-admin/jailkit/Manifest
+++ b/app-admin/jailkit/Manifest
@@ -1,7 +1,9 @@
 AUX jailkit 277 RMD160 3008e6f78a67af2eb318988c034f58197c54abc1 SHA1 a365679a5c9f80db63c3737f979c5b1c99d8f5d4 SHA256 58a7fcdaae6b1706d0183c826b4ff5856c99f24ba41eaf7956b42ff8e35388a7
-AUX jailkit-2.3-destdir.patch 2529 RMD160 c028cf1cc9f936c92ff32df79b32b86f26cc0948 SHA1 75dea81bc9ccab15860c2d79dd8e8c085c6ca4a0 SHA256 8be61e804cd48b3fdc9d3dec55681c94c7d3b5fd78a3ddc95f177a7968cb1a69
-AUX jailkit-2.3-nostrip.patch 926 RMD160 3b7681d21f0b8e179823738bb730223326665b86 SHA1 a8aa6317b6b4867a3dd6fefa70d73ad421dd89ef SHA256 97c229f93df4c1a279545cfa7fe4177095cf28aa766d91cc136dfe1dd24f4e0e
-DIST jailkit-2.3.tar.bz2 96241 RMD160 d36cf509e7b1c91f5261ce3246ba903388ccb039 SHA1 a2326881ed5497441a73737696d945043968fcb9 SHA256 4f1a1a38568fedb7790e77de5e2fdfce0c8a31c3c41646d8c6456dacc93814f4
-EBUILD jailkit-2.3.ebuild 869 RMD160 794587eefdaa141272c2a742d716bc3d2a957297 SHA1 f689028ed782a76234cebddda8905f34819dd998 SHA256 23138838f904fd0a04d49f00d2620607c17a54b94eb3882d3e5d245f5728c0d7
-MISC ChangeLog 1140 RMD160 68c4c5e187e57b32a5af984b66db11da4b3fdf39 SHA1 c4ec003622b9ed11017da48ca1fca920e98fb6e0 SHA256 f264542a2dcae5cbe71c481e4db8077c421abb22d701c1b5ab679453d5eb518e
+AUX jailkit-2.10-destdir.patch 2529 RMD160 c028cf1cc9f936c92ff32df79b32b86f26cc0948 SHA1 75dea81bc9ccab15860c2d79dd8e8c085c6ca4a0 SHA256 8be61e804cd48b3fdc9d3dec55681c94c7d3b5fd78a3ddc95f177a7968cb1a69
+AUX jailkit-2.10-ldflags.patch 1885 RMD160 4a1b7bbabb29f9852e9988945ba1047b33443dad SHA1 afbf0aa87f43f881aafc4ee9f6c54c606063d1ad SHA256 a4c32f8ede109b5bdf8b40c32fe18d7c60fef9da9aeb55f86ffae1db0b4bd1a7
+AUX jailkit-2.10-nostrip.patch 926 RMD160 3b7681d21f0b8e179823738bb730223326665b86 SHA1 a8aa6317b6b4867a3dd6fefa70d73ad421dd89ef SHA256 97c229f93df4c1a279545cfa7fe4177095cf28aa766d91cc136dfe1dd24f4e0e
+AUX jailkit-2.10-pyc.patch 354 RMD160 d0a548409b74ed94fcb9537850ebba96954917b3 SHA1 c55581b9216680aeec54d5e12da4f988052c4777 SHA256 7ec99db35b9483446601495d2ae481df52611e6f52926d3cd18ffbd569a5fd70
+DIST jailkit-2.10.tar.bz2 108922 RMD160 2016c231e71aa9f460c53976b2f12ac047fde7f8 SHA1 e68a29e813d44dd0a0627527005e6b6e270008d5 SHA256 bd37cfe9583a7afa0e585698558e0e98757bd66a305c00f93d221c29a5cebe41
+EBUILD jailkit-2.10.ebuild 852 RMD160 ea7a89f9cf8d0b6a0832064424b5a346a0620d83 SHA1 95d9ce80c0aea32370eb297ae49d20340d1249af SHA256 2758f4cc572feb56de240f4c42610bf5b7d02f8e7e6a7cdd2de49097e7a915ab
+MISC ChangeLog 1485 RMD160 392cee6338bcd370a6438bdf618847a38de8715a SHA1 1fae8a2fd6dc7b25a39bf2631bb48e3c5e39b3ff SHA256 b312820c01304b8c990ad1da6522c2148cc88cf66b6596d9ef27b2b6b1456f7f
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-admin/jailkit/files/jailkit-2.3-destdir.patch b/app-admin/jailkit/files/jailkit-2.10-destdir.patch
index 95419eaf0..95419eaf0 100644
--- a/app-admin/jailkit/files/jailkit-2.3-destdir.patch
+++ b/app-admin/jailkit/files/jailkit-2.10-destdir.patch
diff --git a/app-admin/jailkit/files/jailkit-2.10-ldflags.patch b/app-admin/jailkit/files/jailkit-2.10-ldflags.patch
new file mode 100644
index 000000000..733fb4eb7
--- /dev/null
+++ b/app-admin/jailkit/files/jailkit-2.10-ldflags.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index e77ea24..1814f2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,7 +142,7 @@ AC_CHECK_FUNCS(
+ 	[cap_get_proc],,
+ 	AC_CHECK_LIB([cap], [cap_get_proc],
+ 		AC_DEFINE(HAVE_CAP_GET_PROC)
+-		LDFLAGS="$LDLAGS -lcap",
++		LIBS="$LIBS -lcap",
+ 	)
+ )
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 49449b6..f55150f 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -67,22 +67,22 @@ OBJS = $(SRCS:.c=.o)
+ all: ${BINARIES}
+ 
+ jk_chrootlaunch: jk_chrootlaunch.o jk_lib.o utils.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootlaunch.o jk_lib.o utils.o $(LIBS)
+ 
+ jk_socketd: jk_socketd.o jk_lib.o utils.o iniparser.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_socketd.o jk_lib.o utils.o iniparser.o $(LIBS)
+ 
+ jk_lsh: jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_lsh.o iniparser.o jk_lib.o utils.o wordexp.o $(LIBS)
+ 
+ jk_chrootsh: jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_chrootsh.o iniparser.o jk_lib.o utils.o passwdparser.o $(LIBS)
+ 
+ jk_uchroot: jk_uchroot.o iniparser.o jk_lib.o utils.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_uchroot.o iniparser.o jk_lib.o utils.o $(LIBS)
+ 
+ jk_procmailwrapper: jk_procmailwrapper.o jk_lib.o utils.o
+-	$(CC) $(DEFS) $(LDFLAGS) $(LIBS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o
++	$(CC) $(DEFS) $(LDFLAGS) -o $@ jk_procmailwrapper.o jk_lib.o utils.o $(LIBS)
+ 
+ clean:
+ 	rm -f ${BINARIES}
diff --git a/app-admin/jailkit/files/jailkit-2.3-nostrip.patch b/app-admin/jailkit/files/jailkit-2.10-nostrip.patch
index 64b9056d7..64b9056d7 100644
--- a/app-admin/jailkit/files/jailkit-2.3-nostrip.patch
+++ b/app-admin/jailkit/files/jailkit-2.10-nostrip.patch
diff --git a/app-admin/jailkit/files/jailkit-2.10-pyc.patch b/app-admin/jailkit/files/jailkit-2.10-pyc.patch
new file mode 100644
index 000000000..16649cab4
--- /dev/null
+++ b/app-admin/jailkit/files/jailkit-2.10-pyc.patch
@@ -0,0 +1,12 @@
+diff --git a/py/Makefile.in b/py/Makefile.in
+index 925cd12..7ffb1a2 100644
+--- a/py/Makefile.in
++++ b/py/Makefile.in
+@@ -67,7 +67,6 @@ install: all
+ 	done
+ 	${INSTALL} -d -m 755 ${DESTDIR}${PYLIBDIR}
+ 	${INSTALL} -m 0644 jk_lib.py ${DESTDIR}${PYLIBDIR}/
+-	${INSTALL} -m 0644 jk_lib.pyc ${DESTDIR}${PYLIBDIR}/
+ 
+ uninstall:
+ 	for file in ${PY_BINS}; do \
diff --git a/app-admin/jailkit/jailkit-2.3.ebuild b/app-admin/jailkit/jailkit-2.10.ebuild
index 4bcfbd596..2a46e698b 100644
--- a/app-admin/jailkit/jailkit-2.3.ebuild
+++ b/app-admin/jailkit/jailkit-2.10.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils
+EAPI="2"
+
+inherit autotools eutils
 
 DESCRIPTION="Allows you to easily put programs and users in a chrooted environment"
 HOMEPAGE="http://olivier.sessink.nl/jailkit/"
@@ -13,15 +15,11 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-destdir.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-ldflags.patch" \
+		"${FILESDIR}/${P}-pyc.patch"
+	eautoreconf
 }
 
 src_install() {