gentoo resync : 04.01.2018

5 files changed, 0 insertions, 185 deletions

diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 90a5c6b3faad..eda316ede101 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,6 +1,3 @@
-AUX zip-2.3-unix_configure-pic.patch 444 BLAKE2B 04992db8e9d676ea37f02cab00cc4f3ff9745890966d1f79bab6b9544649baa1a816a36ec10ce3773b7ee59b8446c48115938565b398f625a5da331636cb5efc SHA512 33a8ff4bd59d50868321ea04b7454ec3be2affaa998a9ccd0fa8cd51a3b1024a4b89c56102def8fa800b3124b9d0a508d7bf679c2e006315c3cf41be41ccf590
-AUX zip-2.31-exec-stack.patch 407 BLAKE2B a61e2e6b2fd420984fc9cae3c03cedf654c85424021b2cfe4209214873f870ad09f4db2b253ee67f5e3f7d652bf5b6f61476d459e55d9dbfcd13802b1ca9cca7 SHA512 a4e9eae229cece47052bb0f1de0314b72fa0bca3e7e9e8cfa484471746a39c3a1cf5f5f7f5996bca4bccf843361d5560c201d2f76ccaa36ebc2c0da13b7f8004
-AUX zip-2.32-build.patch 2003 BLAKE2B 0e999429e73c3cee99bfea71cc38da1844ef10acd59b735d8a0cc750c292a5d391eab14b73ae11eef8eb4413de9a8a9de6b787f5d9626ee6203da467361ec622 SHA512 e4853ac5537072c6b887d5e0fff5afa7bcbaf902910739698e76ba362f670fcdab807d1b142fe8f55a2b3e431412ed0d40f56fbf430a6bbaa65ed032758f413b
 AUX zip-3.0-build.patch 923 BLAKE2B 0a8b7d8fb98f9bc8750c3bb6ff9a672db86481ca88349e5e08d2e96ae0cabac4ef75651a91e9b0fb8e70e1c075ea721060a3851bdd6e103b1f4c020a8b4f4979 SHA512 c9cf162505938a0200eed0333849c2c4a3b59088a6549377a3af9ac89cd7a26fd388d09df55a6cd117e607c1a2f2960bc5e85f7384ff30565c2be01ce4ff442d
 AUX zip-3.0-exec-stack.patch 548 BLAKE2B 3ded2568eea78c89422ea043bb68917d4a508d6ee6d8d65e9db6c22f6d5dbcac15836a94ad5d1209112cb73c1da4f266346e722cafcf3a6a91080261c4d5df93 SHA512 575516abe5ed633bdda22c3ee41109400360eef437671f9b658d7591bb8fa3b3854c1cd92d6396e47d91545b23ecbbc1218190192e39a60b00d6b7b5bb793eab
 AUX zip-3.0-format-security.patch 507 BLAKE2B f595179f8267fc2866e21b8a943323e2146e118e44ed4dd6b03a65a2c433940efd5ccc98f72f8d85dd7291f9b0bcb8eb5068ad22b9bd6fa040265253e54d4b63 SHA512 172e842e1cd43006713f570ceb8bd4998595282b973569d0e264bd9599375668a4045d691fc952a75088ad6f17e6ff90baf22606388f73ad2f2c0ac64d250fa2
@@ -9,6 +6,5 @@ AUX zip-3.0-no-crypt.patch 1108 BLAKE2B 92de0a453e128a87a6d37f0a9cca55f5451946c1
 AUX zip-3.0-pic.patch 499 BLAKE2B 0b3ad7552ed4b3900b720360145f2466bb2835823a828ed4e3fe7e8ce22c547296ff0f74416f8b9a75ae4ef70d9cce521f96becbbbcc9ddb89481c3944d6b501 SHA512 a5f4381de900821c91bb164f580b7abe0bb61ebbbcb00e376f38763255bc647bda678fd66af59e9d56cb8bb7a2166553a77af79cfa75f3e0ea4dbc515b876b8e
 AUX zip-3.0-zipnote-freeze.patch 2170 BLAKE2B b0080c9d5310a9cdd14eebc503d76e7463969982717476aa4359ae1c4651290112654f25c202defeddec5efaf1f32ec74c824a7370727b7e6a055dcac6211908 SHA512 c7db2d8c43d33bff4be6068c89603d2f67876f2b5ea72a01ad53f1baa42206c7a0a967f101a54092715f7fcc3ee2bf45a448e76a0ef55e64dc0fe0b204966367
 DIST zip30.zip 1287223 BLAKE2B d29a3e3ddbaa3ce50c80b2dd058b39c35791bf2079879b61dab0be4f011ccd3331d1768ebda5a69aa150c651713eb7a99b02833bb727eee75a3e0bbdc8504cbc SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8
-EBUILD zip-3.0-r2.ebuild 1620 BLAKE2B 373efeea47d7a536cd94d2451b0010de2305dae6f9b53030e25376d818a1601eac9d5a067f8d7b59edeb76c9d813d29caa8cb77e9557debf5214b328d3d2e5fc SHA512 05f7dc22394c58b22435bad6c7de359ad994ccc1665ddae55a556f9f9dff6e14136a1115532b70ccb1809c3cf4b0eba14d3aadd26a3323a0b53ff3b5b2510b14
 EBUILD zip-3.0-r3.ebuild 1720 BLAKE2B 58973350277d37f4c13aaa19e300f2bdcbf1417f66878b2b83cb76cf2cd07e8b149c1dab5608fdf452a66416c728a6af3fbf1968b4869a21c03c8f8fa62699b7 SHA512 1910a94dc81acd0533d91b161a21b1270b4898708cdbb20bd9cf728add15456c23ba9f9b820e181beac7e77650c8cbabfabc1fc12993da281c9960884179cdf7
 MISC metadata.xml 573 BLAKE2B 1818315ab71e9bbcd96875d0bd99f11fc41131c1d082bd6468465a3dd8e48f79817958c8aa4d31f4d0ad0aa28bfced7fbdc5567cebd23badf2a9b9a623f6a80a SHA512 bd9d04efbaf530bd10d6641543984a3f5672de39c66538dd4c7a52684e8c6cf31111d3c8c0052e9958297a972c6b9f11131dd3f5d95af6db6ee9ca64c3ab5131
diff --git a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch b/app-arch/zip/files/zip-2.3-unix_configure-pic.patch
deleted file mode 100644
index 45b137b0ed85..000000000000
--- a/app-arch/zip/files/zip-2.3-unix_configure-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- unix/configure.orig	2004-09-28 06:45:33.000000000 +0000
-+++ unix/configure	2004-09-28 06:54:53.000000000 +0000
-@@ -29,6 +29,9 @@
- 
- echo Check if we can use asm code
- OBJA=""
-+piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
-+echo "Checking if compiler wants to create pic code"
-+[ "$piclib" == "" ] && \
- if eval "$CPP match.S > _match.s 2>/dev/null"; then
-   if test ! -s _match.s || grep error < _match.s > /dev/null; then
-     :
diff --git a/app-arch/zip/files/zip-2.31-exec-stack.patch b/app-arch/zip/files/zip-2.31-exec-stack.patch
deleted file mode 100644
index d3efbd902cb1..000000000000
--- a/app-arch/zip/files/zip-2.31-exec-stack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- zip-2.31/crc_i386.S
-+++ zip-2.31/crc_i386.S
-@@ -238,3 +238,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
- 
- #endif /* !USE_ZLIB */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- zip-2.31/match.S
-+++ zip-2.31/match.S
-@@ -405,3 +405,7 @@
- #endif /* i386 || _I386 || _i386 || __i386  */
- 
- #endif /* !USE_ZLIB */
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/app-arch/zip/files/zip-2.32-build.patch b/app-arch/zip/files/zip-2.32-build.patch
deleted file mode 100644
index 61a2bae34b3f..000000000000
--- a/app-arch/zip/files/zip-2.32-build.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-respect build environment settings
-
---- zip/unix/Makefile
-+++ zip/unix/Makefile
-@@ -12,15 +12,15 @@
- 
- list:   all
- 
--MAKE = make -f unix/Makefile
-+MAKE := $(MAKE) -f unix/Makefile
- SHELL = /bin/sh
- LN = ln -s
- 
- # (to use the Gnu compiler, change cc to gcc in CC)
--CC = cc
-+CC ?= gcc
- BIND = $(CC)
- AS = $(CC) -c
--CPP = /lib/cpp
-+CPP ?= $(CC)
- EXE =
- 
- # probably can change this to 'install' if you have it
-@@ -47,7 +47,7 @@
- #   LFLAGS1   flags after output file spec, before obj file list
- #   LFLAGS2   flags after obj file list (libraries, etc)
- CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
--CFLAGS = -O2 $(CFLAGS_NOOPT)
-+CFLAGS ?= -O2 $(CFLAGS_NOOPT)
- LFLAGS1 =
- LFLAGS2 = -s
- 
---- zip/unix/configure
-+++ zip/unix/configure
-@@ -13,52 +13,13 @@
- 
- CC=${1-cc}
--CFLAGS=${2-"-I. -DUNIX"}
--LFLAGS1=""
-+CFLAGS="${2--I. -DUNIX} ${CFLAGS} ${CPPFLAGS}"
-+LFLAGS1="${LDFLAGS}"
- LN="ln -s"
--echo "Check C compiler type (optimization option)"
--cat > conftest.c << _EOF_
--int main()
--{
--#ifndef __SUNPRO_C
--   bad code
--#endif
--   return 0;
--}
--_EOF_
--$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
--if test $? -eq 0; then
--  echo '  Sun C (-xO3)'
--  CFLAGS="${CFLAGS} -xO3"
--else
--  cat > conftest.c << _EOF_
--int main()
--{
--#ifndef __DECC
--   bad code
--#endif
--   return 0;
--}
--_EOF_
--  $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
--  if test $? -eq 0; then
--    echo '  DEC C (-O3)'
--    CFLAGS="${CFLAGS} -O3"
--  else
--    echo '  Other (gcc?) (-O2)'
--    CFLAGS="${CFLAGS} -O2"
--  fi
--fi
- 
- echo Check for the C preprocessor
- # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
- CPP="${CC} -E"
- # solaris as(1) needs -P, maybe others as well ?
--[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
--[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
--[ -f /lib/cpp ] && CPP=/lib/cpp
--[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
--[ -f /xenix ] && CPP="${CC} -E"
--[ -f /lynx.os ] && CPP="${CC} -E"
- 
- echo "#include <stdio.h>" > conftest.c
- $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
diff --git a/app-arch/zip/zip-3.0-r2.ebuild b/app-arch/zip/zip-3.0-r2.ebuild
deleted file mode 100644
index c7965cd8afc7..000000000000
--- a/app-arch/zip/zip-3.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_P="${PN}${PV//.}"
-DESCRIPTION="Info ZIP (encryption support)"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
-IUSE="bzip2 crypt natspec unicode"
-
-RDEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
-	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
-	epatch "${FILESDIR}"/${PN}-3.0-build.patch
-	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
-}
-
-src_configure() {
-	append-cppflags \
-		-DLARGE_FILE_SUPPORT \
-		-DUIDGID_NOT_16BIT \
-		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
-		-D$(usex crypt '' NO)CRYPT \
-		-D$(usex unicode '' NO)UNICODE_SUPPORT
-	# Third arg disables bzip2 logic as we handle it ourselves above.
-	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
-	if use bzip2 ; then
-		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
-	fi
-}
-
-src_compile() {
-	emake \
-		CPP="$(tc-getCPP)" \
-		-f unix/Makefile generic
-}
-
-src_install() {
-	dobin zip zipnote zipsplit
-	doman man/zip{,note,split}.1
-	if use crypt ; then
-		dobin zipcloak
-		doman man/zipcloak.1
-	fi
-	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
-}