diff options
65 files changed, 405 insertions, 1339 deletions
diff --git a/app-accessibility/SphinxTrain/Manifest b/app-accessibility/SphinxTrain/Manifest index 6fa3838797b7..331da4adcb74 100644 --- a/app-accessibility/SphinxTrain/Manifest +++ b/app-accessibility/SphinxTrain/Manifest @@ -1,2 +1 @@ -DIST SphinxTrain-0.9.1-beta.tar.gz 469617 BLAKE2B ad1e4456501a46a51c169468e1f29e15eaf40eeea08474e0c786cc4dafbf4d504c91e65644e61939cac96526cba678d025487f736eb99b1ca186ebc822e64dd1 SHA512 1b33a58a6e05069369fe1ba668609e5a25d6a49fbf2fed1f5d86bdc1fc43d4544627c438e61d46003c2dbd8d7fa6f41c686b57cbca215f73b6c4ba0d7682076d DIST sphinxtrain-1.0.8.tar.gz 8925803 BLAKE2B e268c00843445cb69ae2a88f93fb4aa640556179417d44f6297d87f7e509418778b4808885bb19ab163efbd71565a3b6d75d269b420e9e366c0c6553a04b3053 SHA512 465d2c4ade9acc7b49c1d975449c38ac01d5a3ff332f9841be66cd8ca9d2f0b68fd36cc8a46384c8b510042efa91c3887a080481e84f2d0deb9775a598835f2b diff --git a/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild b/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild deleted file mode 100644 index 390ba6824444..000000000000 --- a/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs - -DESCRIPTION="Speech Recognition (Training Module)" -HOMEPAGE="http://cmusphinx.sourceforge.net/html/cmusphinx.php" -SRC_URI="http://www.speech.cs.cmu.edu/${PN}/${P}-beta.tar.gz" - -LICENSE="BSD-with-attribution" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -DEPEND="app-accessibility/sphinx2 - app-accessibility/festival" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN} - -src_prepare() { - epatch "${FILESDIR}"/gcc.patch - epatch "${FILESDIR}"/gcc34.patch - tc-export CC AR RANLIB -} - -src_install() { - # dobin bin.*/* fails ... see bug #73586 - find bin.* -mindepth 1 -maxdepth 1 -type f -exec dobin '{}' \; || die - - dodoc README etc/*cfg - dohtml doc/*{txt,html,sgml} -} - -pkg_postinst() { - elog "Detailed usage and training instructions can be found at" - elog "http://www.speech.cs.cmu.edu/SphinxTrain/" -} diff --git a/app-accessibility/SphinxTrain/files/gcc.patch b/app-accessibility/SphinxTrain/files/gcc.patch deleted file mode 100644 index e3c51275f910..000000000000 --- a/app-accessibility/SphinxTrain/files/gcc.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- src/programs/count_3phone/wrec.h.orig 2003-09-28 18:51:49.000000000 +0900 -+++ src/programs/count_3phone/wrec.h 2003-09-28 18:52:23.000000000 +0900 -@@ -44,7 +44,7 @@ - #define WREC_H - - #include "phrec.h" --#include <varargs.h> -+#include <stdarg.h> - - int quit (int status, char *fmt, ...); - ---- src/programs/count_3phone/quit.c.orig 2003-09-28 19:12:56.000000000 +0900 -+++ src/programs/count_3phone/quit.c 2003-09-28 19:13:12.000000000 +0900 -@@ -74,17 +74,14 @@ - - #include <stdio.h> - #include <stdlib.h> --#include <varargs.h> -+#include <stdarg.h> - --int quit (status,fmt,va_alist) -- int status; -- char *fmt; -- va_dcl -+int quit (int status,char *fmt,...) - { - va_list args; - - fflush(stdout); -- va_start(args); -+ va_start(args, fmt); - (void) vfprintf(stderr, fmt, args); - va_end(args); - exit(status); diff --git a/app-accessibility/SphinxTrain/files/gcc34.patch b/app-accessibility/SphinxTrain/files/gcc34.patch deleted file mode 100644 index 124aa993edc9..000000000000 --- a/app-accessibility/SphinxTrain/files/gcc34.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- SphinxTrain/src/programs/count_3phone/phone_word_io.c~ 2001-04-05 16:00:33.000000000 -0400 -+++ SphinxTrain/src/programs/count_3phone/phone_word_io.c 2005-05-01 12:48:42.000000000 -0400 -@@ -71,7 +71,7 @@ - #ifdef __alpha - void *malloc(); - #else --char *malloc(); -+//char *malloc(); - #endif - - extern int Num_Phones, Num_Words; diff --git a/app-laptop/dispad/dispad-0.3.1.ebuild b/app-laptop/dispad/dispad-0.3.1-r1.ebuild index ea39e4aed2b1..f2e739c0d3a1 100644 --- a/app-laptop/dispad/dispad-0.3.1.ebuild +++ b/app-laptop/dispad/dispad-0.3.1-r1.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 + inherit autotools DESCRIPTION="Daemon to disable trackpads while typing" @@ -15,11 +16,13 @@ SLOT="0" KEYWORDS="~x86 ~amd64" IUSE="" -DEPEND="x11-libs/libX11 - x11-libs/libXi - dev-libs/confuse" +DEPEND=" + dev-libs/confuse + x11-libs/libX11 + x11-libs/libXi" RDEPEND="${DEPEND}" src_prepare() { + default eautoreconf -i } diff --git a/app-text/openjade/files/openjade-1.3.2-darwin.patch b/app-text/openjade/files/openjade-1.3.2-darwin.patch deleted file mode 100644 index 524454860d80..000000000000 --- a/app-text/openjade/files/openjade-1.3.2-darwin.patch +++ /dev/null @@ -1,41 +0,0 @@ -See also http://finkproject.org/doc/porting/libtool.php -(Section 3.3) Fixing 1.4.x (Subsection 1) The flat_namespace bug ---- configure~ 2007-10-08 01:55:00 +0200 -+++ configure 2007-10-08 01:55:27 +0200 -@@ -3063,9 +3063,6 @@ - - - case "${host}" in -- *-*-darwin*) -- LINKFLAGS="-no-undefined" -- ;; - *) - if test "$GXX" - then -@@ -7907,7 +7904,7 @@ - ;; - - darwin* | rhapsody*) -- allow_undefined_flag='-undefined suppress' -+ allow_undefined_flag='-undefined suppress -flat_namespace' - # FIXME: Relying on posixy $() will cause problems for - # cross-compilation, but unfortunately the echo tests do not - # yet detect zsh echo's removal of \ escapes. ---- config/ltmain.sh~ 2002-01-17 14:45:52 +0100 -+++ config/ltmain.sh 2007-10-08 03:08:26 +0200 -@@ -3913,10 +3913,15 @@ - - # Directory that this library needs to be installed in: - libdir='$install_libdir'" -+case "${host}" in -+ *-*-darwin*) -+ ;; -+ *) - if test "$installed" = no && test $need_relink = yes; then - $echo >> $output "\ - relink_command=\"$relink_command\"" - fi -+esac - done - fi - diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest index 59e56aa09ea1..03ced48ece6c 100644 --- a/dev-db/redis/Manifest +++ b/dev-db/redis/Manifest @@ -6,3 +6,4 @@ DIST redis-4.0.2.tar.gz 1713990 BLAKE2B 307ab76b336f7520e14a23a1577c46e1b63cc5a5 DIST redis-4.0.6.tar.gz 1723533 BLAKE2B 94c2a9b7eeaa676efaac75cd5c143b0f4b02440b5a21ecc9b2a68cc27ad4abc1fc4d7dbc903dea5d956ce737ca434ea5b5bdde4a35df3a3689da60c5fb0bddf1 SHA512 784aad612664df666c36f969cb6a9ab794f004abcf9aa761bd1f5f0f8fdb248d5b38f48a59b68c2de7d2a344755f1537efc9d5847de0d662302699ed94d40813 DIST redis-4.0.7.tar.gz 1729488 BLAKE2B 7a5337b868e4da4a7387b31bc9d6bd4c86abd701b9ba999f64296ed5188cbba7208ced466973a500730ca03e70a9a85fbab2fb4700fdc977e58defc0126487d1 SHA512 6f317d9e76224b2a2b047dc8f56b126ea85ee5c6112c4c6238cb5cdfa3a83756bff3a82b106b00d1124a93d210a900d836587b8d9563916f19274de0e84c4c6b DIST redis-4.0.8.tar.gz 1729973 BLAKE2B 32d82a07beba9ea8f0b08a8fc69da548a1974e5839f052a9803ffb0f52ef920df9b128092e061b5e693581a50efef4a1212c1f6310dc8492eff5ca841ff3b03a SHA512 11c126ddef3bedbceb02ee7a80a61374e081da8087055d77970b0097066a6f1c5e0c4f0d246c9851f8c3beca22f185c184669a9dc4f1c7c229f8cd2c34196ab6 +DIST redis-4.0.9.tar.gz 1737022 BLAKE2B 35a83d146062f5b14c023d7fd9f28d743ba6bec3e0e4bf9ce8e065a706bbd7508ffbcb8b1b4d18f6b6774589b5456540ba8717b9f449fcbd758c0f57dbd505a3 SHA512 a6cf63cb361f0a87da3955ba628190dc04cad342f7a664d18e44416ee67dd86ed6e3a46b9701e994f1417e56b819b3c6fc595f363c10bb4b83d5033919d29598 diff --git a/dev-db/redis/redis-4.0.9.ebuild b/dev-db/redis/redis-4.0.9.ebuild new file mode 100644 index 000000000000..a8d59c405e63 --- /dev/null +++ b/dev-db/redis/redis-4.0.9.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic systemd toolchain-funcs user + +DESCRIPTION="A persistent caching system, key-value and data structures database" +HOMEPAGE="https://redis.io" +SRC_URI="http://download.redis.io/releases/${P}.tar.gz" + +LICENSE="BSD" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="+jemalloc tcmalloc luajit test" +SLOT="0" + +# Redis does NOT build with Lua 5.2 or newer at this time. +# This should link correctly with both unslotted & slotted Lua, without +# changes. +RDEPEND=" + luajit? ( dev-lang/luajit:2 ) + !luajit? ( || ( dev-lang/lua:5.1 =dev-lang/lua-5.1*:0 ) ) + tcmalloc? ( dev-util/google-perftools ) + jemalloc? ( >=dev-libs/jemalloc-3.2 )" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + >=sys-devel/autoconf-2.63 + test? ( dev-lang/tcl:0= )" + +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +S="${WORKDIR}/${PN}-${PV/_/-}" + +pkg_setup() { + enewgroup redis 75 + enewuser redis 75 -1 /var/lib/redis redis +} + +src_prepare() { + eapply \ + "${FILESDIR}"/${PN}-3.2.3-config.patch \ + "${FILESDIR}"/${PN}-4.0.1-shared.patch \ + "${FILESDIR}"/${PN}-4.0.1-sharedlua.patch \ + "${FILESDIR}"/${PN}-sentinel-4.0.6-config.patch + eapply_user + + # Copy lua modules into build dir + cp "${S}"/deps/lua/src/{fpconv,lua_bit,lua_cjson,lua_cmsgpack,lua_struct,strbuf}.c "${S}"/src || die + cp "${S}"/deps/lua/src/{fpconv,strbuf}.h "${S}"/src || die + # Append cflag for lua_cjson + # https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61 + append-cflags "-DENABLE_CJSON_GLOBAL" + + # now we will rewrite present Makefiles + local makefiles="" MKF + for MKF in $(find -name 'Makefile' | cut -b 3-); do + mv "${MKF}" "${MKF}.in" + sed -i -e 's:$(CC):@CC@:g' \ + -e 's:$(CFLAGS):@AM_CFLAGS@:g' \ + -e 's: $(DEBUG)::g' \ + -e 's:$(OBJARCH)::g' \ + -e 's:ARCH:TARCH:g' \ + -e '/^CCOPT=/s:$: $(LDFLAGS):g' \ + "${MKF}.in" \ + || die "Sed failed for ${MKF}" + makefiles+=" ${MKF}" + done + # autodetection of compiler and settings; generates the modified Makefiles + cp "${FILESDIR}"/configure.ac-3.2 configure.ac || die + + # Use the correct pkgconfig name for Lua + has_version 'dev-lang/lua:5.1' \ + && LUAPKGCONFIG=lua5.1 \ + || LUAPKGCONFIG=lua + sed -i \ + -e "/^AC_INIT/s|, [0-9].+, |, $PV, |" \ + -e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \ + -e "/PKG_CHECK_MODULES.*\<LUA\>/s,lua5.1,${LUAPKGCONFIG},g" \ + configure.ac || die "Sed failed for configure.ac" + eautoreconf +} + +src_configure() { + econf \ + $(use_with luajit) + + # Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164 + # also, don't define ANSI/c99 for lua twice + sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die +} + +src_compile() { + tc-export CC AR RANLIB + + local myconf="" + + if use tcmalloc; then + myconf="${myconf} USE_TCMALLOC=yes" + elif use jemalloc; then + myconf="${myconf} JEMALLOC_SHARED=yes" + else + myconf="${myconf} MALLOC=yes" + fi + + emake ${myconf} V=1 CC="${CC}" AR="${AR} rcu" RANLIB="${RANLIB}" +} + +src_install() { + insinto /etc/ + doins redis.conf sentinel.conf + use prefix || fowners redis:redis /etc/{redis,sentinel}.conf + fperms 0644 /etc/{redis,sentinel}.conf + + newconfd "${FILESDIR}/redis.confd-r1" redis + newinitd "${FILESDIR}/redis.initd-5" redis + + systemd_newunit "${FILESDIR}/redis.service-2" redis.service + systemd_newtmpfilesd "${FILESDIR}/redis.tmpfiles" redis.conf + + newconfd "${FILESDIR}/redis-sentinel.confd" redis-sentinel + newinitd "${FILESDIR}/redis-sentinel.initd" redis-sentinel + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + dodoc 00-RELEASENOTES BUGS CONTRIBUTING MANIFESTO README.md + + dobin src/redis-cli + dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb + fperms 0750 /usr/sbin/redis-benchmark + dosym redis-server /usr/sbin/redis-sentinel + + if use prefix; then + diropts -m0750 + else + diropts -m0750 -o redis -g redis + fi + keepdir /var/{log,lib}/redis +} diff --git a/dev-ruby/rack/files/rack-1.4.5-fix-test-ruby20.patch b/dev-ruby/rack/files/rack-1.4.5-fix-test-ruby20.patch deleted file mode 100644 index 7854b7e6e16a..000000000000 --- a/dev-ruby/rack/files/rack-1.4.5-fix-test-ruby20.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0a74380d2e5157d94c7e9141242af33e5c0bf951 Mon Sep 17 00:00:00 2001 -From: Santiago Pastorino <santiago@wyeworks.com> -Date: Sat, 29 Dec 2012 17:36:08 -0200 -Subject: [PATCH] Fix Ruby 2.0 build - ---- - test/spec_chunked.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/spec_chunked.rb b/test/spec_chunked.rb -index c81409f..12f2158 100644 ---- a/test/spec_chunked.rb -+++ b/test/spec_chunked.rb -@@ -41,7 +41,7 @@ def chunked(app) - response.headers.should.not.include 'Content-Length' - response.headers['Transfer-Encoding'].should.equal 'chunked' - response.body.encoding.to_s.should.equal "ASCII-8BIT" -- response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n" -+ response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n".force_encoding("BINARY") - end if RUBY_VERSION >= "1.9" - - should 'not modify response when Content-Length header present' do --- -1.9.1 - diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 14b84fbdbebe..5ab14b08d6ec 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -421,9 +421,9 @@ strip-flags() { test-flag-PROG() { local comp=$1 local lang=$2 - local flag=$3 + shift 2 - [[ -z ${comp} || -z ${flag} ]] && return 1 + [[ -z ${comp} || -z $1 ]] && return 1 local cmdline=( $(tc-get${comp}) @@ -434,11 +434,11 @@ test-flag-PROG() { -c -o /dev/null ) if "${cmdline[@]}" -x${lang} - </dev/null &>/dev/null ; then - cmdline+=( "${flag}" -x${lang} - ) + cmdline+=( "$@" -x${lang} - ) else # XXX: what's the purpose of this? does it even work with # any compiler? - cmdline+=( "${flag}" -c -o /dev/null /dev/null ) + cmdline+=( "$@" -c -o /dev/null /dev/null ) fi if ! "${cmdline[@]}" </dev/null &>/dev/null; then @@ -455,25 +455,25 @@ test-flag-PROG() { # @USAGE: <flag> # @DESCRIPTION: # Returns shell true if <flag> is supported by the C compiler, else returns shell false. -test-flag-CC() { test-flag-PROG "CC" c "$1"; } +test-flag-CC() { test-flag-PROG "CC" c "$@"; } # @FUNCTION: test-flag-CXX # @USAGE: <flag> # @DESCRIPTION: # Returns shell true if <flag> is supported by the C++ compiler, else returns shell false. -test-flag-CXX() { test-flag-PROG "CXX" c++ "$1"; } +test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; } # @FUNCTION: test-flag-F77 # @USAGE: <flag> # @DESCRIPTION: # Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false. -test-flag-F77() { test-flag-PROG "F77" f77 "$1"; } +test-flag-F77() { test-flag-PROG "F77" f77 "$@"; } # @FUNCTION: test-flag-FC # @USAGE: <flag> # @DESCRIPTION: # Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false. -test-flag-FC() { test-flag-PROG "FC" f95 "$1"; } +test-flag-FC() { test-flag-PROG "FC" f95 "$@"; } test-flags-PROG() { local comp=$1 @@ -484,8 +484,21 @@ test-flags-PROG() { [[ -z ${comp} ]] && return 1 - for x ; do - test-flag-${comp} "${x}" && flags+=( "${x}" ) + while (( $# )); do + case "$1" in + --param) + if test-flag-${comp} "$1" "$2"; then + flags+=( "$1" "$2" ) + fi + shift 2 + ;; + *) + if test-flag-${comp} "$1"; then + flags+=( "$1" ) + fi + shift 1 + ;; + esac done echo "${flags[*]}" diff --git a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh index 53af9f862c41..97cd71d710a2 100755 --- a/eclass/tests/flag-o-matic.sh +++ b/eclass/tests/flag-o-matic.sh @@ -6,7 +6,7 @@ source tests-common.sh inherit flag-o-matic -CFLAGS="-a -b -c=1" +CFLAGS="-a -b -c=1 --param l1-cache-size=32" CXXFLAGS="-x -y -z=2" LDFLAGS="-l -m -n=3" ftend() { @@ -55,7 +55,7 @@ done <<<" tbegin "strip-unsupported-flags" strip-unsupported-flags -[[ ${CFLAGS} == "" ]] && [[ ${CXXFLAGS} == "-z=2" ]] && [[ ${LDFLAGS} == "" ]] +[[ ${CFLAGS} == "--param l1-cache-size=32" ]] && [[ ${CXXFLAGS} == "-z=2" ]] && [[ ${LDFLAGS} == "" ]] ftend for var in $(all-flag-vars) ; do diff --git a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild index d61ac5c01417..048eb3cb263c 100644 --- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild +++ b/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,19 +7,19 @@ inherit eutils scons-utils toolchain-funcs xdg MY_P="${PN}_v${PV}-src" DESCRIPTION="Descent Rebirth - enhanced Descent 1 & 2 engine" -HOMEPAGE="http://www.dxx-rebirth.com/" -SRC_URI="http://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz +HOMEPAGE="https://www.dxx-rebirth.com/" +SRC_URI="https://www.dxx-rebirth.com/download/dxx/${MY_P}.tar.gz opl3-musicpack? ( - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) - descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) + descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-opl3-music.dxa ) + descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-opl3-music.dxa ) ) sc55-musicpack? ( - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) - descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) ) + descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa ) + descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa ) ) l10n_de? ( - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) - descent2? ( http://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) ) + descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-briefings-ger.dxa ) + descent2? ( https://www.dxx-rebirth.com/download/dxx/res/d2xr-briefings-ger.dxa ) ) textures? ( - descent1? ( http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )" + descent1? ( https://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa ) )" LICENSE="DXX-Rebirth GPL-3 public-domain" SLOT="0" diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch deleted file mode 100644 index f4ad132dce64..000000000000 --- a/games-arcade/amphetamine/files/amphetamine-0.8.10-etc.patch +++ /dev/null @@ -1,126 +0,0 @@ -description: use /etc/amphetamine for config files -Index: amphetamine-0.8.10/src/ConstVal.cpp -=================================================================== ---- amphetamine-0.8.10.orig/src/ConstVal.cpp 2006-05-15 19:16:56.000000000 +0200 -+++ amphetamine-0.8.10/src/ConstVal.cpp 2006-05-15 19:17:02.000000000 +0200 -@@ -19,7 +19,7 @@ - { - char levelSetString[11] = "xxLevelSet"; - char levelBkgndString[13] = "xxLevelBkgnd"; -- FILE *paramFile = fopen(gSystem->QualifyDataDir(kParFileName), "r"); // by LL -+ FILE *paramFile = fopen(gSystem->QualifyEtcDir(kParFileName), "r"); // by LL - - gConst = new tConstValues; - -@@ -159,7 +159,7 @@ - fclose(paramFile); - - // Hier sollte auch im Home Directory gesucht werden... -- paramFile = gSystem->FindFile(gConst->kFileConfig); // by LL -+ paramFile = fopen(gSystem->QualifyEtcDir(gConst->kFileConfig), "r"); // by LL - - gConfigData->leftKey = GetLongConstant(paramFile, "LeftKey"); - GetStringConstant(paramFile, "LeftKeyText", gConfigData->leftKeyText); -@@ -212,6 +212,7 @@ - char c = 0; - short n; - -+ key[0] = '\0'; - fseek(f, 0, SEEK_SET); - - while (strcmp(key, constName)) { -Index: amphetamine-0.8.10/src/Gui.cpp -=================================================================== ---- amphetamine-0.8.10.orig/src/Gui.cpp 2006-05-15 19:16:56.000000000 +0200 -+++ amphetamine-0.8.10/src/Gui.cpp 2006-05-15 19:17:02.000000000 +0200 -@@ -688,7 +688,7 @@ - - void CGUI::LoadMessages() - { -- FILE *f = fopen(gSystem->QualifyDataDir(kParFileName), "r"); // by LL -+ FILE *f = fopen(gSystem->QualifyEtcDir(kParFileName), "r"); // by LL - char msgString[6] = "msgxx"; - short n; - -@@ -724,7 +724,7 @@ - - void LoadGUIParameters() - { -- FILE *f = fopen(gSystem->QualifyDataDir(kParFileName), "r"); // by LL -+ FILE *f = fopen(gSystem->QualifyEtcDir(kParFileName), "r"); // by LL - - gGUIConst = new tGUIConstants; - -Index: amphetamine-0.8.10/src/System.cpp -=================================================================== ---- amphetamine-0.8.10.orig/src/System.cpp 2006-05-15 19:16:56.000000000 +0200 -+++ amphetamine-0.8.10/src/System.cpp 2006-05-15 19:17:02.000000000 +0200 -@@ -143,6 +143,14 @@ - return tmp;
- }
-
-+char *CSystem::QualifyEtcDir(const char *fname)
-+{
-+ char *tmp = new char[strlen(etcDir)+strlen(fname)+2];
-+ sprintf(tmp, "%s/%s", etcDir, fname);
-+
-+ return tmp;
-+}
-+
- void CSystem::GetHomeDir()
- {
- char *tmp;
-@@ -169,7 +177,9 @@ - GetHomeDir();
- dataDir = new char[strlen(INSTALL_DIR)+1];
- strcpy(dataDir, INSTALL_DIR);
--
-+ etcDir = new char[strlen(ETC_DIR)+1];
-+ strcpy(etcDir, ETC_DIR);
-+
- char *logFileName = QualifyHomeDir(kLogFileName);
-
- logFile = fopen(logFileName, "w"); // by LL
-@@ -180,6 +190,8 @@ - if ( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO) < 0 ) {
- MSG("SDL_Init_Failed.");
- MSG(SDL_GetError());
-+ /* Ouput to stdout too. */
-+ printf("SDL_Init_Failed: %s\n", SDL_GetError());
-
- exit(1);
- }
-Index: amphetamine-0.8.10/src/System.hpp -=================================================================== ---- amphetamine-0.8.10.orig/src/System.hpp 2006-05-15 19:16:57.000000000 +0200 -+++ amphetamine-0.8.10/src/System.hpp 2006-05-15 19:17:02.000000000 +0200 -@@ -16,6 +16,10 @@ - #define INSTALL_DIR "/usr/local/games/amph" - #endif - -+#ifndef ETC_DIR -+#define ETC_DIR "/etc/amphetamine" -+#endif -+ - #if SDL_BYTEORDER == SDL_LIL_ENDIAN - #undef __BIG_ENDIAN__ - #else -@@ -76,6 +80,7 @@ - RGBcolor *palColors; - char *homeDir; - char *dataDir; -+ char *etcDir; - int workingSound; - - //"""""""""""""""" System Stuff -@@ -107,8 +112,10 @@ - void GetHomeDir(); - char *QualifyDataDir(const char *fname); - char *QualifyHomeDir(const char *fname); -+ char *QualifyEtcDir(const char *fname); - void ScreenShot(); - FILE *FindFile(const char *fname); - }; - - #endif -+ diff --git a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild index e851818b384f..9ba28fc6378d 100644 --- a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild +++ b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -7,8 +7,8 @@ GCONF_DEBUG="no" inherit autotools eutils flag-o-matic gnome2 DESCRIPTION="Squash the monsters with your levitation worker gnome" -HOMEPAGE="http://people.iola.dk/olau/monster-masher/" -SRC_URI="http://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2" +HOMEPAGE="https://people.iola.dk/olau/monster-masher/" +SRC_URI="https://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild index 6ae5589fd417..33eee4b857b6 100644 --- a/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild +++ b/games-arcade/primateplunge/primateplunge-1.1-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 inherit autotools eutils games DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas" -HOMEPAGE="http://www.aelius.com/primateplunge/" -SRC_URI="http://www.aelius.com/${PN}/${P}.tar.gz" +HOMEPAGE="https://www.aelius.com/primateplunge/" +SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz" LICENSE="Primate-Plunge" SLOT="0" diff --git a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild index 3edfb70d7630..9f19d9aa9e48 100644 --- a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild +++ b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,8 +6,8 @@ EAPI=6 inherit autotools eutils toolchain-funcs flag-o-matic DESCRIPTION="An IGS client written in C++" -HOMEPAGE="http://ccdw.org/~cjj/prog/ccgo/" -SRC_URI="http://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz" +HOMEPAGE="https://ccdw.org/~cjj/prog/ccgo/" +SRC_URI="https://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" diff --git a/games-board/pokerth/pokerth-1.1.1-r2.ebuild b/games-board/pokerth/pokerth-1.1.1-r2.ebuild index e0f3c1cf65f9..a7c17d198096 100644 --- a/games-board/pokerth/pokerth-1.1.1-r2.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit eutils flag-o-matic qmake-utils MY_P="PokerTH-${PV}-src" DESCRIPTION="Texas Hold'em poker game" -HOMEPAGE="http://www.pokerth.net/" +HOMEPAGE="https://www.pokerth.net/" SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" diff --git a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild b/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild index 2b0cd1f377b6..d76a38f5f0b2 100644 --- a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild +++ b/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild @@ -6,7 +6,7 @@ inherit cmake-utils gnome2-utils COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564" DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" -HOMEPAGE="http://openxcom.org/" +HOMEPAGE="https://openxcom.org/" SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+ CC-BY-SA-4.0" @@ -52,7 +52,7 @@ pkg_postinst() { elog "/usr/share/${PN}/TFTD" echo elog "If you need or want text in some language other than english, download:" - elog "http://openxcom.org/translations/latest.zip and uncompress it in" + elog "https://openxcom.org/translations/latest.zip and uncompress it in" elog "/usr/share/${PN}/common/Language" } diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-9999.ebuild index 746a5950a0a8..7726841e5584 100644 --- a/games-engines/openxcom/openxcom-9999.ebuild +++ b/games-engines/openxcom/openxcom-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 inherit cmake-utils gnome2-utils git-r3 DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown" -HOMEPAGE="http://openxcom.org/" +HOMEPAGE="https://openxcom.org/" EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git" LICENSE="GPL-3+ CC-BY-SA-4.0" @@ -50,7 +50,7 @@ pkg_postinst() { elog "/usr/share/${PN}/TFTD" echo elog "If you need or want text in some language other than english, download:" - elog "http://openxcom.org/translations/latest.zip and uncompress it in" + elog "https://openxcom.org/translations/latest.zip and uncompress it in" elog "/usr/share/${PN}/common/Language" } diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild index dd07747d42aa..81307b8fbc16 100644 --- a/media-fonts/dejavu/dejavu-2.37.ebuild +++ b/media-fonts/dejavu/dejavu-2.37.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit font versionator +inherit font versionator xdg-utils DESCRIPTION="DejaVu fonts, bitstream vera with ISO-8859-2 characters" HOMEPAGE="https://dejavu-fonts.github.io/" @@ -25,15 +25,17 @@ fi LICENSE="BitstreamVera" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="fontforge" -DEPEND="fontforge? ( x11-apps/mkfontscale +DEPEND="fontforge? ( + x11-apps/mkfontscale >=media-gfx/fontforge-20080429 x11-apps/mkfontdir dev-perl/Font-TTF app-i18n/unicode-data - >media-libs/fontconfig-2.6.0 )" + >media-libs/fontconfig-2.6.0:1.0 ) +" FONT_CONF=( fontconfig/20-unhint-small-dejavu-sans-mono.conf @@ -57,6 +59,11 @@ src_unpack() { fi } +src_prepare() { + default + xdg_environment_reset +} + src_compile() { if use fontforge; then emake \ diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest index 0f20a2858bd9..59dd13c16029 100644 --- a/media-libs/libnjb/Manifest +++ b/media-libs/libnjb/Manifest @@ -1,2 +1 @@ -DIST libnjb-2.2.6.tar.gz 504329 BLAKE2B 6e89b13dbb84fb71f2112ae1523c8b431222d6b4af85a2a7d318653a4a62beca2c5f48efb37475499e78f1d05ecfa5d18be26673f253f343b6886eda52b6e765 SHA512 c079abcf5d2c1fd56dfd6da6a7bf08d1f35e365b6186072f526980a49d8f72cf04c79381eda4fbada5ca467ae6c9e96c6e3a13b753937040530f6e6c61b012f2 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06 diff --git a/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch new file mode 100644 index 000000000000..f241338c2123 --- /dev/null +++ b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch @@ -0,0 +1,11 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -249,7 +249,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src sample doc ++SUBDIRS = src doc + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libnjb.pc + EXTRA_DIST = libnjb.pc \ diff --git a/media-libs/libnjb/libnjb-2.2.6.ebuild b/media-libs/libnjb/libnjb-2.2.6.ebuild deleted file mode 100644 index 132f4be4850c..000000000000 --- a/media-libs/libnjb/libnjb-2.2.6.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit libtool multilib udev - -DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player" -HOMEPAGE="http://libnjb.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="static-libs" - -RDEPEND="virtual/libusb:0" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i \ - -e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \ - Makefile.in || die - - elibtoolize -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) -} - -src_install() { - emake DESTDIR="${D}" install || die - - dodoc AUTHORS ChangeLog* FAQ HACKING README - - udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules - - find "${D}" -name '*.la' -exec rm -f {} + -} diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild index e1285c049c4b..48e23269a9ca 100644 --- a/media-libs/libnjb/libnjb-2.2.7.ebuild +++ b/media-libs/libnjb/libnjb-2.2.7.ebuild @@ -1,29 +1,27 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit libtool multilib udev +EAPI=6 -DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player" +inherit libtool udev + +DESCRIPTION="Library for communicating with the Creative Nomad JukeBox digital audio player" HOMEPAGE="http://libnjb.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" IUSE="doc static-libs" RDEPEND="virtual/libusb:0" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" -DOCS="AUTHORS ChangeLog* FAQ HACKING README" +PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch ) src_prepare() { - sed -i \ - -e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \ - Makefile.in || die - + default elibtoolize } @@ -39,5 +37,6 @@ src_install() { udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules - find "${ED}" -name '*.la' -exec rm -f {} + + # package provides .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest index 6d0acba20194..c053b3107aa3 100644 --- a/media-libs/libsdl2/Manifest +++ b/media-libs/libsdl2/Manifest @@ -1,4 +1,3 @@ DIST SDL2-2.0.4.tar.gz 4136230 BLAKE2B 374ba4c86f10d07f592dbeb6340b38e1360561fed4fa40d75c763adbfc3dd1605eed6841243ce14597814da5b0a86d7c6d4351198987919a3a7bc4db943f32b7 SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 DIST SDL2-2.0.5.tar.gz 4209352 BLAKE2B c0a040e39117ac355e49950434a96b790dba2af13116071bdad6e50131b8f62f494463ec5fff5e4aff370733ac226888033ba189e431cc527cb3149076548159 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 -DIST SDL2-2.0.7.tar.gz 4432499 BLAKE2B 730c6001a11922720975453059602a28116ae046da25cfa3a2b2f29be306b8807cc720f17dff9f0c944d4cbf9c1340a19085b17d23e1e594e7b63b514e736cf1 SHA512 eed5477843086a0e66552eb197a5c4929134522bc366d873732361ea0df5fb841ef7e2b1913e21d1bae69e6fd3152ee630492e615c58cbe903e7d6e47b587410 DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869 diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch deleted file mode 100644 index 34455663a563..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.5-ds3_ds4.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/joystick/SDL_gamecontrollerdb.h b/src/joystick/SDL_gamecontrollerdb.h -index 1e623cb..ae84c6d 100644 ---- a/src/joystick/SDL_gamecontrollerdb.h -+++ b/src/joystick/SDL_gamecontrollerdb.h -@@ -47,6 +47,8 @@ static const char *s_ControllerMappings [] = - "4c056802000000000000504944564944,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", - "25090500000000000000504944564944,PS3 DualShock,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,", - "4c05c405000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "4c05cc09000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "4c05a00b000000000000504944564944,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - #endif - #if defined(__MACOSX__) - "10280000000000000900000000000000,8Bitdo SFC30 GamePad Joystick,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", -@@ -62,6 +64,10 @@ static const char *s_ControllerMappings [] = - "11010000000000002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", - "11010000000000001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,", - "5e040000000000008e02000000000000,X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,", -+ "030000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", -+ "030000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000a00b000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - #endif - #if defined(__LINUX__) - "05000000102800000900000000010000,8Bitdo SFC30 GamePad,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,", -@@ -85,12 +91,23 @@ static const char *s_ControllerMappings [] = - "03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", - "050000007e0500003003000001000000,Nintendo Wii Remote Pro Controller,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", - "050000003620000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", -+ "030000004c0500006802000010010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", -+ "050000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:a12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:a13,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", - "030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", -+ "030000004c0500006802000010810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "050000004c0500006802000000810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "030000004c0500006802000011810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", - "03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,", - "030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - "050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - "030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", - "050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,", -+ "030000004c050000c405000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "050000004c050000c405000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "030000004c050000cc09000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "050000004c050000cc09000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", -+ "030000004c050000a00b000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,", - "03000000c6240000045d000025010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,", - "03000000321500000009000011010000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", - "050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,", diff --git a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch deleted file mode 100644 index eed72dcccc35..000000000000 --- a/media-libs/libsdl2/files/libsdl2-2.0.5-static-libs.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- SDL2-2.0.5/configure.in -+++ SDL2-2.0.5/configure.in -@@ -3197,7 +3197,7 @@ - if test -f /lib/w32api/libuuid.a; then - LIBUUID=/lib/w32api/libuuid.a - else -- LIBUUID=-luuid -+ LIBUUID=-Wl,-luuid - fi - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc" - # The Windows platform requires special setup -@@ -3597,23 +3597,23 @@ - - VERSION_OBJECTS=`echo $VERSION_SOURCES` - VERSION_DEPENDS=`echo $VERSION_SOURCES` --VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` -+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ --\\$(objects)/\\2.o: \\1/\\2.rc\\\\ -- \\$(WINDRES) \\$< \\$@,g"` -+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ -+ \\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"` - - SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` - SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` --SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` - SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` --SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - # Set runtime shared library paths as needed ---- SDL2-2.0.5/Makefile.in -+++ SDL2-2.0.5/Makefile.in -@@ -36,10 +36,10 @@ - GEN_OBJECTS = @GEN_OBJECTS@ - VERSION_OBJECTS = @VERSION_OBJECTS@ - --SDLMAIN_TARGET = libSDL2main.a -+SDLMAIN_TARGET = libSDL2main.la - SDLMAIN_OBJECTS = @SDLMAIN_OBJECTS@ - --SDLTEST_TARGET = libSDL2_test.a -+SDLTEST_TARGET = libSDL2_test.la - SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ - - WAYLAND_SCANNER = @WAYLAND_SCANNER@ -@@ -144,15 +144,13 @@ - .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) - - $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) -- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - - $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) -- $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS) -- $(RUN_CMD_RANLIB)$(RANLIB) $@ -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static - - $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) -- $(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS) -- $(RUN_CMD_RANLIB)$(RANLIB) $@ -+ $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static - - install: all install-bin install-hdrs install-lib install-data - install-bin: -@@ -173,10 +171,8 @@ - install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET) - $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) - $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) -- $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) -- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) -- $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) -- $(RANLIB) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) -+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET) -+ $(LIBTOOL) --mode=install $(INSTALL) -m 644 $(objects)/$(SDLTEST_TARGET) $(DESTDIR)$(libdir)/$(SDLTEST_TARGET) - install-data: - $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal - $(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 diff --git a/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild b/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild deleted file mode 100644 index 24af0fc24cd2..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.5-r1.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: convert FusionSound #484250 - -EAPI=6 -inherit autotools flag-o-matic toolchain-funcs eutils multilib-minimal - -MY_P=SDL2-${PV} -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org" -SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" - -IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fusionsound? ( sound ) - gles? ( video ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - wayland? ( gles ) - xinerama? ( X ) - xscreensaver? ( X )" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) - gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) - virtual/pkgconfig" - -PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - "${FILESDIR}"/${PN}-2.0.5-static-libs.patch - "${FILESDIR}"/${PN}-2.0.5-ds3_ds4.patch -) - -S=${WORKDIR}/${MY_P} - -src_prepare() { - default - sed -i -e 's/configure.in/configure.ac/' Makefile.in || die - mv configure.{in,ac} || die - AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - # sorted by `./configure --help` - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ - --enable-atomic \ - $(use_enable sound audio) \ - $(use_enable video) \ - --enable-render \ - --enable-events \ - $(use_enable joystick) \ - $(use_enable haptic) \ - --enable-power \ - --enable-filesystem \ - $(use_enable threads) \ - --enable-timers \ - --enable-file \ - $(use_enable kernel_Winnt loadso) \ - --enable-cpuinfo \ - --enable-assembly \ - $(use_enable cpu_flags_x86_sse ssemath) \ - $(use_enable cpu_flags_x86_mmx mmx) \ - $(use_enable cpu_flags_x86_3dnow 3dnow) \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable altivec) \ - $(use_enable oss) \ - $(use_enable alsa) \ - --disable-alsa-shared \ - --disable-esd \ - $(use_enable pulseaudio) \ - --disable-pulseaudio-shared \ - --disable-arts \ - $(use_enable nas) \ - --disable-nas-shared \ - --disable-sndio \ - --disable-sndio-shared \ - $(use_enable sound diskaudio) \ - $(use_enable sound dummyaudio) \ - $(use_enable wayland video-wayland) \ - --disable-wayland-shared \ - --disable-video-mir \ - $(use_enable X video-x11) \ - --disable-x11-shared \ - $(use_enable X video-x11-xcursor) \ - $(use_enable X video-x11-xdbe) \ - $(use_enable xinerama video-x11-xinerama) \ - $(use_enable X video-x11-xinput) \ - $(use_enable X video-x11-xrandr) \ - $(use_enable xscreensaver video-x11-scrnsaver) \ - $(use_enable X video-x11-xshape) \ - $(use_enable X video-x11-vm) \ - --disable-video-cocoa \ - --disable-video-directfb \ - $(multilib_native_use_enable fusionsound) \ - --disable-fusionsound-shared \ - $(use_enable video video-dummy) \ - $(use_enable opengl video-opengl) \ - $(use_enable gles video-opengles) \ - $(use_enable udev libudev) \ - $(use_enable dbus) \ - --disable-ibus \ - $(use_enable tslib input-tslib) \ - --disable-directx \ - --disable-rpath \ - --disable-render-d3d \ - $(use_with X x) -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - prune_libtool_files - dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md -} diff --git a/media-libs/libsdl2/libsdl2-2.0.7.ebuild b/media-libs/libsdl2/libsdl2-2.0.7.ebuild deleted file mode 100644 index 7926374b19b1..000000000000 --- a/media-libs/libsdl2/libsdl2-2.0.7.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: convert FusionSound #484250 - -EAPI=6 -inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal - -MY_P="SDL2-${PV}" -DESCRIPTION="Simple Direct Media Layer" -HOMEPAGE="http://www.libsdl.org" -SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" -REQUIRED_USE=" - alsa? ( sound ) - fusionsound? ( sound ) - gles? ( video ) - nas? ( sound ) - opengl? ( video ) - pulseaudio? ( sound ) - wayland? ( gles ) - xinerama? ( X ) - xscreensaver? ( X )" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) - gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) - opengl? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] - >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] - ) - pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) - tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] ) - udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] - >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland] - >=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}] - ) - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] - >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] - >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] - xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) - xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) - )" -DEPEND="${RDEPEND} - X? ( - >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}] - >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] - ) - virtual/pkgconfig" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/SDL2/SDL_config.h -) - -PATCHES=( - # https://bugzilla.libsdl.org/show_bug.cgi?id=1431 - "${FILESDIR}"/${PN}-2.0.6-static-libs.patch -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - sed -i -e 's/configure.in/configure.ac/' Makefile.in || die - mv configure.{in,ac} || die - AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf -} - -multilib_src_configure() { - use custom-cflags || strip-flags - - # sorted by `./configure --help` - local myeconfargs=( - $(use_enable static-libs static) - --enable-atomic - $(use_enable sound audio) - $(use_enable video) - --enable-render - --enable-events - $(use_enable joystick) - $(use_enable haptic) - --enable-power - --enable-filesystem - $(use_enable threads) - --enable-timers - --enable-file - $(use_enable kernel_Winnt loadso) - --enable-cpuinfo - --enable-assembly - $(use_enable cpu_flags_x86_sse ssemath) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_3dnow 3dnow) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable cpu_flags_x86_sse2 sse2) - $(use_enable altivec) - $(use_enable oss) - $(use_enable alsa) - --disable-alsa-shared - --disable-esd - $(use_enable pulseaudio) - --disable-pulseaudio-shared - --disable-arts - $(use_enable nas) - --disable-nas-shared - --disable-sndio - --disable-sndio-shared - $(use_enable sound diskaudio) - $(use_enable sound dummyaudio) - $(use_enable wayland video-wayland) - --disable-wayland-shared - --disable-video-mir - $(use_enable X video-x11) - --disable-x11-shared - $(use_enable X video-x11-xcursor) - $(use_enable X video-x11-xdbe) - $(use_enable xinerama video-x11-xinerama) - $(use_enable X video-x11-xinput) - $(use_enable X video-x11-xrandr) - $(use_enable xscreensaver video-x11-scrnsaver) - $(use_enable X video-x11-xshape) - $(use_enable X video-x11-vm) - --disable-video-cocoa - --disable-video-directfb - $(multilib_native_use_enable fusionsound) - --disable-fusionsound-shared - $(use_enable video video-dummy) - $(use_enable opengl video-opengl) - --disable-video-opengles1 - $(use_enable gles video-opengles2) - --disable-video-vulkan - $(use_enable udev libudev) - $(use_enable dbus) - --disable-ibus - $(use_enable tslib input-tslib) - --disable-directx - --disable-rpath - --disable-render-d3d - $(use_with X x) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - emake V=1 -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - prune_libtool_files - dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md -} diff --git a/media-libs/libsdl2/libsdl2-2.0.8.ebuild b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild index 7926374b19b1..5424e85e492e 100644 --- a/media-libs/libsdl2/libsdl2-2.0.8.ebuild +++ b/media-libs/libsdl2/libsdl2-2.0.8-r1.ebuild @@ -1,10 +1,8 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# TODO: convert FusionSound #484250 - EAPI=6 -inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal +inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal MY_P="SDL2-${PV}" DESCRIPTION="Simple Direct Media Layer" @@ -15,10 +13,9 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" +IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus gles haptic libsamplerate +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver" REQUIRED_USE=" alsa? ( sound ) - fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) @@ -30,9 +27,11 @@ REQUIRED_USE=" RDEPEND=" alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] ) - nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] ) + libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] ) + nas? ( + >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] + >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] ) opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] @@ -51,7 +50,6 @@ RDEPEND=" >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] - >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] ) @@ -115,6 +113,7 @@ multilib_src_configure() { $(use_enable pulseaudio) --disable-pulseaudio-shared --disable-arts + $(use_enable libsamplerate) $(use_enable nas) --disable-nas-shared --disable-sndio @@ -136,7 +135,7 @@ multilib_src_configure() { $(use_enable X video-x11-vm) --disable-video-cocoa --disable-video-directfb - $(multilib_native_use_enable fusionsound) + --disable-fusionsound --disable-fusionsound-shared $(use_enable video video-dummy) $(use_enable opengl video-opengl) diff --git a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild index 823b92a87bc5..5ed3715ef487 100644 --- a/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild +++ b/media-libs/libsidplay/libsidplay-1.36.59-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://critical.ch/distfiles/${P}.tgz" LICENSE="GPL-2" SLOT="1" -KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="static-libs" DEPEND="" RDEPEND="" diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest index bc108028855a..b13f0e00d5b9 100644 --- a/media-libs/vigra/Manifest +++ b/media-libs/vigra/Manifest @@ -1,2 +1,3 @@ DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a +DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3 DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757 diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild new file mode 100644 index 000000000000..6fa95e1699aa --- /dev/null +++ b/media-libs/vigra/vigra-1.11.1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +MY_P="${P}-src" +MY_V="${PV//\./-}" +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="threads,xml" + +inherit cmake-utils python-r1 + +DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" +HOMEPAGE="https://ukoethe.github.io/vigra/" +SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" + +# runtime dependency on python:2.7 is required by the vigra-config script +RDEPEND=" + dev-lang/python:2.7 + >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] + fftw? ( sci-libs/fftw:3.0 ) + hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi?] ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( media-libs/openexr:= ) + png? ( media-libs/libpng:0= ) + python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) + tiff? ( media-libs/tiff:0= ) + valgrind? ( dev-util/valgrind )" + +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen + python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) + ) + test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" + +REQUIRED_USE=" + doc? ( hdf5 fftw ) + python? ( hdf5 ${PYTHON_REQUIRED_USE} ) + test? ( hdf5 python fftw )" + +# Severely broken, also disabled in Fedora, bugs #390447, #653442 +RESTRICT="test" + +DOCS=( README.md ) + +pkg_setup() { + use python && python_setup +} + +src_prepare() { + einfo "Removing shipped docs and VCS files" + rm -rf doc || die + rm .git* .travis.yml || die + + cmake-utils_src_prepare + + # Don't use python_fix_shebang because we can't put this behind USE="python" + sed -i -e '/env/s:python:python2:' config/vigra-config.in || die +} + +src_configure() { + vigra_configure() { + local libdir="$(get_libdir)" + + local mycmakeargs=( + -DAUTOEXEC_TESTS=OFF + -DDOCDIR="${BUILD_DIR}/doc" + -DDOCINSTALL="share/doc/${P}" + -DLIBDIR_SUFFIX="${libdir/lib}" + -DUSE_DOC=$(usex doc ON OFF) # unused + -DUSE_FFTW3=$(usex fftw ON OFF) # unused + -DUSE_JPEG=$(usex jpeg ON OFF) # unused + -DUSE_MPI=$(usex mpi ON OFF) # unused + -DUSE_PNG=$(usex png ON OFF) # unused + -DUSE_TIFF=$(usex tiff ON OFF) # unused + -DWITH_HDF5=$(usex hdf5 ON OFF) + -DWITH_OPENEXR=$(usex openexr ON OFF) + -DWITH_VALGRIND=$(usex valgrind ON OFF) + -DWITH_VIGRANUMPY=$(usex python ON OFF) + -DBUILD_TESTING=$(usex test ON OFF) # unused + -DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused + -DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused + ) + cmake-utils_src_configure + } + + if use python; then + python_foreach_impl vigra_configure + else + # required for docdir + _cmake_check_build_dir init + vigra_configure + fi +} + +src_compile() { + local VIGRA_BUILD_DIR + vigra_compile() { + cmake-utils_src_compile + VIGRA_BUILD_DIR="${BUILD_DIR}" + } + if use python; then + python_foreach_impl vigra_compile + else + vigra_compile + fi + + if use doc; then + einfo "Generating Documentation" + # use build dir from last compile command + VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc + fi +} + +src_install() { + if use python; then + python_foreach_impl cmake-utils_src_install + python_optimize + else + cmake-utils_src_install + fi +} + +src_test() { + # perhaps disable tests (see #390447) + vigra_test() { + PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test + } + if use python; then + python_foreach_impl vigra_test + else + vigra_test + fi +} diff --git a/media-sound/herrie/herrie-2.2-r1.ebuild b/media-sound/herrie/herrie-2.2-r1.ebuild index d17a5548fe00..b54555ffc4fc 100644 --- a/media-sound/herrie/herrie-2.2-r1.ebuild +++ b/media-sound/herrie/herrie-2.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2" LICENSE="BSD-2 GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="ao +alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls" REQUIRED_USE="|| ( ao alsa pulseaudio oss )" diff --git a/media-sound/herrie/herrie-2.2.ebuild b/media-sound/herrie/herrie-2.2.ebuild deleted file mode 100644 index 49e752b97c92..000000000000 --- a/media-sound/herrie/herrie-2.2.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit eutils toolchain-funcs - -DESCRIPTION="Herrie is a command line music player" -HOMEPAGE="http://herrie.info/" -SRC_URI="http://herrie.info/distfiles/${P}.tar.bz2" - -LICENSE="BSD-2 GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="ao alsa pulseaudio oss http modplug mp3 sndfile vorbis xspf unicode nls" - -RDEPEND="sys-libs/ncurses[unicode?] - >=dev-libs/glib-2:2 - ao? ( media-libs/libao ) - alsa? ( media-libs/alsa-lib ) - http? ( net-misc/curl ) - modplug? ( media-libs/libmodplug ) - mp3? ( media-libs/libmad - media-libs/libid3tag ) - pulseaudio? ( media-sound/pulseaudio ) - sndfile? ( media-libs/libsndfile ) - vorbis? ( media-libs/libvorbis ) - xspf? ( >=media-libs/libxspf-1.2 ) - !ao? ( !alsa? ( !pulseaudio? ( !oss? ( media-libs/alsa-lib ) ) ) )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-chost_issue.patch \ - "${FILESDIR}"/${P}-libxspf.patch -} - -src_configure() { - if ! use ao && ! use alsa && ! use pulseaudio && ! use oss; then - ewarn "No audio output selected (ao, alsa, pulseaudio, oss), defaulting to alsa." - fi - - local EXTRA_CONF="verbose no_strip" - use ao && EXTRA_CONF="${EXTRA_CONF} ao" - use alsa && EXTRA_CONF="${EXTRA_CONF} alsa" - use http || EXTRA_CONF="${EXTRA_CONF} no_http no_scrobbler" - use mp3 || EXTRA_CONF="${EXTRA_CONF} no_mp3" - use modplug || EXTRA_CONF="${EXTRA_CONF} no_modplug" - use nls || EXTRA_CONF="${EXTRA_CONF} no_nls" - use oss && EXTRA_CONF="${EXTRA_CONF} oss" - use pulseaudio && EXTRA_CONF="${EXTRA_CONF} pulse" - use sndfile || EXTRA_CONF="${EXTRA_CONF} no_sndfile" - use unicode || EXTRA_CONF="${EXTRA_CONF} ncurses" - use vorbis || EXTRA_CONF="${EXTRA_CONF} no_vorbis" - use xspf || EXTRA_CONF="${EXTRA_CONF} no_xspf" - - einfo "./configure ${EXTRA_CONF}" - CC="$(tc-getCC)" PREFIX=/usr MANDIR=/usr/share/man \ - ./configure ${EXTRA_CONF} || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog README -} diff --git a/media-sound/mpfc/Manifest b/media-sound/mpfc/Manifest index e3105eef53a3..adbbd7aa1bc3 100644 --- a/media-sound/mpfc/Manifest +++ b/media-sound/mpfc/Manifest @@ -1,2 +1 @@ -DIST mpfc-1.3.7.tar.gz 869364 BLAKE2B 4ce61a80efad417c138b51ae1b994a2db64ed0ed07e5d0af47d69569edb1f2f8fed6a653ac18ef5c10bf2cdc83f21ded71947614c43fe9a79efeee5c9f27da81 SHA512 bef536c639a4d2422d0e04ca9aa6c18cee28e4936349ec796a4a25dd069fe0a7996c0d32b18b29b25f5acfa11e4fd4fe78becfe447d6726574bc320041fdf3d6 DIST mpfc-1.3.8.1.tar.gz 1042027 BLAKE2B 2d0e1991397930d8251db4c766705b769e24adf518d963bc56bba92f3aaf9deeedca2331e6fbeab609d4fd0dc49a69a35f3180149b7f35c0d94795e6be22ff59 SHA512 071e12ea784a8610aa6621f5afa1c6ba1e2a3ffe0deac8175b8b43b4446f0c54ff049fd8321aff7551766fe4561a974e39bbf93e30b353b25e27673ea9584573 diff --git a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch b/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch deleted file mode 100644 index 8bca2f380366..000000000000 --- a/media-sound/mpfc/files/mpfc-1.3.7-INT_MAX.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- plugins/input/audiocd/audiocd.c -+++ plugins/input/audiocd/audiocd.c -@@ -21,6 +21,7 @@ - */ - - #include <stdio.h> -+#include <limits.h> /* cdrom.h and INT_MAX */ - #include <linux/cdrom.h> - #include <errno.h> - #include <string.h> ---- plugins/input/audiocd/audiocd.h -+++ plugins/input/audiocd/audiocd.h -@@ -23,6 +23,7 @@ - #ifndef __SG_MPFC_AUDIOCD_H__ - #define __SG_MPFC_AUDIOCD_H__ - -+#include <limits.h> /* cdrom.h and INT_MAX */ - #include <linux/cdrom.h> - #include "types.h" - #include "logger.h" diff --git a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch b/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch deleted file mode 100644 index d681e8784f74..000000000000 --- a/media-sound/mpfc/files/mpfc-1.3.7-asneeded.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: mpfc-1.3.7/libmpfc/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/libmpfc/Makefile.am -+++ mpfc-1.3.7/libmpfc/Makefile.am -@@ -18,6 +18,6 @@ libmpfc_la_SOURCES = cfg.c charset.c fil - song_info.c string.c vfs.c logger.c cfg_rcfile.c \ - plugin.c plugin_general.c command.c \ - $(libmpfchdr_HEADERS) --libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ -+libmpfc_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ @DL_LIBS@ - INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd - localedir = $(datadir)/locale -Index: mpfc-1.3.7/src/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/src/Makefile.am -+++ mpfc-1.3.7/src/Makefile.am -@@ -13,6 +13,7 @@ localedir = $(datadir)/locale - DEFS = -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" @DEFS@ - INCLUDES = -I$(top_builddir)/libmpfcwnd/ --mpfc_LDADD = @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ \ -+mpfc_LDADD = \ - $(top_builddir)/libmpfc/libmpfc.la \ -- $(top_builddir)/libmpfcwnd/libmpfcwnd.la -+ $(top_builddir)/libmpfcwnd/libmpfcwnd.la \ -+ @COMMON_LIBS@ @PTHREAD_LIBS@ @DL_LIBS@ @MATH_LIBS@ diff --git a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch b/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch deleted file mode 100644 index 52a318463154..000000000000 --- a/media-sound/mpfc/files/mpfc-1.3.7-libdir.patch +++ /dev/null @@ -1,113 +0,0 @@ -Index: mpfc-1.3.7/libmpfc/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/libmpfc/Makefile.am -+++ mpfc-1.3.7/libmpfc/Makefile.am -@@ -1,7 +1,5 @@ - lib_LTLIBRARIES = libmpfc.la - --libdir = $(prefix)/lib/ -- - libmpfchdrdir = $(prefix)/include/mpfc - libmpfchdr_HEADERS = ../mpfc-config.h ../src/types.h ../src/cfg.h \ - ../src/charset.h \ -Index: mpfc-1.3.7/libmpfcwnd/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/libmpfcwnd/Makefile.am -+++ mpfc-1.3.7/libmpfcwnd/Makefile.am -@@ -1,5 +1,4 @@ - lib_LTLIBRARIES = libmpfcwnd.la --libdir = $(prefix)/lib/ - libmpfcwndhdrdir = $(prefix)/include/mpfc/libmpfcwnd - libmpfcwndhdr_HEADERS = wnd.h wnd_print.h wnd_msg.h wnd_kbd.h \ - wnd_def_handlers.h wnd_root.h wnd_mouse.h wnd_types.h \ -Index: mpfc-1.3.7/plugins/input/audiocd/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/input/audiocd/Makefile.am -+++ mpfc-1.3.7/plugins/input/audiocd/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = libaudiocd.la -+plugin_LTLIBRARIES = libaudiocd.la - --libdir = $(prefix)/lib/mpfc/input -+plugindir = $(libdir)/mpfc/input - - libaudiocd_la_SOURCES = audiocd.c audiocd.h cddb.c cddb.h - libaudiocd_la_LIBADD = @COMMON_LIBS@ @RESOLV_LIBS@ -Index: mpfc-1.3.7/plugins/input/mp3/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/input/mp3/Makefile.am -+++ mpfc-1.3.7/plugins/input/mp3/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = libmp3.la -+plugin_LTLIBRARIES = libmp3.la - --libdir = $(prefix)/lib/mpfc/input -+plugindir = $(libdir)/mpfc/input - - libmp3_la_SOURCES = mp3.c mp3.h - INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd -Index: mpfc-1.3.7/plugins/input/ogg/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/input/ogg/Makefile.am -+++ mpfc-1.3.7/plugins/input/ogg/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = libogg_vorbis.la -+plugin_LTLIBRARIES = libogg_vorbis.la - --libdir = $(prefix)/lib/mpfc/input -+plugindir = $(libdir)/mpfc/input - - libogg_vorbis_la_SOURCES = ogg.c vcedit.c vcedit.h - INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd -Index: mpfc-1.3.7/plugins/input/wav/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/input/wav/Makefile.am -+++ mpfc-1.3.7/plugins/input/wav/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = libwav.la -+plugin_LTLIBRARIES = libwav.la - --libdir = $(prefix)/lib/mpfc/input -+plugindir = $(libdir)/mpfc/input - - libwav_la_SOURCES = wav.c wav.h - libwav_la_LIBADD = @COMMON_LIBS@ -Index: mpfc-1.3.7/plugins/output/alsa/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/output/alsa/Makefile.am -+++ mpfc-1.3.7/plugins/output/alsa/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = libalsa.la -+plugin_LTLIBRARIES = libalsa.la - --libdir = $(prefix)/lib/mpfc/output -+plugindir = $(libdir)/mpfc/output - - libalsa_la_SOURCES = alsa.c - INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/libmpfcwnd -Index: mpfc-1.3.7/plugins/output/disk_writer/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/output/disk_writer/Makefile.am -+++ mpfc-1.3.7/plugins/output/disk_writer/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = libdisk_writer.la -+plugin_LTLIBRARIES = libdisk_writer.la - --libdir = $(prefix)/lib/mpfc/output -+plugindir = $(libdir)/mpfc/output - - libdisk_writer_la_SOURCES = writer.c - libdisk_writer_la_LIBADD = @COMMON_LIBS@ -Index: mpfc-1.3.7/plugins/output/oss/Makefile.am -=================================================================== ---- mpfc-1.3.7.orig/plugins/output/oss/Makefile.am -+++ mpfc-1.3.7/plugins/output/oss/Makefile.am -@@ -1,6 +1,6 @@ --lib_LTLIBRARIES = liboss.la -+plugin_LTLIBRARIES = liboss.la - --libdir = $(prefix)/lib/mpfc/output -+plugindir = $(libdir)/mpfc/output - - liboss_la_SOURCES = oss.c - liboss_la_LIBADD = @COMMON_LIBS@ diff --git a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch b/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch deleted file mode 100644 index 09471407398b..000000000000 --- a/media-sound/mpfc/files/mpfc-1.3.7-mathlib.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: mpfc-1.3.7/configure.in -=================================================================== ---- mpfc-1.3.7.orig/configure.in -+++ mpfc-1.3.7/configure.in -@@ -66,7 +66,6 @@ LIBS=$LIBS_save - AC_ARG_ENABLE(mp3, - [ --disable-mp3 Disable mp3 input plugin [default=enabled]],, - enable_mp3="yes") --if test "x$enable_mp3" = xyes; then - # Check for math lib - LIBS_save=$LIBS - AC_CHECK_HEADERS([math.h],,[AC_MSG_ERROR(*** Can't find math header ***)]) -@@ -75,6 +74,7 @@ if test "x$enable_mp3" = xyes; then - AC_SUBST(MATH_LIBS) - LIBS=$LIBS_save - -+if test "x$enable_mp3" = xyes; then - # Check for libmad - LIBS_save=$LIBS - AC_CHECK_HEADERS([mad.h],,[AC_MSG_ERROR(*** Can't find libmad header ***)]) diff --git a/media-sound/mpfc/files/mpfc-gcc4.patch b/media-sound/mpfc/files/mpfc-gcc4.patch deleted file mode 100644 index 5cb1efb6834b..000000000000 --- a/media-sound/mpfc/files/mpfc-gcc4.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- mpfc-1.3.7/plugins/input/audiocd/audiocd.c.old 2006-11-05 21:13:25.000000000 +0100 -+++ mpfc-1.3.7/plugins/input/audiocd/audiocd.c 2006-11-05 21:13:35.000000000 +0100 -@@ -60,8 +60,8 @@ - /* Tracks information array */ - struct acd_trk_info_t acd_tracks_info[ACD_MAX_TRACKS]; - int acd_num_tracks = 0; --static int acd_cur_track = -1; --static bool_t acd_info_read = FALSE; -+int acd_cur_track = -1; -+bool_t acd_info_read = FALSE; - - /* Current time */ - static int acd_time = 0; diff --git a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild b/media-sound/mpfc/mpfc-1.3.7-r1.ebuild deleted file mode 100644 index 9dc80425d13e..000000000000 --- a/media-sound/mpfc/mpfc-1.3.7-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit autotools eutils - -DESCRIPTION="Music Player For Console" -HOMEPAGE="http://mpfc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="alsa gpm mad vorbis oss wav cdda nls" - -RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 ) - gpm? ( >=sys-libs/gpm-1.19.3 ) - mad? ( media-libs/libmad ) - vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND}" - -src_prepare() { - sed -i \ - -e 's:../src/file.h ../src/file.h:../src/file.h:' \ - libmpfc/Makefile.am || die #335449 - - epatch "${FILESDIR}"/${P}-libdir.patch \ - "${FILESDIR}"/${PN}-gcc4.patch \ - "${FILESDIR}"/${P}-mathlib.patch \ - "${FILESDIR}"/${P}-asneeded.patch \ - "${FILESDIR}"/${P}-INT_MAX.patch - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - econf \ - $(use_enable alsa) \ - $(use_enable gpm) \ - $(use_enable mad mp3) \ - $(use_enable vorbis ogg) \ - $(use_enable oss) \ - $(use_enable wav) \ - $(use_enable cdda audiocd) \ - $(use_enable nls) -} - -src_install() { - emake DESTDIR="${D}" install || die - - insinto /etc - doins mpfcrc || die - - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild index 1c9f36d00895..0d64bd78bc89 100644 --- a/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild +++ b/media-sound/mpfc/mpfc-1.3.8.1-r2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools eutils +inherit autotools DESCRIPTION="Music Player For Console" HOMEPAGE="http://mpfc.sourceforge.net/" @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc x86" +KEYWORDS="amd64 ppc x86" IUSE="alsa cdda flac gpm mad nls oss static-libs vorbis wav" RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0 ) @@ -53,5 +53,6 @@ src_install() { insinto /etc doins mpfcrc - prune_libtool_files --all + # package provides .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild index 3d86277c7cd7..8d05cca058b2 100644 --- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild +++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild @@ -5,7 +5,7 @@ EAPI=6 SSL_CERT_MANDATORY=1 -inherit eutils pam rebar ssl-cert systemd +inherit autotools eutils pam rebar ssl-cert systemd DESCRIPTION="Robust, scalable and extensible XMPP server" HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" @@ -228,6 +228,11 @@ src_prepare() { sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ -i "${S}/ejabberdctl.template" \ || die 'failed to set ERL_LIBS in ejabberdctl.template' + + # https://github.com/processone/ejabberd/commit/58110e4bc152100078dbc0cb66d4a5257ae645e0, + # bug #651932, drop in next version + sed -i -e 's/REQUIRE_ERLANG_MAX="9.0.0 (No Max)"/REQUIRE_ERLANG_MAX="100.0.0 (No Max)"/' configure.ac || die + eautoreconf } src_configure() { diff --git a/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch deleted file mode 100644 index bc68698ea247..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-aclocal-fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2006-12-30 09:28:52.000000000 -0500 -+++ configure.ac 2007-02-27 12:13:38.000000000 -0500 -@@ -15,7 +15,6 @@ - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET --AC_PROG_SYSCONFTOOL - AC_LIBTOOL_DLOPEN - AM_PROG_LIBTOOL - diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch deleted file mode 100644 index ba75db9ff5dd..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-db4-bdbobj_configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- libs/bdbobj/configure.ac.orig 2013-08-25 20:52:10.000000000 +0200 -+++ libs/bdbobj/configure.ac 2013-11-22 10:39:25.787861774 +0100 -@@ -23,15 +23,22 @@ - dnl Checks for libraries. - - saveLIBS="$LIBS" --AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ], -- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], -- AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"]) -- )) -- -+for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db -+ do -+ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ])))))) -+ done - FOUND_DB=0 --AC_CHECK_FUNC(dbopen, FOUND_DB=1) --AC_CHECK_FUNC(db_open, FOUND_DB=1) --AC_CHECK_FUNC(db_env_create, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4004, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4003, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4002, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4001, FOUND_DB=1) -+AC_CHECK_FUNC(db_create_4000, FOUND_DB=1) -+AC_CHECK_FUNC(db_create, FOUND_DB=1) - - LIBS="$saveLIBS" - diff --git a/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch deleted file mode 100644 index 19fe77e28f69..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-db4-configure.ac.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.ac.orig 2013-09-28 19:44:24.000000000 +0200 -+++ configure.ac 2013-11-22 10:46:34.910990069 +0100 -@@ -180,15 +180,21 @@ - if test "$db" != "gdbm" - then - -- AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ], -- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"], -- AC_CHECK_LIB(db, db_env_create, -- [ LIBDB=-ldb; LIBS="-ldb $LIBS"]) -- )) -- -- AC_CHECK_FUNC(dbopen, HAVE_BDB=1) -- AC_CHECK_FUNC(db_open, HAVE_BDB=1) -- AC_CHECK_FUNC(db_env_create, HAVE_BDB=1) -+for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db -+ do -+ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ], -+ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ])))))) -+ done -+AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1) -+AC_CHECK_FUNC(db_create, HAVE_BDB=1) - fi - - LIBS="$saveLIBS" diff --git a/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch b/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch deleted file mode 100644 index 940703d1b6ca..000000000000 --- a/net-mail/courier-imap/files/courier-imap-4.15-disable-fam-configure.ac.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- libs/maildir/configure.ac.orig 2004-06-08 15:44:23.000000000 -0700 -+++ libs/maildir/configure.ac 2004-08-14 15:28:20.525714876 -0700 -@@ -73,6 +73,12 @@ - dnl Checks for library functions. - AC_CHECK_HEADER(fam.h, :, :) - AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) -+AC_ARG_WITH(fam, [ --with-fam Compile with FAM support], -+ fam="$withval", -+ fam="no") -+ -+if test "$fam" != "no" -+then - AC_CHECK_LIB(fam, FAMOpen, [ - LIBFAM=-lfam - AC_DEFINE_UNQUOTED(HAVE_FAM,1, -@@ -87,6 +93,7 @@ - AC_MSG_ERROR([[FAM development libraries not found.]]) ] - ) - ]) -+fi - - AC_SUBST(LIBFAM) - diff --git a/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch b/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch deleted file mode 100644 index 55ed4b6f8e38..000000000000 --- a/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c -index 1905236..7d911bc 100644 ---- a/src/daemon/priv-seccomp.c -+++ b/src/daemon/priv-seccomp.c -@@ -161,6 +161,7 @@ priv_seccomp_init(int remote, int child) - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 || -+ (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 || - (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 0)) < 0 || diff --git a/sci-biology/bioruby/files/bioruby-1.4.3.0001-fix-tests.patch b/sci-biology/bioruby/files/bioruby-1.4.3.0001-fix-tests.patch deleted file mode 100644 index 71c4ca27104a..000000000000 --- a/sci-biology/bioruby/files/bioruby-1.4.3.0001-fix-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From edda65b8fb32c2eee6b0652074981c31aa68b0eb Mon Sep 17 00:00:00 2001 -From: Naohisa Goto <ng@bioruby.org> -Date: Fri, 23 Aug 2013 23:51:59 +0900 -Subject: [PATCH] Test bug fix: Read test file with binary mode to avoid - encoding error - - * Test bug fix: Read test file with binary mode to avoid string encoding - error. Thanks to nieder (github.com/nieder) who reports the bug. - (https://github.com/bioruby/bioruby/issues/84) ---- - test/unit/bio/db/test_phyloxml.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/unit/bio/db/test_phyloxml.rb b/test/unit/bio/db/test_phyloxml.rb -index 0744c64..c24278d 100644 ---- a/test/unit/bio/db/test_phyloxml.rb -+++ b/test/unit/bio/db/test_phyloxml.rb -@@ -100,7 +100,7 @@ def test_open_with_block - end - - def test_new -- str = File.read(TestPhyloXMLData.example_xml) -+ str = File.open(TestPhyloXMLData.example_xml, "rb") { |f| f.read } - assert_instance_of(Bio::PhyloXML::Parser, - phyloxml = Bio::PhyloXML::Parser.new(str)) - common_test_next_tree(phyloxml) --- -1.8.4 - diff --git a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild b/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild deleted file mode 100644 index b17c23092e2c..000000000000 --- a/sci-libs/suitesparseconfig/suitesparseconfig-4.2.1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils - -DESCRIPTION="Common configurations for all packages in suitesparse" -HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SuiteSparse_config" -SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x86-macos" -IUSE="static-libs" diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild index 19fbe148a630..585d59c0ca1e 100644 --- a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild +++ b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,7 @@ inherit eutils flag-o-matic MY_PV=${PV/_p*/} DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)" -HOMEPAGE="https://www.spice-space.org/page/UsbRedir" +HOMEPAGE="https://www.spice-space.org/usbredir.html" SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz" diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild index 511853883be1..cbf611d135ec 100644 --- a/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild +++ b/sys-apps/usbredir/usbredir-0.7.1_p20180211.ebuild @@ -7,7 +7,7 @@ inherit eutils flag-o-matic MY_PV=${PV/_p*/} DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)" -HOMEPAGE="https://www.spice-space.org/page/UsbRedir" +HOMEPAGE="https://www.spice-space.org/usbredir.html" SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/${P}-patches.tar.xz" diff --git a/sys-apps/usbredir/usbredir-9999.ebuild b/sys-apps/usbredir/usbredir-9999.ebuild index 8c8f43ddda02..84886235db9a 100644 --- a/sys-apps/usbredir/usbredir-9999.ebuild +++ b/sys-apps/usbredir/usbredir-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit eutils flag-o-matic autotools git-r3 DESCRIPTION="TCP daemon and set of libraries for usbredir protocol (redirecting USB traffic)" -HOMEPAGE="https://www.spice-space.org/page/UsbRedir" +HOMEPAGE="https://www.spice-space.org/usbredir.html" EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/usbredir.git" LICENSE="GPL-2 LGPL-2.1" diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest index 639fe2294d76..122eb516dc99 100644 --- a/www-client/google-chrome-beta/Manifest +++ b/www-client/google-chrome-beta/Manifest @@ -1 +1 @@ -DIST google-chrome-beta_66.0.3359.106-1_amd64.deb 53202966 BLAKE2B 6f82beba25dd704dc1e8197e5b35962fb3951fa75017caa78d95de7051d9671d409a72f5eab7085060e16c719dfde46c94e0473e4ad48437f8da6d941343e4da SHA512 d7ad4bf61e28f9e33d05455f200373d3730eea56cb7e4d4bcc7b7701083d3ce19b5da94943fa9985162814cc283ce472262313bfaf40fa628fbb5feabed41cf4 +DIST google-chrome-beta_66.0.3359.117-1_amd64.deb 53325510 BLAKE2B 376e9d2c77cc1eb10c5feebd5bdbb95c27e7160cb5cb943ca232778dd960fdad566fa8b0b3f53bb73f26107158b2ba0ed5f4e7b214a9393dd4cb997b09f70a0b SHA512 52643c393ca84d4808fb086ab1c4a4cf7f7dce00cc3b01bf11d5db920155fccb348bd53890239d9332911e06808b4ca46e4c9f06ed10a01b1b4c47cc901d4f83 diff --git a/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.106.ebuild b/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.117.ebuild index 500479b752d3..500479b752d3 100644 --- a/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.106.ebuild +++ b/www-client/google-chrome-beta/google-chrome-beta-66.0.3359.117.ebuild diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 115d9bca8194..6075f788508f 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1 +1 @@ -DIST google-chrome-unstable_67.0.3393.4-1_amd64.deb 53858546 BLAKE2B 7f5b3846988116317a85889022a31f3cea7601219c716a7e1cc599d2a5f89b3cbc74023864090c3d312d6ef4b76f18175e04ef245835c2ec88befbb02b550b71 SHA512 31e45c049faaa97d71bbaf445747c27a6485d96ddb24090bfc3ea894e758d1238b2d026ae272e4c5d239da5e53c053aeeb1fc28a6fba1633beeea088b3df0b62 +DIST google-chrome-unstable_67.0.3396.10-1_amd64.deb 53700484 BLAKE2B 92ec6a83635c8ceaae0487d6b72e6b0b0116e9d238909611b2cf38ea68d18707754011bad0cdaa76209ed2a05f476a8cd4bfe11d012e27b3466bea2d4c6c06cd SHA512 75343baac899b8ab69e5e4a1a4d59b27d1a042309518b4cae0e6c33a9f7c047dc62c03193ff3df2aa8a16daaa157c762f670765a2fcb5613db4c28eae212faf5 diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3393.4.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3396.10.ebuild index 43d5352b4dd5..43d5352b4dd5 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3393.4.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-67.0.3396.10.ebuild diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index b693aefe5155..8a0f240ea851 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1 +1 @@ -DIST google-chrome-stable_65.0.3325.181-1_amd64.deb 52132868 BLAKE2B 8a40527aa5c6b6f82ed5ec0436a1887989029e514d90306b8d459ed71740fd7184cf5f4c6b0427b41e15b32cc7176c7cacfd3cb34270cc2ee0e0e6c677962e6f SHA512 b80a02753ca302967dadbfc3336eab8577ff3940fea1270454c43c6bf26bd64bc6178e8d70a44aa418a3ace47cabf49d7da918d806d2957415fffb78b7faf98b +DIST google-chrome-stable_66.0.3359.117-1_amd64.deb 52231002 BLAKE2B 383ae9f461283a69e2d73d4368baba755fb6ae0fa5caeb65df9e4a53b36671dd8f0d75f460bd78881a8fda0733b732acfd24d06e47bc5cff549aead1f585cb31 SHA512 15cfb49c0186961f0859cb63e3691982244b13d258b451342cdf885824ad42e023e7ead14da28927424af69173c8382f512e729607705bcfc59b1bcea22cdce2 diff --git a/www-client/google-chrome/google-chrome-65.0.3325.181.ebuild b/www-client/google-chrome/google-chrome-66.0.3359.117.ebuild index 38dbe68c340a..38dbe68c340a 100644 --- a/www-client/google-chrome/google-chrome-65.0.3325.181.ebuild +++ b/www-client/google-chrome/google-chrome-66.0.3359.117.ebuild diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild index f0fa4e19108a..7596cb361676 100644 --- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild +++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="libressl ssl" DEPEND=" diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest index 6601f55b5ac6..ce92b2078e58 100644 --- a/www-plugins/chrome-binary-plugins/Manifest +++ b/www-plugins/chrome-binary-plugins/Manifest @@ -1,3 +1,3 @@ -DIST google-chrome-beta_66.0.3359.106-1_amd64.deb 53202966 BLAKE2B 6f82beba25dd704dc1e8197e5b35962fb3951fa75017caa78d95de7051d9671d409a72f5eab7085060e16c719dfde46c94e0473e4ad48437f8da6d941343e4da SHA512 d7ad4bf61e28f9e33d05455f200373d3730eea56cb7e4d4bcc7b7701083d3ce19b5da94943fa9985162814cc283ce472262313bfaf40fa628fbb5feabed41cf4 -DIST google-chrome-stable_65.0.3325.181-1_amd64.deb 52132868 BLAKE2B 8a40527aa5c6b6f82ed5ec0436a1887989029e514d90306b8d459ed71740fd7184cf5f4c6b0427b41e15b32cc7176c7cacfd3cb34270cc2ee0e0e6c677962e6f SHA512 b80a02753ca302967dadbfc3336eab8577ff3940fea1270454c43c6bf26bd64bc6178e8d70a44aa418a3ace47cabf49d7da918d806d2957415fffb78b7faf98b -DIST google-chrome-unstable_67.0.3393.4-1_amd64.deb 53858546 BLAKE2B 7f5b3846988116317a85889022a31f3cea7601219c716a7e1cc599d2a5f89b3cbc74023864090c3d312d6ef4b76f18175e04ef245835c2ec88befbb02b550b71 SHA512 31e45c049faaa97d71bbaf445747c27a6485d96ddb24090bfc3ea894e758d1238b2d026ae272e4c5d239da5e53c053aeeb1fc28a6fba1633beeea088b3df0b62 +DIST google-chrome-beta_66.0.3359.117-1_amd64.deb 53325510 BLAKE2B 376e9d2c77cc1eb10c5feebd5bdbb95c27e7160cb5cb943ca232778dd960fdad566fa8b0b3f53bb73f26107158b2ba0ed5f4e7b214a9393dd4cb997b09f70a0b SHA512 52643c393ca84d4808fb086ab1c4a4cf7f7dce00cc3b01bf11d5db920155fccb348bd53890239d9332911e06808b4ca46e4c9f06ed10a01b1b4c47cc901d4f83 +DIST google-chrome-stable_66.0.3359.117-1_amd64.deb 52231002 BLAKE2B 383ae9f461283a69e2d73d4368baba755fb6ae0fa5caeb65df9e4a53b36671dd8f0d75f460bd78881a8fda0733b732acfd24d06e47bc5cff549aead1f585cb31 SHA512 15cfb49c0186961f0859cb63e3691982244b13d258b451342cdf885824ad42e023e7ead14da28927424af69173c8382f512e729607705bcfc59b1bcea22cdce2 +DIST google-chrome-unstable_67.0.3396.10-1_amd64.deb 53700484 BLAKE2B 92ec6a83635c8ceaae0487d6b72e6b0b0116e9d238909611b2cf38ea68d18707754011bad0cdaa76209ed2a05f476a8cd4bfe11d012e27b3466bea2d4c6c06cd SHA512 75343baac899b8ab69e5e4a1a4d59b27d1a042309518b4cae0e6c33a9f7c047dc62c03193ff3df2aa8a16daaa157c762f670765a2fcb5613db4c28eae212faf5 diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.181.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.117.ebuild index c62a441fcb51..c62a441fcb51 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-65.0.3325.181.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.117.ebuild diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.106_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.117_beta.ebuild index e94c35d47021..e94c35d47021 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.106_beta.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-66.0.3359.117_beta.ebuild diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3393.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.10_alpha.ebuild index f2cb5723b3da..f2cb5723b3da 100644 --- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3393.4_alpha.ebuild +++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.10_alpha.ebuild |