From 2bacbb3374587799c77a999f56352233a353b19e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 May 2018 20:14:27 +0100 Subject: gentoo resync : 20.05.2018 --- app-arch/Manifest.gz | Bin 17256 -> 17250 bytes app-arch/unzip/Manifest | 1 - app-arch/unzip/unzip-6.0_p21.ebuild | 85 --------------------- app-arch/xar/Manifest | 4 - .../files/xar-1.5.2-automagic_acl_and_bzip2.patch | 46 ----------- app-arch/xar/files/xar-1.5.2-respect_ldflags.patch | 21 ----- app-arch/xar/xar-1.5.2-r1.ebuild | 35 --------- 7 files changed, 192 deletions(-) delete mode 100644 app-arch/unzip/unzip-6.0_p21.ebuild delete mode 100644 app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch delete mode 100644 app-arch/xar/files/xar-1.5.2-respect_ldflags.patch delete mode 100644 app-arch/xar/xar-1.5.2-r1.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 864fdee776ff..859224813135 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 0d12bfd91d93..d039cd25e104 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -6,5 +6,4 @@ DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0 DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 EBUILD unzip-6.0_p20.ebuild 2557 BLAKE2B 55203420f8676c64899a6e8572ea31ce3318018402e7f02790f7510d955d69fd3371e08ffa50bcb2867025e8542e6d745f20a0ba60562b2f8f7e7b42c25f53b8 SHA512 72014935da1e7acec784f189568fbec2756968811d348594d98e5a4f440579471b9e6348aa57877a18e0e34b6434aa144cd7015a88c5b999805428d4192dd212 EBUILD unzip-6.0_p21-r2.ebuild 2603 BLAKE2B 3048169f536561dbefb24bdf58a6d6bd9cd765debea8a96d29af7583313a73d20de06c18301df70205bec6c4829aa6dc54340413a758a5aeb249b4ee5f567f9f SHA512 66197722dae7909378d5b7f66c81924ca1a6d04947549460708bf63aaf19e833fb958b0d5b0e90e07900c25cdb14530983fc98132f8509f779a254e0434d2e61 -EBUILD unzip-6.0_p21.ebuild 2539 BLAKE2B 10ad8ccadfbd15b18449b61c3e3ed2c73d428ed85595e0065f2e397a4821221fd6dcb20be3c6d41b13c99f6b20de57fda263eabab2b842204e09ecde1f729d56 SHA512 df4efaf0e18777f9ffacc1e72100b33c60a35f535f15934fd9b1a5c5d287a3dd1fe9ab0442ca03fb316b7a792ab737bc130cae75116cb5b8adf7d825fceebdd5 MISC metadata.xml 476 BLAKE2B 4cd0cc36008b6ec9ee618ef2e8a9c48e7fc6228e051a5c24e922faace6645de951a6836cc5d49a6041102944bf5b1901a5febcd6db86b67eb4182cad46a2a100 SHA512 0b82799f21ec8d57451ce8f231d24eabb02f637ee6fd2c32af12f9806f104ea53dc4d848b29950c1d5e848ea81f04a58422fa37f39287937dfb54e186f30b653 diff --git a/app-arch/unzip/unzip-6.0_p21.ebuild b/app-arch/unzip/unzip-6.0_p21.ebuild deleted file mode 100644 index f86d5ebbf5b6..000000000000 --- a/app-arch/unzip/unzip-6.0_p21.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils toolchain-funcs flag-o-matic - -MY_PV="${PV//.}" -MY_PV="${MY_PV%_p*}" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/" -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -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 ~x86-linux" -IUSE="bzip2 natspec unicode" - -DEPEND="bzip2? ( app-arch/bzip2 ) - natspec? ( dev-libs/libnatspec )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local deb="${WORKDIR}"/debian/patches - rm "${deb}"/02-this-is-debian-unzip.patch || die - eapply "${deb}"/*.patch - - eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 - sed -i -r \ - -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ - -e '/^STRIP/s:=.*:=true:' \ - -e "s:\:CC=\"$(tc-getCC)\":" \ - -e "s:\:LD=\"$(tc-getCC)\":" \ - -e "s:\:AS=\"$(tc-getCC)\":" \ - -e 's:LF2 = -s:LF2 = :' \ - -e 's:LF = :LF = $(LDFLAGS) :' \ - -e 's:SL = :SL = $(LDFLAGS) :' \ - -e 's:FL = :FL = $(LDFLAGS) :' \ - -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \ - -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \ - unix/Makefile \ - || die "sed unix/Makefile failed" - - # Delete bundled code to make sure we don't use it. - rm -r bzip2 || die - - eapply_user -} - -src_configure() { - case ${CHOST} in - i?86*-*linux*) TARGET="linux_asm" ;; - *linux*) TARGET="linux_noasm" ;; - i?86*-*bsd* | \ - i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm - *bsd* | *dragonfly*) TARGET="bsd" ;; - *-darwin*) TARGET="macosx" ;; - *-cygwin*) TARGET="cygwin" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; - esac - - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD - use bzip2 && append-cppflags -DUSE_BZIP2 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE - append-cppflags -DLARGE_FILE_SUPPORT #281473 -} - -src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ - emake -f unix/Makefile ${TARGET} -} - -src_install() { - dobin unzip funzip unzipsfx unix/zipgrep - dosym unzip /usr/bin/zipinfo - doman man/*.1 - dodoc BUGS History* README ToDo WHERE -} diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest index 966d8958ec04..d2429e27c222 100644 --- a/app-arch/xar/Manifest +++ b/app-arch/xar/Manifest @@ -1,12 +1,8 @@ -AUX xar-1.5.2-automagic_acl_and_bzip2.patch 1619 BLAKE2B cd419468aa21e75e0e9010c2196fe500c3bd6deebc662d9a0c500564eb3db4e66f7657a61d1c8333a53df13105c422616756ab3423fe17f49181f203181fcbb3 SHA512 cecb77eebd658be30eb4132166563d829f76bf6ce6a0c38cdbff033ec7eab2d4aefe87eb9b8bbc80961ea9ee44f40cc90a87cfd4860aae66661d698126e678e1 -AUX xar-1.5.2-respect_ldflags.patch 1058 BLAKE2B 1cec257593cced310fbd323114ece020ca5b114aaecbe56b4ae27d8cb38f598c065fb0353c653f3427fdb0504a2536e796fcb6840c98369970e2e9f08257361c SHA512 30c474cc51d7cd3a6ffcbda565867ee81fb619d9648a8d2502a020b98ab36f756096ce88244db7d370b3627da9a5a88129fb5575cc1a6073bcdf26eb857a95bd AUX xar-1.6.1-ext2.patch 693 BLAKE2B c73338104f93aef90474f1d3489cb8655be2c8c19a9a9f27b51a61b12cfad5e30d51c69df312ccf82fdb036541117c377347e5956cb7d3c6a3ae2756feacccce SHA512 fd04b8552c85b0a4c40283b691746ef2a40aef17aa30ed697b8e1f83e10caa2e21b4c000197192e98a1ddcffd745a37ab592193eaa5120a7048b861ed1036c89 AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047257755dd0fab0e1459f7cfff79f7eaa16668a67e99f52d56dc1637dba7ea29991bd29c4bf11f0ef4727768 SHA512 01de32828d30d9d99f338bb34747a5f978982dbcc2aefac9c5718b5283185fa5857cdd031c799e57607da5bff7dc3190bb4a93c737f2520c1034e959ee819377 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c -DIST xar-1.5.2.tar.gz 137973 BLAKE2B 1bd478134f9de23094cbf6b6c6d15100629ebb3359c39b39eb6a2bfad80fefc74282655ecd2c32ef0140f3d69f5a75c13665c0a5015dc3e278f99bab3c1a9ade SHA512 975861324ee31805eb107f51f2f6c43029b25601d4c1daa2dfee49ec7e25351e94798de9fb5c011b90d93dd6a3bbd3fe15c97ab0fc32f0b36b3000dd48cbf46b DIST xar-1.6.1.tar.gz 180771 BLAKE2B efc15995941b7240486a02cad736981e4881dac8a576cb3188be1bb54aefbb612f374d82af56e1af27301d6d8f00698ad601f8ad4b0ae100107bbcd84cb203e8 SHA512 6ddf83130519006c4d8fe699cdf5a6e5e41b293f3411d4744bf3425fda21556ef54b95e46f60c13f9276070ccda94c8d95a543f1fda4cbd9e3087ab9b5d0b00b DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159 -EBUILD xar-1.5.2-r1.ebuild 798 BLAKE2B cf559675c085e7f4f2b97a3496aab0aaa468ffc2f35a68cb94a686526ae0dd90ab96e92ff452226b678c02709e2b9c4fef78735bc7ba82909c6b43dd24c38634 SHA512 e5e8f4b9ddb93e892cc2c4072cb97d3204758b2957aceb0f6268edf525a7ba980f3d121705902bc9a7d51f2660f91fc86521db213aa2cadaf237d4c07765b8dc EBUILD xar-1.6.1-r1.ebuild 795 BLAKE2B d4df3b81faa611d51fb4006dca04417cd8b1c91d6566fc2a306f0dca40d08081a1184bb378b0e2a0305562f197ebdbf5e9b23ef3311b9510f156c8e9abc69172 SHA512 8dffdbbbaf6519f6ec5cb69fd1f944f845c3c41d999b281bf66440c2a76fef08604aa5320f6042f30553d43fca1efe6713616f17ce1f5bd47148237d57ceb7e4 EBUILD xar-1.8-r1.ebuild 1208 BLAKE2B 4cdeb84cb00efe92a98afccfb4b3fe6d429b1456a7d1a275b5d2e3155e1373574735ccf176c0df7514a43aa50e5b45946cd10868116c9db4ca1dbf736f9b00d2 SHA512 9261fd405f79ebcec4b9dab0d865fbe531945d297573bdf77603f0bf26216191ba483b570cdc521c4ce44c15e205a1feacedf8940e311aaab5e3e6690a9b70f5 EBUILD xar-1.8.ebuild 1162 BLAKE2B 91a94417a7cc057a4df9ba6ee2bce98b9972fc0d7a2f0dbdd083cf0c37ab8ad88ef5710c995eb7edf212e2fcc3629f4b3dc1dcc63e28e0a1633631af769270b6 SHA512 afeca9c84293c6c08c8b9d2e7169e9159befe58f5cb8cf4d10a9a5f448baf91ccbe92d677e4f3461eb456c76d6af09befbb956b697c58fe8a8be3f1609bd754a diff --git a/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch b/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch deleted file mode 100644 index 54ad8f725314..000000000000 --- a/app-arch/xar/files/xar-1.5.2-automagic_acl_and_bzip2.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -ur xar-1.5.2.orig/configure.ac xar-1.5.2/configure.ac ---- xar-1.5.2.orig/configure.ac 2007-12-29 20:49:57.000000000 +0200 -+++ xar-1.5.2/configure.ac 2008-05-19 17:07:23.000000000 +0300 -@@ -181,8 +181,13 @@ - ) - AC_SUBST([enable_autogen]) - -+AC_ARG_ENABLE(acl, AC_HELP_STRING([--disable-acl], [disable support for libacl (default=autodetect)]), [ enable_acl=$enableval ], [ enable_acl=yes ]) -+ -+if test "x$enable_acl" = "xyes"; then - AC_TRY_COMPILE([#include - #include ], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])]) -+fi -+ - AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) - AC_CHECK_FUNCS(lgetxattr) - AC_CHECK_FUNCS(lsetxattr) -@@ -251,7 +256,9 @@ - AC_ERROR(can not detect the size of your system's dev_t type) - fi - --AC_CHECK_LIB(acl, acl_get_file) -+if test "x$enable_acl" = "xyes"; then -+ AC_CHECK_LIB(acl, acl_get_file) -+fi - - dnl Check for paths - AC_PREFIX_DEFAULT(/usr/local) -@@ -342,9 +349,14 @@ - dnl - dnl Configure libbz2. - dnl --have_libbz2="1" --AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"]) --AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"]) -+AC_ARG_ENABLE(bzip2, AC_HELP_STRING([--disable-bzip2], [disable support for libbz2 (default=autodetect)]), [ enable_bzip2=$enableval ], [ enable_bzip2=yes ]) -+ -+if test "x$enable_bzip2" = "xyes"; then -+ have_libbz2="1" -+ AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"]) -+ AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"]) -+fi -+ - if test "x${have_libbz2}" = "x1" ; then - AC_DEFINE([HAVE_LIBBZ2]) - fi diff --git a/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch b/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch deleted file mode 100644 index 1ac090d94863..000000000000 --- a/app-arch/xar/files/xar-1.5.2-respect_ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur xar-1.5.2.orig/lib/Makefile.inc.in xar-1.5.2/lib/Makefile.inc.in ---- xar-1.5.2.orig/lib/Makefile.inc.in 2007-12-29 20:49:57.000000000 +0200 -+++ xar-1.5.2/lib/Makefile.inc.in 2010-04-07 01:18:59.027890429 +0300 -@@ -134,7 +134,7 @@ - $(LIBRXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o) - @mkdir -p $(@D) - ifeq (elf, @abi@) -- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ -+ $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ - endif - ifeq (macho, @abi@) - $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name @abs_objroot@$(LIBRXAR_S) -o $@ $+ $(LDFLAGS) @LIBS@ -@@ -150,7 +150,7 @@ - $(LIBXAR_S) : $(LIBXAR_SRCS:@srcroot@%.c=@objroot@%.o) - @mkdir -p $(@D) - ifeq (elf, @abi@) -- $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ @LIBS@ -+ $(CC) -shared -Wl,-soname,$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ - endif - ifeq (macho, @abi@) - $(CC) -dynamiclib -compatibility_version @LIB_REV@ -current_version @LIB_REV@ -install_name $(LIBDIR)/$(LIBXAR_SNAME) -o $@ $+ $(LDFLAGS) @LIBS@ diff --git a/app-arch/xar/xar-1.5.2-r1.ebuild b/app-arch/xar/xar-1.5.2-r1.ebuild deleted file mode 100644 index 4f493f664b6a..000000000000 --- a/app-arch/xar/xar-1.5.2-r1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools base eutils - -DESCRIPTION="An easily extensible archive format" -HOMEPAGE="https://github.com/mackyle/xar" -SRC_URI="https://github.com/mackyle/${PN}/archive/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="acl +bzip2" - -DEPEND="dev-libs/openssl - dev-libs/libxml2 - sys-libs/zlib - acl? ( sys-apps/acl ) - bzip2? ( app-arch/bzip2 )" -RDEPEND="${DEPEND}" - -DOCS=( TODO ) -PATCHES=( "${FILESDIR}/${P}-automagic_acl_and_bzip2.patch" - "${FILESDIR}/${P}-respect_ldflags.patch" ) - -src_prepare() { - base_src_prepare - eautoconf -} - -src_configure() { - econf $(use_enable acl) $(use_enable bzip2) -} -- cgit v1.2.3