From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-libs/ucl/Manifest | 5 - dev-libs/ucl/files/ucl-1.03-CFLAGS.patch | 134 ------------------------ dev-libs/ucl/files/ucl-1.03-x32.patch | 173 ------------------------------- dev-libs/ucl/metadata.xml | 5 - dev-libs/ucl/ucl-1.03-r1.ebuild | 45 -------- 5 files changed, 362 deletions(-) delete mode 100644 dev-libs/ucl/Manifest delete mode 100644 dev-libs/ucl/files/ucl-1.03-CFLAGS.patch delete mode 100644 dev-libs/ucl/files/ucl-1.03-x32.patch delete mode 100644 dev-libs/ucl/metadata.xml delete mode 100644 dev-libs/ucl/ucl-1.03-r1.ebuild (limited to 'dev-libs/ucl') diff --git a/dev-libs/ucl/Manifest b/dev-libs/ucl/Manifest deleted file mode 100644 index edaf2906e927..000000000000 --- a/dev-libs/ucl/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX ucl-1.03-CFLAGS.patch 4187 BLAKE2B 1f59a598cd58d53b25ecb57cf35720a56de022d19c0b57d749ec7cd35b88d8549db712affecbd5902bf98b9b55d375c6b16107d23c3ca126c57ae5ed4d3dbc6c SHA512 4d9b608b2b19cecc6693beb73c5f775b6f1ffbe1e1138dfe77a1318891705a10319e4e728f193f68555bff55a3a24871ec58c2823c487442559987dcb392a890 -AUX ucl-1.03-x32.patch 6437 BLAKE2B 285d7efd85f631752e208f95dc9be4ed8904da63d0e0a20b3bed1f62bc08b6ba0f155f33d1ab9ef3a9f883f4068fa49de4bb286fb73a7aee5638005b18b31348 SHA512 e6a481c12255c7756d424eded3de923a971c8ebb440776556d467ab950ed0944f3468b1f875f1ae835edfe47b44a6f738d5cb16bd8c49c085f6239685528a6ef -DIST ucl-1.03.tar.gz 534881 BLAKE2B 98df000bcf445963b901acf88b5d1a1065fd6f3eafd1b8adbda5bfe7ac1527b979252ff9d1e8474785f6f23a1a7452e39bf47ebac9216fcfff862625769cabd6 SHA512 7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34 -EBUILD ucl-1.03-r1.ebuild 1147 BLAKE2B 80df0cffcad4238f7b46c04a0610e8243678cf262ddbd4a3e48e64e2dccbe27ad7f24efa3bedb007782357b8b52ab4db5cc8a1b4cb9a1f71a0d1e4850be87cd4 SHA512 2f374cf021f973d745894e401837665e5d50c5e05fe750c7a101c3653d400567db8c3f547a0ec099601fd15f0cfc1a8568cca65663b4e59a6d1593e4d23efaa1 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch b/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch deleted file mode 100644 index 07c925b4888e..000000000000 --- a/dev-libs/ucl/files/ucl-1.03-CFLAGS.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Nathan Phillip Brink -Subject: Respect CCASFLAGS (which often defaults to CFLAGS). Fixes - compilation for portage-multilib users. - -diff -r c090ed619e90 configure.ac ---- a/configure.ac Sun Jun 26 16:00:09 2011 -0400 -+++ b/configure.ac Sun Jun 26 20:52:01 2011 -0400 -@@ -47,14 +47,12 @@ - AC_CANONICAL_TARGET - AM_MAINTAINER_MODE - --if test -z "$ac_abs_top_srcdir"; then -- _AC_SRCPATHS(.) --fi - if test -r .Conf.settings1; then - . ./.Conf.settings1 - fi - - AC_PROG_CC -+AM_PROG_AS - AC_PROG_CPP - mfx_PROG_CPPFLAGS - AC_C_CONST -@@ -84,13 +82,13 @@ - if test "X$enable_asm" != Xno; then - mfx_compile_S='${CC-cc} -c conftest.S 1>&AS_MESSAGE_LOG_FD' - cat > conftest.S <> 0)); ---- a/acc/acclib/perfctr.ch -+++ b/acc/acclib/perfctr.ch -@@ -63,7 +63,7 @@ ACCLIB_PUBLIC(int, acc_perfctr_open) (acc_perfctr_handle_p h) - break; /* no working TSC available */ - case PERFCTR_X86_AMD_K7: - #endif --#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) -+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) - case PERFCTR_X86_AMD_K8: - case PERFCTR_X86_AMD_K8C: - cc->tsc_on = 1; cc->nractrs = 2; ---- a/acc/acclib/rdtsc.ch -+++ b/acc/acclib/rdtsc.ch -@@ -21,7 +21,7 @@ - #if defined(acc_int32e_t) - - --#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32) && ACC_CC_GNUC) -+#if ((ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && ACC_CC_GNUC) - # if (ACC_CC_GNUC >= 0x020000ul) - # define __ACCLIB_RDTSC_REGS : : "r" (t) : "cc", "memory", "eax", "edx" - # else -@@ -38,7 +38,7 @@ - - ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t) - { --#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS) -+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS) - __asm__ __volatile__( - "clc \n" ".byte 0x0f, 0x31\n" - "movl %%eax,(%0)\n" "movl %%edx,4(%0)\n" -@@ -73,7 +73,7 @@ ACCLIB_PUBLIC(int, acc_tsc_read) (acc_uint32e_t* t) - - ACCLIB_PUBLIC(int, acc_tsc_read_add) (acc_uint32e_t* t) - { --#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32) && defined(__ACCLIB_RDTSC_REGS) -+#if (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) && defined(__ACCLIB_RDTSC_REGS) - __asm__ __volatile__( - "clc \n" ".byte 0x0f, 0x31\n" - "addl %%eax,(%0)\n" "adcl $0,%%edx\n" "addl %%edx,4(%0)\n" ---- a/src/ucl_conf.h -+++ b/src/ucl_conf.h -@@ -172,7 +172,7 @@ - #undef UA_SET2 - #undef UA_GET4 - #undef UA_SET4 --#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32) -+#if 1 && (ACC_ARCH_AMD64 || ACC_ARCH_IA32 || ACC_ARCH_X32) - # define UA_GET2(p) (* (const ucl_ushortp) (p)) - # define UA_SET2(p) (* (ucl_ushortp) (p)) - # define UA_GET4(p) (* (const acc_uint32e_t *) (p)) diff --git a/dev-libs/ucl/metadata.xml b/dev-libs/ucl/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/dev-libs/ucl/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/dev-libs/ucl/ucl-1.03-r1.ebuild b/dev-libs/ucl/ucl-1.03-r1.ebuild deleted file mode 100644 index 38a7acb307b6..000000000000 --- a/dev-libs/ucl/ucl-1.03-r1.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools eutils flag-o-matic - -DESCRIPTION="the UCL Compression Library" -HOMEPAGE="http://www.oberhumer.com/opensource/ucl/" -SRC_URI="http://www.oberhumer.com/opensource/ucl/download/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="static-libs" - -DEPEND="!!dev-libs/libucl" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CFLAGS.patch - epatch "${FILESDIR}"/${P}-x32.patch #426334 - - # lzo (and ucl) have some weird sort of mfx_* set of autoconf macros - # which may only be distributed with lzo itself? Rescue them and - # place them into acinclude.m4 because there doesn't seem to be an - # m4/... - sed -n -e '/^AC_DEFUN.*mfx_/,/^])#$/p' aclocal.m4 > acinclude.m4 || die "Unable to rescue mfx_* autoconf macros." - - sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die - - eautoreconf -} - -src_configure() { - # bug #585632 - append-cflags -std=c90 - - econf \ - --enable-shared \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} -- cgit v1.2.3