diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-11 08:06:55 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-11 08:06:55 +0000 |
| commit | f21e844b287843b39c1dcc9254f61f3567d4bbc1 (patch) | |
| tree | cedfcc699f9566d069e7cc85f1a42046ca1d513d /sys-fs/cryptsetup | |
| parent | probe .sh files to see if they are makeself archives #415013 by Alan Smithee (diff) | |
| download | gentoo-2-f21e844b287843b39c1dcc9254f61f3567d4bbc1.tar.gz gentoo-2-f21e844b287843b39c1dcc9254f61f3567d4bbc1.tar.bz2 gentoo-2-f21e844b287843b39c1dcc9254f61f3567d4bbc1.zip | |
Unify static lib dependencies and update to EAPI=4.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild | 42 |
2 files changed, 21 insertions, 26 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index dbb115400a30..84e1540984d3 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.129 2012/04/01 18:45:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.130 2012/05/11 08:06:55 vapier Exp $ + + 11 May 2012; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.1-r1.ebuild: + Unify static lib dependencies and update to EAPI=4. 01 Apr 2012; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.4.1.ebuild: alpha/ia64/s390/sh/sparc stable wrt #401217 diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild index 875ebe96fac3..3725611a05cf 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v 1.2 2012/03/20 19:04:50 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v 1.3 2012/05/11 08:06:55 vapier Exp $ -EAPI="2" +EAPI="4" inherit linux-info libtool @@ -18,27 +18,19 @@ IUSE="nls selinux static" S=${WORKDIR}/${MY_P} -RDEPEND="!<sys-apps/baselayout-2 - !static? ( - >=dev-libs/libgcrypt-1.1.42 - dev-libs/libgpg-error - >=dev-libs/popt-1.7 - >=sys-apps/util-linux-2.17.2 - >=sys-fs/lvm2-2.02.64 - ) - >=sys-fs/udev-124 - >=sys-libs/e2fsprogs-libs-1.41 - selinux? ( sys-libs/libselinux ) - !sys-fs/cryptsetup-luks" +LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] + >=dev-libs/popt-1.7[static-libs(+)] + >=sys-apps/util-linux-2.17.2[static-libs(+)] + >=dev-libs/libgcrypt-1.1.42[static-libs(+)] + >=sys-fs/lvm2-2.02.64[static-libs(+)] + >=sys-fs/udev-124[static-libs(+)] + >=sys-libs/e2fsprogs-libs-1.41[static-libs(+)]" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + !<sys-apps/baselayout-2 + !sys-fs/cryptsetup-luks + selinux? ( sys-libs/libselinux )" DEPEND="${RDEPEND} - static? ( - >=dev-libs/libgpg-error-1.10[static-libs] - >=dev-libs/popt-1.16-r1[static-libs] - || ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 ) - dev-libs/libgcrypt[static-libs] - || ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 ) - || ( >=sys-fs/udev-182[static-libs] <=sys-fs/udev-171-r5 ) - )" + static? ( ${LIB_DEPEND} )" pkg_setup() { local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" @@ -71,12 +63,12 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; } dodoc TODO ChangeLog README NEWS - newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die - newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt || die + newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt + newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt } pkg_postinst() { |