aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-05-13 13:11:43 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-05-13 13:12:42 -0700
commit5568f421927fb454d70d1295cb3d45640f0806c1 (patch)
treee46261f7614d2352ae9cb3b2c0e060a98f93d122 /dev-libs
parentapp-emulation/emul-linux-x86-baselibs-20140406-r3: :( (diff)
downloadgmt-5568f421927fb454d70d1295cb3d45640f0806c1.tar.gz
gmt-5568f421927fb454d70d1295cb3d45640f0806c1.tar.bz2
gmt-5568f421927fb454d70d1295cb3d45640f0806c1.zip
remove cruft
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/openssl/Manifest1
-rw-r--r--dev-libs/openssl/foo.patch205
2 files changed, 0 insertions, 206 deletions
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 23d06e2..7a93eef 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -27,5 +27,4 @@ DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d5
EBUILD openssl-1.0.1g-r1.ebuild 9636 SHA256 cdda662d0611e49ec75ab27f031702fd7906e077ca40a6a2074041f3f1feac18 SHA512 384cc61f168cd7febd430aad9eba60af3709a767f996d99f97210a56b80ac106f2adef815135e2675507dffc42298fbf76f5c828c74af593ba0f67ae9e4ac513 WHIRLPOOL 286342825efa08d50cdce53aea1f853224601958df96591b11799db3d8054aa857af966d49dfaadf7659e523feceb2f9cb7352818892f17b00855effc74057e1
EBUILD openssl-1.0.2_beta1-r2.ebuild 9801 SHA256 e21ed24c2d6ef09b65e1f4695675251707f6d70dffa5d83759a8fed08e91c781 SHA512 d2f067362e66a907370ed548ee7892d2793f2a0d4c1999ee76f8efb86b97a51c37f0861462097436169281fe921d57a1eea508843de900fde29f61a91f925ac5 WHIRLPOOL 94ac633451c5d7296d04f02bf3196e549cf488474f2febbb2d1f62e9013269ac4bc3c01aeab4ad17c4cbd8aa09332705f025f1e582591244b7215c3d544092aa
MISC ChangeLog 80223 SHA256 fe8974058ec66d784832660cc3bcb52bee7ae8ed65aaf58902bcc57983a35f08 SHA512 045704ea2c08528c8801c98ac03613b85f911f33e9d2fcf25debc2ebbeea8f13d0142bbe5da8c6cb1a0f0b8a6b2bdc5909563ddcfdeec7ed88727e20a35978b0 WHIRLPOOL 217b8919dbae1ee66266bdb1bfff8d53d1148c97fe44edd4274c83622ea1148eea398c882df892db3ac65a730dbd8157507f4b69fa783d596817bde439a594da
-MISC foo.patch 7483 SHA256 561076530987ddfff0f8e6d2247579197d10b98937b857f0fa082f40cadcda3a SHA512 8554e2bbf9513e07141c113fd05cf16fb454afbbc17518c1df14888a520ec562880a366a50236ed60052e7f8625130d4acd65d4b9b36f80c783f347cae83afbb WHIRLPOOL 3b3be3260a7eb302005d912d06a312c7c18476214d25af2684a888f508b24e542542c88f627054488fea6fe098e3b3b650c55a068b4a2f32aec7082c3499bf9c
MISC metadata.xml 562 SHA256 5c61e2a07ffdb4ba157e0add7f84ff74458c890092d5e6980fd936dfdb457c34 SHA512 f83769af7ffd223923b72a62db27cbc80ca31925b95b720845b6bedd2a9b52837f70f9da93ee43e272ceb3c8424a8c9f35a31ebd5274bc04c91cd63ace1af844 WHIRLPOOL d98f2af2cf3e13c09ad526a2fe06fe8ef02e1db20fd4e3843f1793a97c9ae6a2897308c84038a9a37d6d68fadc7af6d913b980f4f079dac36ea3860a33aca8c2
diff --git a/dev-libs/openssl/foo.patch b/dev-libs/openssl/foo.patch
deleted file mode 100644
index 5d1d098..0000000
--- a/dev-libs/openssl/foo.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- openssl-1.0.1f-r1.ebuild 2013-12-20 11:26:59.000000000 -0800
-+++ openssl-1.0.1f-r1.ebuild 2013-12-26 20:12:31.211383132 -0800
-@@ -1,10 +1,10 @@
- # Copyright 1999-2013 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
--# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1e-r3.ebuild,v 1.1 2013/12/20 19:26:59 vapier Exp $
-+# $Header: $
-
- EAPI="4"
-
--inherit eutils flag-o-matic toolchain-funcs multilib
-+inherit eutils-multilib flag-o-matic toolchain-funcs autotools-multilib
-
- REV="1.7"
- DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
-@@ -14,27 +14,38 @@
-
- LICENSE="openssl"
- SLOT="0"
--KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
--IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib"
-+KEYWORDS="~amd64"
-+IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
-
- # Have the sub-libs in RDEPEND with [static-libs] since, logically,
- # our libssl.a depends on libz.a/etc... at runtime.
--LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
-- zlib? ( sys-libs/zlib[static-libs(+)] )
-- kerberos? ( app-crypt/mit-krb5 )"
-+LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+),${MULTILIB_USEDEP}] )
-+ zlib? ( sys-libs/zlib[static-libs(+),${MULTILIB_USEDEP}] )
-+ kerberos? ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] )"
-+
- # The blocks are temporary just to make sure people upgrade to a
- # version that lack runtime version checking. We'll drop them in
- # the future.
- RDEPEND="static-libs? ( ${LIB_DEPEND} )
-- !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-+ !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
- !<net-misc/openssh-5.9_p1-r4
-- !<net-libs/neon-0.29.6-r1"
-+ !<net-libs/neon-0.29.6-r1
-+ abi_x86_32? (
-+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-+ )"
- DEPEND="${RDEPEND}
- sys-apps/diffutils
- >=dev-lang/perl-5
- test? ( sys-devel/bc )"
- PDEPEND="app-misc/ca-certificates"
-
-+AUTOTOOLS_IN_SOURCE_BUILD=yes
-+MULTILIB_PARALLEL_PHASES="src_configure src_compile"
-+MULTILIB_WRAPPED_HEADERS=(
-+ usr/include/openssl/opensslconf.h
-+)
-+
- src_unpack() {
- unpack ${P}.tar.gz
- SSL_CNF_DIR="/etc/ssl"
-@@ -45,7 +56,22 @@
- > "${WORKDIR}"/c_rehash || die #416717
- }
-
--src_prepare() {
-+ehook autotools-multilib-global-pre_src_prepare global_pre_src_prepare
-+global_pre_src_prepare() {
-+ unset APPS #197996
-+ unset SCRIPTS #312551
-+ unset CROSS_COMPILE #311473
-+
-+ # Clean out patent-or-otherwise-encumbered code
-+ # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
-+ # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-+ # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-+ # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
-+ # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
-+
-+ use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-+ echoit() { echo "$@" ; "$@" ; }
-+
- # Make sure we only ever touch Makefile.org and avoid patching a file
- # that gets blown away anyways by the Configure script in src_configure
- rm -f Makefile
-@@ -84,33 +110,26 @@
- cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die
- chmod a+rx gentoo.config
-
-- append-flags -fno-strict-aliasing
-- append-flags $(test-flags-CC -Wa,--noexecstack)
--
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
- # The config script does stupid stuff to prompt the user. Kill it.
- sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
-- ./config --test-sanity || die "I AM NOT SANE"
- }
-
--src_configure() {
-- unset APPS #197996
-- unset SCRIPTS #312551
-- unset CROSS_COMPILE #311473
-+ehook autotools-multilib-per-abi-pre_src_configure abi_pre_src_configure
-+abi_pre_src_configure() {
-+ ./config --test-sanity || die "I AM NOT SANE (ABI=${ABI})"
-
-- tc-export CC AR RANLIB RC
-+ local krb5=$(has_version "app-crypt/mit-krb5[${MULTILIB_USEDEP}]" && echo "MIT" || echo "Heimdal")
-
-- # Clean out patent-or-otherwise-encumbered code
-- # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
-- # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
-- # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
-- # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
-- # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
-+ MULTILIB_TC_EXPORT_VARS="CC AR RANLIB RC" \
-+ multilib_tc_export abi_pre_src_configure_with_vars
-+}
-
-- use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-- echoit() { echo "$@" ; "$@" ; }
-+abi_pre_src_configure_with_vars() {
-+ local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
-+ append-flags -fno-strict-aliasing
-+ append-flags $(test-flags-CC -Wa,--noexecstack)
-
-- local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
-
- # See if our toolchain supports __uint128_t. If so, it's 64bit
- # friendly and can use the nicely optimized code paths. #460790
-@@ -162,25 +181,50 @@
- -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
- -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
- Makefile || die
-+
-+ # prevent autotools-utils std. configure sequence
-+ return 1
- }
-
--src_compile() {
-- # depend is needed to use $confopts; it also doesn't matter
-- # that it's -j1 as the code itself serializes subdirs
-+ehook autotools-multilib-per-abi-pre_src_compile abi_pre_src_compile
-+abi_pre_src_compile() {
- emake -j1 depend
-- emake all
-+}
-+
-+ehook autotools-multilib-per-abi-post_src_compile abi_post_src_compile
-+abi_post_src_compile() {
- # rehash is needed to prep the certs/ dir; do this
- # separately to avoid parallel build issues.
- emake rehash
- }
-
--src_test() {
-- emake -j1 test
-+ehook autotools-multilib-per-abi-pre_src_test abi_pre_src_test
-+abi_pre_src_test() {
-+ myemaketestargs+=("-j1")
- }
-
--src_install() {
-- emake INSTALL_PREFIX="${D}" install
-+ehook autotools-multilib-per-abi-pre_src_install abi_pre_src_install
-+abi_pre_src_install() {
-+ declare -a newotheremakeinstallargs
-+ local arg didit=no
-+ for arg in "${otheremakeinstallargs[@]}" ; do
-+ if [[ ${arg} == DESTDIR=* ]] ; then
-+ newotheremakeinstallargs+=("INSTALL_PREFIX${arg#DESTDIR}")
-+ didit=yes
-+ else
-+ newotheremakeinstallargs+=("${arg}")
-+ fi
-+ done
-+ [[ ${didit} == yes ]] || die "Couldn't find DESTDIR argument to munge"
-+ otheremakeinstallargs=("${newotheremakeinstallargs[@]}")
-+ return 0
-+}
-+
-+ehook autotools-multilib-best-abi-post_src_install best_abi_post_install
-+best_abi_post_install() {
- dobin "${WORKDIR}"/c_rehash #333117
-+
-+ emake INSTALL_PREFIX="${D}" install_docs || die "make install_docs_html failed"
- dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
- dohtml -r doc/*
- use rfc3779 && dodoc engines/ccgost/README.gost
-@@ -228,7 +272,7 @@
-
- pkg_preinst() {
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-- preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-+ multilib_preserve_old_lib /usr/@GET_LIBDIR@/lib{crypt,ssl}.so.0.9.8
- }
-
- pkg_postinst() {
-@@ -237,5 +281,5 @@
- eend $?
-
- has_version ${CATEGORY}/${PN}:0.9.8 && return 0
-- preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
-+ multilib_preserve_old_lib_notify /usr/@GET_LIBDIR@/lib{crypto,ssl}.so.0.9.8
- }