app-admin/jailkit: revert commit 9463

svn path=/sunrise/; revision=9491

diff --git a/app-admin/jailkit/Manifest b/app-admin/jailkit/Manifest
index f9757f612b263d0f6bb6130105343c1e12121094..3cbeafae94b7cde89f137a5e66d7ad02eb0d359f 100644 (file)
--- a/app-admin/jailkit/Manifest
+++ b/app-admin/jailkit/Manifest
@@ -3,6 +3,6 @@ AUX jailkit-2.10-destdir.patch 753 RMD160 1fd6df8f58fbad0c29a870ec6ba7f947348e3f
 AUX jailkit-2.10-ldflags.patch 1885 RMD160 4a1b7bbabb29f9852e9988945ba1047b33443dad SHA1 afbf0aa87f43f881aafc4ee9f6c54c606063d1ad SHA256 a4c32f8ede109b5bdf8b40c32fe18d7c60fef9da9aeb55f86ffae1db0b4bd1a7
 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 863 RMD160 edac28e91239c34f6b11ad2bd4c17fef0041e111 SHA1 8e921929085909e3a71c793615fde75b2c2b85b3 SHA256 23db7bbc11af80499ddae173309597acc07b82e9fbf5417528bc5ef9870d4bf7
+EBUILD jailkit-2.10.ebuild 852 RMD160 ea7a89f9cf8d0b6a0832064424b5a346a0620d83 SHA1 95d9ce80c0aea32370eb297ae49d20340d1249af SHA256 2758f4cc572feb56de240f4c42610bf5b7d02f8e7e6a7cdd2de49097e7a915ab
 MISC ChangeLog 1689 RMD160 b0c351dc3a88d8b54c1ecccde22bcbda29eb7382 SHA1 aa0378cc3f42726d62c5e8cdacd902e127ecf063 SHA256 f7767acf6a720bf8e3304d7ba611e404070c03cc68e595bd0a0fb5a19ab750e0
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/app-admin/jailkit/jailkit-2.10.ebuild b/app-admin/jailkit/jailkit-2.10.ebuild
index 61fe0111290e58efd7a7a063d1926697bbe6064a..2a46e698bc67747d431830a70bbce3703c3f6b3a 100644 (file)
--- a/app-admin/jailkit/jailkit-2.10.ebuild
+++ b/app-admin/jailkit/jailkit-2.10.ebuild
@@ -18,16 +18,17 @@ IUSE=""
 src_prepare() {
        epatch \
                "${FILESDIR}/${P}-ldflags.patch" \
-               "${FILESDIR}/${P}-pyc.patch" \
-               "${FILESDIR}/${P}-destdir.patch"
+               "${FILESDIR}/${P}-pyc.patch"
        eautoreconf
 }
 
 src_install() {
-       dodir /etc
-       cp /etc/shells "${D}"/etc/shells || die
        emake DESTDIR="${D}" install || die "emake install failed"
-       doinitd "${FILESDIR}/jailkit" || die
+       doinitd "${FILESDIR}/jailkit"
+}
+
+pkg_postinst() {
+       elog "Don't forget to add /usr/sbin/jk_chrootsh to /etc/shells."
 }
 
 pkg_postrm() {