Both patches are actually not needed now.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index ad1d4da45a001983cf7fb583f50f23746f6a70ed..52d21e3727e64fd650e4ca5df8ed7d15ac5af2a4 100644 (file)
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.81 2010/05/01 21:40:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.82 2010/05/01 21:59:18 robbat2 Exp $
+
+  01 May 2010; Robin H. Johnson <robbat2@gentoo.org>
+  cryptsetup-1.1.1_rc1.ebuild:
+  Both patches are actually not needed now.
 
 *cryptsetup-1.1.1_rc1 (01 May 2010)
 

diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 65e4f050d1b7c02d14193f92ea9fa48544a8e897..d739ddb41689593bc41b00218c976cac3769036e 100644 (file)
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -23,6 +23,6 @@ EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2
 EBUILD cryptsetup-1.0.7-r1.ebuild 3018 RMD160 2287bad817297bdfd972f3a8747d3c70be3955c6 SHA1 2cdd53dc478dfba7fba3050a2b134b52a1b65489 SHA256 7886a41d8aec79ef373a815f9860a57fbcbdf08a0323eee92cae45f423164f4d
 EBUILD cryptsetup-1.0.7.ebuild 3056 RMD160 69eb9e5572e3e0a4492dc4f470c067dc660e0a80 SHA1 777fc921347d9d4cc3f295b6021ea7aa822bed80 SHA256 bb6659123697cd5911e0535bcc913a2ad7c649f6458e29ded30304af5dd6eb01
 EBUILD cryptsetup-1.1.0.ebuild 2952 RMD160 4f790c0b7388319bc4935237a301868f443b0303 SHA1 23859d8a72aea30d92ac5c6ed63c8d63648fe6ac SHA256 7d90181d116cf2debeec1b17e4bd5e6ee12b3823f8e6af4c11a7e80ba209c0cf
-EBUILD cryptsetup-1.1.1_rc1.ebuild 2976 RMD160 22ebdbd9bd384c291ae7465a13030e00cda58865 SHA1 eaaf52df56624245c1e54f88c4708eba70df325a SHA256 c3a6eb7c87023c0052c0e20ba25f003d1ecf98c01cf71e2ea3c515d30d53ab8e
-MISC ChangeLog 11593 RMD160 45fa58421af1798a66ec3f04519d4153ade049d2 SHA1 0157d87cbbe1a9beb5d8f7b090d60ac78deb8306 SHA256 580fa535dc149edce21e8a1f76118579e6939493ed1fd2686f98c21ec8114dc0
+EBUILD cryptsetup-1.1.1_rc1.ebuild 2982 RMD160 744e8fcac011ecfd11def3149c5bcdd47087dba6 SHA1 89bb9d0376786cf70c5c9a7d5ab2e9174bb935a7 SHA256 eb5b16906624d610acd7daf251b6280f733dfe4e9e2d74e691afbf85520e8d92
+MISC ChangeLog 11722 RMD160 19a0d92e42b867d767e97b27e266bbb2df0f4c28 SHA1 4c0a754ba0a74d403cff53809d6d848015553e5d SHA256 b010ceb6f7d008e5027c09d124977985bea5b716392a4b4a23604fd260b22f67
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a

diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
index 942e252c4d49f3c56cfe90a63a66973994d58b3a..ce208fc85c2a2ab297a2c5a4309f087fe9ac8637 100644 (file)
--- a/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild,v 1.1 2010/05/01 21:40:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.1_rc1.ebuild,v 1.2 2010/05/01 21:59:18 robbat2 Exp $
 
 EAPI=2
 
@@ -42,9 +42,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # Merged upstream
+       # Both merged upstream
        #epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
-       epatch "${FILESDIR}"/1.1.0-libudev.patch
+       #epatch "${FILESDIR}"/1.1.0-libudev.patch
        eautoreconf
        :
 }