diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2014-08-26 14:46:33 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2014-08-26 14:46:33 +0000 |
| commit | 0e747e8288e8cf621ea2689dd6b29a64c9fe4f38 (patch) | |
| tree | dcb3b5cae6d1518aa0d9579bb60fb3ebaf31d4a8 | |
| parent | old (diff) | |
| download | historical-0e747e8288e8cf621ea2689dd6b29a64c9fe4f38.tar.gz historical-0e747e8288e8cf621ea2689dd6b29a64c9fe4f38.tar.bz2 historical-0e747e8288e8cf621ea2689dd6b29a64c9fe4f38.zip | |
Backport block to stabletarget
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/Manifest | 18 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild | 5 |
3 files changed, 16 insertions, 14 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index e463ce6d12ab..00eb2a0465d7 100644 --- a/sys-fs/cryptsetup/ChangeLog +++ b/sys-fs/cryptsetup/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for sys-fs/cryptsetup # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.175 2014/08/26 14:43:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.176 2014/08/26 14:46:27 ssuominen Exp $ 26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> +files/dmcrypt-1.0.6.confd, -cryptsetup-1.0.6-r2.ebuild, @@ -13,8 +13,9 @@ old 26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> cryptsetup-1.6.2.ebuild, - cryptsetup-1.6.6.ebuild: - Block use of USE gcrypt with USE static wrt #496612 + cryptsetup-1.6.5.ebuild, cryptsetup-1.6.6.ebuild: + Block use of USE gcrypt with USE static in stable, next stable and latest wrt + #496612 20 Aug 2014; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.6.6.ebuild: Add epatch_user #520276 by Nikoli. diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest index 8d1b37bc7118..507215fd7878 100644 --- a/sys-fs/cryptsetup/Manifest +++ b/sys-fs/cryptsetup/Manifest @@ -8,18 +8,18 @@ DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1 DIST cryptsetup-1.6.6.tar.xz 1145940 SHA256 2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f SHA512 6ee6b4e8fe4f721bb97d1cf47c5e2d1c96001dd3ac48154d414f64d23620ac3ec3eeea2ad584a1a3111e07a086c8a4fdbfabdf4859cda58ba2bd6765b1f009a8 WHIRLPOOL 07bb6b7f5153cfcd3a585f111733a05926d1f6f0ec190e0b0dc1777591bd0fec3c8782dc79f43bafd3829da28efbdd2d8f97daef8186392787c22c7f5e454376 EBUILD cryptsetup-1.6.2.ebuild 4371 SHA256 95d18eada6add203ca239fb02b0e8e889d631e91bf92743e32e00521d7c1699b SHA512 69c3d87f2a624ec18f7850698bc8e0c6fdf95971c9cfb6096b29137c4460789f4be9a01d4c86cb0051be14ce35cd8f0ad64db2580918d89641f97bd11b478847 WHIRLPOOL ea3405559c9af45c0af146d1a7773a36e405edb819d452ff7aeea5843b554a186a001d5c2e9d8030ad26dc07f5418edbcfb6331b9ba3ed8295f013c77f23c9d2 -EBUILD cryptsetup-1.6.5.ebuild 4405 SHA256 f7d8d1bbb9294c12a15fab20b82198fab237802c1772bfda7762f0693f3d03b3 SHA512 63963066e5d1d6c6e4117f41bbea972f8881eac741f54f8b8778f73d528e5c662911f9fa404489ea408c478bb57c9a9158aaca1f36b3edd53c58419d0d6ff333 WHIRLPOOL d2936bfc27fad010cf317fbda0af5fc6bb67969aa92f48449d4d904e27225d7f4f01383bdec5d8ce3d9cf4a45538f978923761b467529769b9c8cac6cd9fb7e8 +EBUILD cryptsetup-1.6.5.ebuild 4431 SHA256 188b492341e0ae95c40977a3d1e7b3a10ead7f27fa8fa4e6324b1ac83f78014f SHA512 29ba27589455a11fe9f835a212c89a9b9ebd9952aa5cbbf8ec8929dad037f706ca650d101a15afd59c42fd024021db21ca01d9666967968881bde967eaddadaf WHIRLPOOL baa8be98178993e12ef60a43d90195d4c88e019fa072d66d504f9b1b4d5475b3b3b00735be6369914ad79217c92b31a530160ba0025e6e3114d2786ef6df6512 EBUILD cryptsetup-1.6.6.ebuild 4444 SHA256 6b7ca2f0022446cf86b8340392514be0a9fb59b61da3ce92b120d51b5fccf0bc SHA512 d5c7bc3c00aac8c80714597487d5557a0ab4a5dcd53dc1ec008612a7b2279038462561e7a8636cc19998add6a81ea67487c0e1fbf9c5e60bb40118d81e4b13ed WHIRLPOOL 155b28f285322fdff84d15a3b5ee7d5a717045b1bb34e645e88b553d1125c7b35e29703e2e7c38ba7d1e91e53669251950224b8de0040ca2d5d175921ba0cb2a -MISC ChangeLog 27714 SHA256 5fc2488d803fd18262cd581ca693f6c5587998d87648152aa20b026340f9e43d SHA512 8893b2ea9de138e55accbd3a4d33c508d0be613f5d247af6fea24196ebbe3202733cf5ab30b73683de0c7fcb14dc0ceb8b8e488aff177c3ff3458690f1bda03c WHIRLPOOL 6becda54af1b5b1ffe81c0d0c33e2552ffe9a2f3a71449f7d0d51524ad672f7f168eeda7c7f7561c051d56940729d45138ffc0953d0f1477773ff221f776cf24 +MISC ChangeLog 27775 SHA256 71580801a4cb12bb2250b14459c704ac39ba6ce90e1cc5bb725031e8aa3dd04d SHA512 7fb77247c9879a8384565f18242b8268e510dd8a0154b608ef1eea9630565aeef2bba35c7a830de6d099bf84535b93a7e0987564bb61f18d37fe4706a1dabe18 WHIRLPOOL d046291101f185530497e8c6907b002610aabee3a754fc4476e492c5b94beb0cb4c87e3a0b94e0c758cdfb63e6d10e585294b9ff20e788f529a17fdadef2cb87 MISC metadata.xml 763 SHA256 494337a4a156da7feba29856957ffe6babede998bbbe2aa76ad68463f7a3ba4d SHA512 4124c6744a491b4b59115fe561408bde963d7527b835e5c554b3b99b460c6b2a9e98abb294f0e3de5af8625e27efecc7b139b8887b5e8b51af93772bd3574b1a WHIRLPOOL 1b76543228dffe7115e547dc068b6db84b06ff0a5f244c5964eb21cba55c9b6ee9637d4a19c38b4b9ebeba55ac7fe4437e97c4be32f26380fec6773b76ef8fce -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJT/JyeAAoJEEdUh39IaPFN2cQH/ReMrsJ/r4I0MbSjb1XcvG6L -rN5fJq8+07QUEZd2OyH1fDmzvVB6NQBE/Rk1FP7eVuXYyh1SzaZCkGdf6Y5u/fzW -zb/7VtmnxLaDX3o9KdhEPQViQjXfyf2W4H7ujTNMRixS7aRu+aizW6FbJrY4CknO -GVzW1zQvU/bGwgqHsjJqvtSBgiwBvBH/tyXkJMnCd/8/UI/d94+nWbTVHUNIJHBp -26OAaWySVnZXcJdOIQxi3s/WcRjlJvLneNORiGh143AFjkSnkivBrnkINRY9AvJZ -pryq59S9ezBTUOfU9pMumczOzgInHzL8vIz9LCebE/DDUecZJRrNOko/iq7ywsk= -=cbRI +iQEcBAEBCAAGBQJT/J09AAoJEEdUh39IaPFNLtkIAKBjPD63h6XvvRYA8XsioDYR +21x6/gD3EDdlYcVs5SFNiaN9FYr5C18wqFes5AIpYhE3ZwUGrx1pBdWuGEV3dmpI +/GWzy99BvqydZLZKq6EpK2F2otb0/dMFdu+6WeVmtZ/k6E7QfVX/L6heujtHRcDe +pnBl13HY1KFhvI0DS76cEhRMP4ZikDNRYPeFRFHFCFrhlf3RihcR2Qaul13V1onD +RVEXxyuS6NTIuyCWAzcSTQq+0+pXCx+0pQfndlkFLmQdb9mOespirkATwA9P/pQ0 +JZ/vwcDDv59O4HaG56b1MzQ9iD8H/+ZpQ2LQAHttcdyB0E7bJPGI/OOAH0Tem2w= +=qUEh -----END PGP SIGNATURE----- diff --git a/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild index 9093cd46b6e6..5674479ab7b1 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild,v 1.3 2014/08/19 17:10:23 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.5.ebuild,v 1.4 2014/08/26 14:46:27 ssuominen Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) @@ -20,7 +20,8 @@ CRYPTO_BACKENDS="+gcrypt kernel nettle openssl" # and it's missing ripemd160 support so it can't provide full backward compatibility IUSE="${CRYPTO_BACKENDS} nls python reencrypt static static-libs udev urandom" REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} ) - python? ( ${PYTHON_REQUIRED_USE} )" + python? ( ${PYTHON_REQUIRED_USE} ) + static? ( !gcrypt )" #496612 LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] |