commit:     93dc6016dd13e90964ee1c89191566cb93fe4d32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 09:10:38 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 09:14:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93dc6016

sys-fs/ecryptfs-utils: python-single-r1, EAPI=6

 sys-fs/ecryptfs-utils/ecryptfs-utils-108-r1.ebuild |  83 +++++++++++++
 sys-fs/ecryptfs-utils/ecryptfs-utils-108.ebuild    | 134 ---------------------
 2 files changed, 83 insertions(+), 134 deletions(-)

diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-108-r1.ebuild 
b/sys-fs/ecryptfs-utils/ecryptfs-utils-108-r1.ebuild
new file mode 100644
index 0000000000..2bd4c1aab1
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-108-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pam python-single-r1 linux-info autotools
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="https://launchpad.net/ecryptfs";
+SRC_URI="https://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc gpg gtk openssl pam pkcs11 python suid tpm"
+
+RDEPEND=">=sys-apps/keyutils-1.0
+       >=dev-libs/libgcrypt-1.2.0:0
+       dev-libs/nss
+       gpg? ( app-crypt/gpgme )
+       gtk? ( x11-libs/gtk+:2 )
+       openssl? ( >=dev-libs/openssl-0.9.7 )
+       pam? ( sys-libs/pam )
+       pkcs11? (
+               >=dev-libs/openssl-0.9.7
+               >=dev-libs/pkcs11-helper-1.04
+       )
+       python? ( ${PYTHON_DEPS} )
+       tpm? ( app-crypt/trousers )"
+DEPEND="${RDEPEND}
+       virtual/pkgconfig
+       sys-devel/gettext
+       >=dev-util/intltool-0.41.0
+       python? ( dev-lang/swig )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+       use python && python-single-r1_pkg_setup
+
+       CONFIG_CHECK="~ECRYPT_FS"
+       linux-info_pkg_setup
+}
+
+src_configure() {
+       append-cppflags -D_FILE_OFFSET_BITS=64
+
+       econf \
+               --enable-nss \
+               --with-pamdir=$(getpam_mod_dir) \
+               $(use_enable doc docs) \
+               $(use_enable gpg) \
+               $(use_enable gtk gui) \
+               $(use_enable openssl) \
+               $(use_enable pam) \
+               $(use_enable pkcs11 pkcs11-helper) \
+               $(use_enable python pywrap) \
+               $(use_enable tpm tspi)
+}
+
+src_install(){
+       emake DESTDIR="${D}" install
+
+       if use python; then
+               echo "ecryptfs-utils" > 
"${D}$(python_get_sitedir)/ecryptfs-utils.pth" || die
+       fi
+
+       use suid && fperms u+s /sbin/mount.ecryptfs_private
+
+       find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+       if use suid; then
+               ewarn
+               ewarn "You have chosen to install ${PN} with the binary setuid 
root. This"
+               ewarn "means that if there are any undetected vulnerabilities 
in the binary,"
+               ewarn "then local users may be able to gain root access on your 
machine."
+               ewarn
+       fi
+}

diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-108.ebuild 
b/sys-fs/ecryptfs-utils/ecryptfs-utils-108.ebuild
deleted file mode 100644
index 87b301e435..0000000000
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-108.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-
-inherit flag-o-matic pam python linux-info autotools
-
-DESCRIPTION="eCryptfs userspace utilities"
-HOMEPAGE="https://launchpad.net/ecryptfs";
-SRC_URI="https://launchpad.net/ecryptfs/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc gpg gtk openssl pam pkcs11 python suid tpm"
-
-RDEPEND=">=sys-apps/keyutils-1.0
-       >=dev-libs/libgcrypt-1.2.0:0
-       dev-libs/nss
-       gpg? ( app-crypt/gpgme )
-       gtk? ( x11-libs/gtk+:2 )
-       openssl? ( >=dev-libs/openssl-0.9.7 )
-       pam? ( sys-libs/pam )
-       pkcs11? (
-               >=dev-libs/openssl-0.9.7
-               >=dev-libs/pkcs11-helper-1.04
-       )
-       tpm? ( app-crypt/trousers )"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       sys-devel/gettext
-       >=dev-util/intltool-0.41.0
-       python? ( dev-lang/swig )"
-
-pkg_setup() {
-       use python && python_pkg_setup
-
-       CONFIG_CHECK="~ECRYPT_FS"
-       linux-info_pkg_setup
-}
-
-src_prepare() {
-       echo "#!/bin/sh" > py-compile
-
-       # Python bindings are built/installed manually.
-       sed -e "/SUBDIRS =/s/ libecryptfs-swig//" -i src/Makefile.am || die 
"sed failed"
-
-       eautoreconf
-}
-
-src_configure() {
-       append-cppflags -D_FILE_OFFSET_BITS=64
-
-       econf \
-               --docdir="/usr/share/doc/${PF}" \
-               --enable-nss \
-               --with-pamdir=$(getpam_mod_dir) \
-               $(use_enable doc docs) \
-               $(use_enable gpg) \
-               $(use_enable gtk gui) \
-               $(use_enable openssl) \
-               $(use_enable pam) \
-               $(use_enable pkcs11 pkcs11-helper) \
-               $(use_enable python pywrap) \
-               $(use_enable tpm tspi)
-}
-
-src_compile() {
-       default
-
-       if use python; then
-               python_copy_sources src/libecryptfs-swig
-               building() {
-                       emake \
-                               PYTHON="$(PYTHON)" \
-                               PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-                               PYTHON_LDFLAGS="-L$(python_get_libdir) 
$(python_get_library -l)" \
-                               PYTHON_SITE_PKG="$(python_get_sitedir)" \
-                               PYTHON_VERSION="$(python_get_version)" \
-                               
SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-                               pyexecdir="$(python_get_sitedir)" \
-                               pythondir="$(python_get_sitedir)"
-               }
-               python_execute_function -s --source-dir src/libecryptfs-swig 
building
-       fi
-}
-
-src_install(){
-       emake DESTDIR="${D}" install
-
-       if use python; then
-               installation() {
-                       emake \
-                               DESTDIR="${D}" \
-                               PYTHON="$(PYTHON)" \
-                               PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-                               PYTHON_LDFLAGS="-L$(python_get_libdir) 
$(python_get_library -l)" \
-                               PYTHON_SITE_PKG="$(python_get_sitedir)" \
-                               PYTHON_VERSION="$(python_get_version)" \
-                               
SWIG_PYTHON_CPPFLAGS="-I$(python_get_includedir)" \
-                               pyexecdir="$(python_get_sitedir)" \
-                               pythondir="$(python_get_sitedir)" \
-                               install || return 1
-                       echo "ecryptfs-utils" > 
"${ED}$(python_get_sitedir)/ecryptfs-utils.pth"
-               }
-               python_execute_function -s --source-dir src/libecryptfs-swig 
installation
-
-               python_clean_installation_image
-       fi
-
-       use suid && fperms u+s /sbin/mount.ecryptfs_private
-
-       find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_postinst() {
-       use python && python_mod_optimize ecryptfs-utils
-
-       if use suid; then
-               ewarn
-               ewarn "You have chosen to install ${PN} with the binary setuid 
root. This"
-               ewarn "means that if there are any undetected vulnerabilities 
in the binary,"
-               ewarn "then local users may be able to gain root access on your 
machine."
-               ewarn
-       fi
-}
-
-pkg_postrm() {
-       use python && python_mod_cleanup ecryptfs-utils
-}

Reply via email to