commit: 60da651906a0a9a4cf30b4792342660e0b59e9e4
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 4 19:54:20 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 19:54:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60da6519
dev-libs/cryptlib: treeclean
Gentoo-Bug: 630420
dev-libs/cryptlib/Manifest | 4 -
dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild | 114 ----------------
dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild | 145 ---------------------
.../cryptlib/files/cryptlib-3.4.3.1-build.patch | 130 ------------------
.../cryptlib/files/cryptlib-3.4.3.1-zlib.patch | 55 --------
.../cryptlib/files/cryptlib-3.4.4_beta-build.patch | 91 -------------
dev-libs/cryptlib/metadata.xml | 8 --
profiles/package.mask | 6 -
8 files changed, 553 deletions(-)
diff --git a/dev-libs/cryptlib/Manifest b/dev-libs/cryptlib/Manifest
deleted file mode 100644
index 898863be77a..00000000000
--- a/dev-libs/cryptlib/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cl3431.zip 5828863 SHA256
4a608d725f66669d983083420f9f57f763f320292c50346de3e8c1caeee743bd SHA512
d6a3403361fe39b855ec85b030989c5dfc54e499260869de0de151ad6f62245020561dd308b86edf6792da9663e19a0c0d21c53aa7434b21e83eb4b7445fd8dc
WHIRLPOOL
eccc446361f7daa9cf5a017ae7e229b2003f198490b9cae1bed61fd7bd585e9a08ec54c6c035ba2c4f3e8a58d3eb9756a61f608d5a299c8cc66b159a87e95874
-DIST cl344beta.zip 4433862 SHA256
f661e3f26944465fa9492cd17b339710d457da86d85d66e801f14fc4ba617411 SHA512
5144162b101c62e02fdaab20030a2fd3fb3b7a75cdf8a8160a3616f8e23d8f4a8db0eb9b1116d89f8c93e9be348b0458c22f3674e1d6c50f7380e50f60ad2483
WHIRLPOOL
cc8f6e7e1ff3641e59ec8ade9034caca11e1b6b0e8801bd5da8b03104aee372d0a8f205f04829a8a6ec5fd0bad1736230b2d24733037a64dd401106e09d43a1f
-DIST cryptlib-3.4.0-manual.pdf.bz2 1215921 SHA256
b06b736e6e123f578adcd08a8ede6cdb62e3e6d4ac2decb3570def1b29d44da8 SHA512
dbf9914a110a686dc23fedd23c16cefbae12cc67e378db67ac292f8f782b3b615a5819013f2b9c4861086c7ddfab690db9d68a911346102def323255cf48069b
WHIRLPOOL
8cc64ab7ffe8a97714e793dd3dfe36708e7e2c7ec583479c593d767de22b860be5bcf0a70427f6f2e7e1d9732ec4ba2d2b3f1617f97bb649c0298924e4a93fb6
-DIST cryptlib-3.4.4_beta-manual.pdf 3497791 SHA256
0317cde5a4d6967ceaf49471fe911c0238e78a233465d52755404f07ad2873a5 SHA512
3440aa86ac9672dfff302054c3868856d0dbc1a9ada47cfeed3761f7b3dc17cd45950ce24127ef5832803596263fa34bc6bfdd7a7b369f68959b4b93d59a3435
WHIRLPOOL
af53cd9328931ea7dfb8f2c65dc7265fe52db70f1e3b1d487bc10228fc8e6a53b18a0947e57e61e68e087c70a593b8799b5dfc7fd3bbf7825661afefd972aca4
diff --git a/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
b/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
deleted file mode 100644
index e6c6f90c117..00000000000
--- a/dev-libs/cryptlib/cryptlib-3.4.3.1-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic multilib toolchain-funcs versionator
-
-MY_PV="${PV//.}"
-
-DESCRIPTION="Powerful security toolkit for adding encryption to software"
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/";
-DOC_PREFIX="${PN}-$(get_version_component_range 1-2 ${PV}).0"
-SRC_URI="ftp://ftp.franken.de/pub/crypt/cryptlib/cl${MY_PV}.zip
- doc? ( mirror://gentoo/${DOC_PREFIX}-manual.pdf.bz2 )"
-
-LICENSE="Sleepycat"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="doc ldap odbc python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"
-
-RDEPEND="sys-libs/zlib
- ldap? ( net-nds/openldap )
- odbc? ( dev-db/unixODBC )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
- "${FILESDIR}/${P}-zlib.patch"
-)
-
-# test access the network
-RESTRICT="test"
-
-src_unpack() {
- # we need the -a option, so we can not use 'unpack'
- unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
- use doc && unpack "${DOC_PREFIX}-manual.pdf.bz2"
-}
-
-wrap_python() {
- if use python; then
- cd bindings || die
- distutils-r1_${1}
- fi
-}
-
-src_prepare() {
- default
-
- rm -fr zlib || die
-
- # we want our own CFLAGS ;-)
- sed -i -e "s:-m.*=pentium::g" -e "s:-fomit-frame-pointer::g" -e
"s:-O2::g" \
- -e "s:-O3::g" -e "s:-O4::g" makefile || die "sed makefile
failed"
- sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e
"s/-mcpu=[[:alnum:]\.=-]*//g" \
- -e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed
tools/ccopts.sh failed"
-
- # change 'make' to '$(MAKE)'
- sed -i -e "s:@\?make:\$(MAKE):g" makefile || die "sed makefile failed"
-
- wrap_python ${FUNCNAME}
-}
-
-src_compile() {
- use ldap && append-cppflags -DHAS_LDAP
- use odbc && append-cppflags -DHAS_ODBC
- append-cppflags -DHAS_ZLIB
-
- export DISABLE_AUTODETECT=1
- emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" shared
- use static-libs && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" default
- use test && emake EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}" stestlib
-
- #
- # Without this:
- # 1. python will link against the static lib
- # 2. tests will not work find soname.
- #
- local libname="libcl.so.$(get_version_component_range 1-3 ${PV})"
- local solibname="libcl.so.$(get_version_component_range 1-2 ${PV})"
- ln -s "${libname}" "${solibname}" || die
- ln -s "${solibname}" libcl.so || die
-
- if use python; then
- wrap_python ${FUNCNAME}
- fi
-}
-
-src_test() {
- LD_LIBRARY_PATH="." ./stestlib || die "test failed"
-}
-
-src_install() {
- einstalldocs
-
- doheader cryptlib.h
-
- dolib.so libcl.so*
- use static-libs && dolib.a libcl.a
-
- if use doc; then
- newdoc "${DOC_PREFIX}-manual.pdf" "manual.pdf"
- fi
-
- wrap_python ${FUNCNAME}
-}
diff --git a/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild
b/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild
deleted file mode 100644
index cc10e5c17e6..00000000000
--- a/dev-libs/cryptlib/cryptlib-3.4.4_beta.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 flag-o-matic multilib toolchain-funcs versionator
-
-MY_PV="${PV//.}"
-MY_PV="${MY_PV//_}"
-
-DESCRIPTION="Powerful security toolkit for adding encryption to software"
-HOMEPAGE="http://www.cs.auckland.ac.nz/~pgut001/cryptlib/";
-DOC_PREFIX="${PN}-$(get_version_component_range 1-2 ${PV}).0"
-SRC_URI="http://www.cypherpunks.to/~peter/cl${MY_PV}.zip
- doc? ( http://www.cypherpunks.to/~peter/manual.pdf -> ${P}-manual.pdf )"
-
-LICENSE="Sleepycat"
-KEYWORDS=""
-SLOT="0"
-IUSE="doc ldap odbc python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}"
-
-RDEPEND="sys-libs/zlib
- ldap? ( net-nds/openldap )
- odbc? ( dev-db/unixODBC )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-PATCHES=(
- "${FILESDIR}/${P}-build.patch"
-)
-
-#
-# test access the network
-# upstream provides no way to disable these
-# tests
-#
-RESTRICT="test"
-
-src_unpack() {
- # we need the -a option, so we can not use 'unpack'
- unzip -qoa "${DISTDIR}/cl${MY_PV}.zip" || die
-}
-
-wrap_python() {
- if use python; then
- cd bindings || die
- distutils-r1_${1}
- fi
-}
-
-pkg_setup() {
- #
- # Disable upstream detection
- # Non standard and hardcoded methods
- #
- export DISABLE_AUTODETECT=1
-
- #
- # Add our own CFLAGS/CPPFLAGS
- #
- export EXTRA_CFLAGS="${CPPFLAGS} ${CFLAGS}"
-
- #
- # Disable internal zlib dependnecies
- # For some reason this applied also when
- # System zlib is being used
- #
- COMMON_MAKE_OPTS="ZLIBOBJS= CC=$(tc-getCC) AR=$(tc-getAR) STRIP=true"
-}
-
-src_prepare() {
- default
-
- #
- # Make sure we do not use the embedded zlib
- #
- rm -fr zlib || die "remove zlib"
-
- #
- # Upstream package should not set optimization flags
- # Or at least allow simple method to disable behavior
- #
- sed -i -e "s:-fomit-frame-pointer::g" -e "s:-O2::g" \
- -e "s:-O3::g" -e "s:-O4::g" makefile || die "sed makefile
failed"
- sed -i -e "s/-march=[[:alnum:]\.=-]*//g" -e
"s/-mcpu=[[:alnum:]\.=-]*//g" \
- -e "s:-O2::g" -e "s:-O3::g" tools/ccopts.sh || die "sed
tools/ccopts.sh failed"
-
- #
- # Not sure why MAKE = make is required
- # make sets this to correct value
- #
- sed -i -e "/^MAKE/d" makefile || die "sed makefile make failed"
-
- wrap_python ${FUNCNAME}
-}
-
-src_compile() {
- use ldap && append-cppflags -DHAS_LDAP
- use odbc && append-cppflags -DHAS_ODBC
-
- emake ${COMMON_MAKE_OPTS} shared
- use static-libs && emake ${COMMON_MAKE_OPTS} default
- use test && emake ${COMMON_MAKE_OPTS} stestlib
-
- #
- # Symlink the libraries.
- #
- # Without this:
- # 1. python will link against the static lib
- # 2. tests will not work find soname.
- #
- # Upstream should have created the symlinks when
- # building and not when installing.
- #
- local libname="libcl.so.$(get_version_component_range 1-3 ${PV})"
- local solibname="libcl.so.$(get_version_component_range 1-2 ${PV})"
- ln -s "${libname}" "${solibname}" || die
- ln -s "${solibname}" libcl.so || die
-
- if use python; then
- wrap_python ${FUNCNAME}
- fi
-}
-
-src_test() {
- LD_LIBRARY_PATH="." ./stestlib || die "test failed"
-}
-
-src_install() {
- emake install ${COMMON_MAKE_OPTS} DESTDIR="${D}" PREFIX=/usr
PATH_LIB="/usr/$(get_libdir)"
- einstalldocs
-
- wrap_python ${FUNCNAME}
-
- if use doc; then
- newdoc "${DISTDIR}/${P}-manual.pdf" "manual.pdf"
- fi
-}
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-build.patch
b/dev-libs/cryptlib/files/cryptlib-3.4.3.1-build.patch
deleted file mode 100644
index 6fbbe0a561c..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-build.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From a65e87b8dbc48411b7fcade37612cf6e35be9865 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Fri, 3 Feb 2017 21:54:54 +0200
-Subject: [PATCH] build: use ldflags
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- tools/buildsharedlib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/buildsharedlib.sh b/tools/buildsharedlib.sh
-index 9a23592..c90dbc1 100644
---- a/tools/buildsharedlib.sh
-+++ b/tools/buildsharedlib.sh
-@@ -86,7 +86,7 @@ shift
-
- if [ "$($LD -v 2>&1 | grep -c gcc)" -gt 0 ] ; then
- LD_IS_GCC=1 ;
-- LDFLAGS="-shared -Wl,-soname,libcl.so.$VERS" ;
-+ LDFLAGS="-shared -Wl,-soname,libcl.so.$VERS $LDFLAGS" ;
- fi
-
- # Create the response file to hold the link command
---
-2.10.2
-
-From 188dce32ea9c58271c8ce48ab02a3b255498bf9f Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Sat, 4 Feb 2017 05:08:47 +0200
-Subject: [PATCH] build: allow specify additional CFLAGS
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/makefile b/makefile
-index cb9884c..827a78a 100644
---- a/makefile
-+++ b/makefile
-@@ -90,7 +90,7 @@ DYLIBNAME = lib$(PROJ).$(MAJ).$(MIN).dylib
- # Further cc flags are gathered dynamically at runtime via the ccopts.sh
- # script.
-
--CFLAGS = -c -D__UNIX__ -DNDEBUG -I.
-+CFLAGS = -c -D__UNIX__ -DNDEBUG -I. $(EXTRA_CFLAGS)
- CFLAGS_ANALYSE = -c -D__UNIX__ -I.
- CFLAGS_COVERAGE = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O1
--coverage -fprofile-arcs -ftest-coverage
- CFLAGS_DEBUG = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O0
---
-2.10.2
-
-From 3a084f090f12ebc65cef7b14aeaa28257dacaaaa Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Sat, 4 Feb 2017 06:19:51 +0200
-Subject: [PATCH] build: ccopts: detect mutex using pre-processor
-
-this required for proper cross compile detection.
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- tools/ccopts.sh | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/tools/ccopts.sh b/tools/ccopts.sh
-index e506c6c..8cc87ff 100644
---- a/tools/ccopts.sh
-+++ b/tools/ccopts.sh
-@@ -324,13 +324,14 @@ fi
- # tend to be somewhat hit-and-miss but we at least indicate their presence
- # via a define.
-
--if [ -f /usr/include/pthread.h ] ; then
-- if [ "$(grep -c PTHREAD_MUTEX_RECURSIVE /usr/include/pthread.h)" -gt 0
] ; then
-- CCARGS="$CCARGS -DHAS_RECURSIVE_MUTEX" ;
-- fi ;
-- if [ "$(grep -c PTHREAD_MUTEX_ROBUST /usr/include/pthread.h)" -gt 0 ] ;
then
-- CCARGS="$CCARGS -DHAS_ROBUST_MUTEX" ;
-- fi ;
-+PTHREAD_OUT="$(echo "#include <pthread.h>" | ${CC} -E - 2> /dev/null)"
-+if [ $? -eq 0 ]; then
-+ if echo "${PTHREAD_OUT}" | grep -q PTHREAD_MUTEX_RECURSIVE; then
-+ CCARGS="$CCARGS -DHAS_RECURSIVE_MUTEX"
-+ fi
-+ if echo "${PTHREAD_OUT}" | grep -q PTHREAD_MUTEX_ROBUST; then
-+ CCARGS="$CCARGS -DHAS_ROBUST_MUTEX"
-+ fi
- fi
-
- # If we're not using gcc, we're done. This isn't as simple as a straight
---
-2.10.2
-
-From 489a81e89103a7a3c653b9e95e279eefa1514c51 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Sat, 4 Feb 2017 06:28:03 +0200
-Subject: [PATCH] build: ccopts: support disable of autodetection
-
-requires for cross-compile and explicit predictable build.
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- tools/ccopts.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/ccopts.sh b/tools/ccopts.sh
-index 8cc87ff..296bc80 100644
---- a/tools/ccopts.sh
-+++ b/tools/ccopts.sh
-@@ -150,7 +150,7 @@ case $OSNAME in
- HASDYNLOAD=1 ;
- fi ;;
- esac
--if [ $HASDYNLOAD -gt 0 ] ; then
-+if [ -z $DISABLE_AUTODETECT ] && [ $HASDYNLOAD -gt 0 ] ; then
- if [ -f /usr/include/sql.h ] ; then
- echo "ODBC interface detected, enabling ODBC support." >&2 ;
- CCARGS="$CCARGS -DHAS_ODBC" ;
-@@ -181,7 +181,7 @@ if [ $HASDYNLOAD -gt 0 ] ; then
- CCARGS="$CCARGS -DNCIPHER_PKCS11" ;
- fi
- fi
--if [ -d /usr/include/event2 ] && [ -f /usr/include/event2/event.h ] ; then
-+if [ -z $DISABLE_AUTODETECT ] && [ -d /usr/include/event2 ] && [ -f
/usr/include/event2/event.h ] ; then
- echo " (Enabling use of libevent)." >&2 ;
- CCARGS="$CCARGS -DHAS_LIBEVENT" ;
- fi
---
-2.10.2
-
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-zlib.patch
b/dev-libs/cryptlib/files/cryptlib-3.4.3.1-zlib.patch
deleted file mode 100644
index 8bb722a6bf5..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.3.1-zlib.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 3a3a469d226b6da69b583516b982135af4bb2718 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Fri, 3 Feb 2017 21:41:40 +0200
-Subject: [PATCH] build: use system zlib
-
-this should be a toggle of build system not hard coded.
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- envelope/envelope.h | 6 +-----
- makefile | 4 ++--
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/envelope/envelope.h b/envelope/envelope.h
-index e0e0c3e..90a8267 100644
---- a/envelope/envelope.h
-+++ b/envelope/envelope.h
-@@ -17,11 +17,7 @@
- #endif /* Compiler-specific includes */
- #endif /* _STREAM_DEFINED */
- #ifdef USE_COMPRESSION
-- #if defined( INC_ALL )
-- #include "zlib.h"
-- #else
-- #include "zlib/zlib.h"
-- #endif /* Compiler-specific includes */
-+ #include <zlib.h>
- #endif /* USE_COMPRESSION */
-
- /****************************************************************************
-diff --git a/makefile b/makefile
-index 14c0b8f..cb9884c 100644
---- a/makefile
-+++ b/makefile
-@@ -283,7 +283,7 @@ ZLIBOBJS = $(OBJPATH)adler32.o $(OBJPATH)deflate.o
$(OBJPATH)inffast.o \
- OBJS = $(BNOBJS) $(CERTOBJS) $(CRYPTOBJS) $(CTXOBJS) $(DEVOBJS) \
- $(ENCDECOBJS) $(ENVOBJS) $(HASHOBJS) $(IOOBJS)
$(KEYSETOBJS) \
- $(KRNLOBJS) $(LIBOBJS) $(MECHOBJS) $(MISCOBJS)
$(SESSOBJS) \
-- $(ZLIBOBJS) $(OSOBJS)
-+ $(OSOBJS)
-
- # Object files for the self-test code
-
-@@ -1486,7 +1486,7 @@ $(LIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
-
- $(SLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- @./tools/buildsharedlib.sh $(OSNAME)
$(SLIBNAME) $(LD) \
-- $(STRIP) $(MAJ).$(MIN) $(OBJS)
$(EXTRAOBJS)
-+ $(STRIP) $(MAJ).$(MIN) $(OBJS)
$(EXTRAOBJS) -lz
-
- $(DYLIBNAME): $(OBJS) $(EXTRAOBJS) $(TESTOBJS)
- @$(LD) -dynamiclib -compatibility_version
$(MAJ).$(MIN) \
---
-2.10.2
-
diff --git a/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch
b/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch
deleted file mode 100644
index e2530b7e557..00000000000
--- a/dev-libs/cryptlib/files/cryptlib-3.4.4_beta-build.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 515d66d1d091b444330b225127b084a9b19fa807 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Thu, 31 Aug 2017 22:12:52 +0300
-Subject: [PATCH 1/3] build: allow specify additional CFLAGS
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/makefile b/makefile
-index de5381f..a31bc1d 100644
---- a/makefile
-+++ b/makefile
-@@ -90,7 +90,7 @@ DYLIBNAME = lib$(PROJ).$(MAJ).$(MIN).dylib
- # Further cc flags are gathered dynamically at runtime via the ccopts.sh
- # script.
-
--CFLAGS = -c -D__UNIX__ -DNDEBUG -I.
-+CFLAGS = -c -D__UNIX__ -DNDEBUG -I. $(EXTRA_CFLAGS)
- CFLAGS_ANALYSE = -c -D__UNIX__ -I.
- CFLAGS_COVERAGE = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O1
--coverage -fprofile-arcs -ftest-coverage
- CFLAGS_DEBUG = -c -D__UNIX__ -I. -ggdb3 -fno-omit-frame-pointer -O0
---
-2.13.5
-
-From cbec0a8ab9fab9acda239d3f37b7e593ac8e44e9 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Thu, 31 Aug 2017 22:14:47 +0300
-Subject: [PATCH 2/3] build: install: create correct directories + quote
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/makefile b/makefile
-index a31bc1d..2a49040 100644
---- a/makefile
-+++ b/makefile
-@@ -443,13 +443,13 @@ PATH_LIB=$(PREFIX)/lib
- PATH_INCLUDE=$(PREFIX)/include
-
- install-dirs:
-- @if [ ! -d $(PATH_LIB) ] ; then \
-- mkdir $(PATH_LIB) ; \
-- chmod 755 $(PATH_LIB) ; \
-+ @if [ ! -d "$(DESTDIR)$(PATH_LIB)" ] ; then \
-+ mkdir -p "$(DESTDIR)$(PATH_LIB)" ; \
-+ chmod 755 "$(DESTDIR)$(PATH_LIB)" ; \
- fi
-- @if [ ! -d $(PATH_INCLUDE) ] ; then \
-- mkdir $(PATH_INCLUDE) ; \
-- chmod 755 $(PATH_INCLUDE) ; \
-+ @if [ ! -d "$(DESTDIR)$(PATH_INCLUDE)" ] ; then \
-+ mkdir -p "$(DESTDIR)$(PATH_INCLUDE)" ; \
-+ chmod 755 "$(DESTDIR)$(PATH_INCLUDE)" ; \
- fi
-
- install:
---
-2.13.5
-
-From 78cd16457a88e0d79a5b61d8dee29b535cd81a28 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.bar...@gmail.com>
-Date: Thu, 31 Aug 2017 22:30:25 +0300
-Subject: [PATCH 3/3] build: install: use relative symlinks
-
-Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
----
- makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/makefile b/makefile
-index 2a49040..5582252 100644
---- a/makefile
-+++ b/makefile
-@@ -461,8 +461,8 @@ install:
- if [ -f "$(SLIBNAME)" ] ; then \
- cp "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)" ; \
- chmod 755 "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)" ; \
-- ln -s "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)"
"$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so.$(MAJ)" ; \
-- ln -s "$(DESTDIR)$(PATH_LIB)/$(SLIBNAME)"
"$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so" ; \
-+ ln -s "$(SLIBNAME)"
"$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so.$(MAJ)" ; \
-+ ln -s "$(SLIBNAME)" "$(DESTDIR)$(PATH_LIB)/lib$(PROJ).so" ; \
- fi
- cp cryptlib.h "$(DESTDIR)$(PATH_INCLUDE)"
- chmod 644 "$(DESTDIR)$(PATH_INCLUDE)/cryptlib.h"
---
-2.13.5
-
diff --git a/dev-libs/cryptlib/metadata.xml b/dev-libs/cryptlib/metadata.xml
deleted file mode 100644
index f1c3d59fb21..00000000000
--- a/dev-libs/cryptlib/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>cry...@gentoo.org</email>
- <name>Crypto</name>
-</maintainer>
-</pkgmetadata>
diff --git a/profiles/package.mask b/profiles/package.mask
index f192a9544a2..b8536ac81ec 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -193,12 +193,6 @@ x11-apps/python-whiteboard
>=dev-java/javatoolkit-0.6.0
# Alon Bar-Lev <alo...@gentoo.org> (08 Sep 2017)
-# Complex build system, hard to maintain, no dependencies in tree, upstream
-# does not cooperate (Bug#630420).
-# Removal in 30 days.
-dev-libs/cryptlib
-
-# Alon Bar-Lev <alo...@gentoo.org> (08 Sep 2017)
# Upstream no longer maintain (Bug#628908).
# Removal in 30 days.
sys-auth/pam_pkcs11
