* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup: cryptsetup-1.4.1-r1.ebuild ChangeLog
@ 2012-05-11 8:06 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-11 8:06 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/11 08:06:55
Modified: cryptsetup-1.4.1-r1.ebuild ChangeLog
Log:
Unify static lib dependencies and update to EAPI=4.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.3 sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild?r1=1.2&r2=1.3
Index: cryptsetup-1.4.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cryptsetup-1.4.1-r1.ebuild 20 Mar 2012 19:04:50 -0000 1.2
+++ cryptsetup-1.4.1-r1.ebuild 11 May 2012 08:06:55 -0000 1.3
@@ -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 @@
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_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() {
1.130 sys-fs/cryptsetup/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?r1=1.129&r2=1.130
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- ChangeLog 1 Apr 2012 18:45:41 -0000 1.129
+++ ChangeLog 11 May 2012 08:06:55 -0000 1.130
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup: cryptsetup-1.4.1-r1.ebuild ChangeLog
@ 2012-05-11 8:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2012-05-11 8:13 UTC (permalink / raw
To: gentoo-commits
vapier 12/05/11 08:13:59
Modified: cryptsetup-1.4.1-r1.ebuild ChangeLog
Log:
Add write access to /dev/mapper and /dev/loop for tests #408047 by Toralf Förster.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Revision Changes Path
1.4 sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild?r1=1.3&r2=1.4
Index: cryptsetup-1.4.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cryptsetup-1.4.1-r1.ebuild 11 May 2012 08:06:55 -0000 1.3
+++ cryptsetup-1.4.1-r1.ebuild 11 May 2012 08:13:59 -0000 1.4
@@ -1,6 +1,6 @@
# 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.3 2012/05/11 08:06:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild,v 1.4 2012/05/11 08:13:59 vapier Exp $
EAPI="4"
@@ -59,6 +59,10 @@
ewarn "No /dev/mapper/control found -- skipping tests"
return 0
fi
+ local p
+ for p in /dev/mapper /dev/loop* ; do
+ addwrite ${p}
+ done
default
}
1.131 sys-fs/cryptsetup/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.131&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?rev=1.131&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/cryptsetup/ChangeLog?r1=1.130&r2=1.131
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- ChangeLog 11 May 2012 08:06:55 -0000 1.130
+++ ChangeLog 11 May 2012 08:13:59 -0000 1.131
@@ -1,6 +1,10 @@
# 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.130 2012/05/11 08:06:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.131 2012/05/11 08:13:59 vapier Exp $
+
+ 11 May 2012; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.1-r1.ebuild:
+ Add write access to /dev/mapper and /dev/loop for tests #408047 by Toralf
+ Förster.
11 May 2012; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.1-r1.ebuild:
Unify static lib dependencies and update to EAPI=4.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-11 8:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-11 8:13 [gentoo-commits] gentoo-x86 commit in sys-fs/cryptsetup: cryptsetup-1.4.1-r1.ebuild ChangeLog Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2012-05-11 8:06 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox