Sync with portage [Mon Dec 28 23:50:45 MSK 2015].

mhiretskiy 183
root 8 years ago
parent 988dfcd015
commit d7a3983e9b

@ -1,41 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
extra_started_commands="reload reopen"
: ${ULOGD_BINARY:=/usr/sbin/ulogd}
: ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid}
: ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}}
depend() {
before iptables ip6tables ebtables nftables firewall
after mysql postgresql
}
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --start \
--exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \
-- ${ULOGD_OPTS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
start-stop-daemon --stop --pidfile ${ULOGD_PIDFILE}
eend $?
}
reload() {
ebegin "Reloading ${SVCNAME} configuration"
start-stop-daemon --signal USR1 --pidfile ${ULOGD_PIDFILE}
eend $?
}
reopen() {
ebegin "Reopening ${SVCNAME} logfiles"
start-stop-daemon --signal HUP --pidfile ${ULOGD_PIDFILE}
eend $?
}

@ -1,147 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user
DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
SRC_URI="
https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ia64 ppc x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
RDEPEND="
|| ( net-firewall/iptables net-firewall/nftables )
>=net-libs/libnfnetlink-1.0.1
dbi? ( dev-db/libdbi )
json? ( dev-libs/jansson )
nfacct? (
>=net-libs/libmnl-1.0.3
>=net-libs/libnetfilter_acct-1.0.1
)
nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
mysql? ( virtual/mysql )
pcap? ( net-libs/libpcap )
postgres? ( dev-db/postgresql:= )
sqlite? ( dev-db/sqlite:3 )
"
DEPEND="${RDEPEND}
doc? (
app-text/linuxdoc-tools
app-text/texlive-core
virtual/latex-base
)
"
PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
DOCS=( AUTHORS README TODO )
DOC_CONTENTS="
You must have at least one logging stack enabled to make ulogd work.
Please edit example configuration located at /etc/ulogd.conf
"
pkg_setup() {
enewgroup ulogd
enewuser ulogd -1 -1 /var/log/ulogd ulogd
linux-info_pkg_setup
if kernel_is lt 2 6 14; then
die "ulogd requires kernel newer than 2.6.14"
fi
if kernel_is lt 2 6 18; then
ewarn "You are using kernel older than 2.6.18"
ewarn "Some ulogd features may be unavailable"
fi
if use nfacct && kernel_is lt 3 3 0; then
ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
fi
if use ulog && kernel_is gt 3 17 0; then
ewarn "ULOG target was removed since 3.17.0 kernel release"
ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
fi
}
src_prepare() {
# - make all logs to be kept in a single dir /var/log/ulogd
# - place sockets in /run instead of /tmp
sed -i \
-e 's:var/log:var/log/ulogd:g' \
-e 's:tmp:run:g' \
ulogd.conf.in || die 'sed on ulogd.conf.in failed'
append-lfs-flags
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
$(use_with dbi)
$(use_with json jansson)
$(use_enable nfacct)
$(use_enable nfct)
$(use_enable nflog)
$(use_with mysql)
$(use_with pcap)
$(use_with postgres pgsql)
$(use_with sqlite)
$(use_enable ulog)
)
autotools-utils_src_configure
}
src_compile() {
autotools-utils_src_compile
if use doc; then
# Prevent access violations from bitmap font files generation
export VARTEXFONTS="${T}"/fonts
emake -C doc
fi
}
src_install() {
autotools-utils_src_install
readme.gentoo_create_doc
prune_libtool_files --modules
if use doc; then
dohtml doc/${PN}.html
dodoc doc/${PN}.dvi doc/${PN}.txt doc/${PN}.ps
fi
use sqlite && dodoc doc/sqlite3.table
use mysql && dodoc doc/mysql-*.sql
use postgres && dodoc doc/pgsql-*.sql
doman ${PN}.8
insinto /etc
doins ${PN}.conf
fowners root:ulogd /etc/ulogd.conf
fperms 640 /etc/ulogd.conf
newinitd "${FILESDIR}/${PN}.init-r1" ${PN}
systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}
diropts -o ulogd -g ulogd
keepdir /var/log/ulogd
}

@ -137,8 +137,8 @@ src_install() {
fowners root:ulogd /etc/${PN}.conf
fperms 640 /etc/${PN}.conf
newinitd "${FILESDIR}/${PN}.init-r2" ${PN}
systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service
newinitd "${FILESDIR}/${PN}.init" ${PN}
systemd_dounit "${FILESDIR}/${PN}.service"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" ${PN}

@ -0,0 +1,31 @@
From 738e9291ed15980bdac568fc5f9507a43897ba52 Mon Sep 17 00:00:00 2001
From: Kyle Manna <kyle@kylemanna.com>
Date: Fri, 6 Nov 2015 08:12:50 -0800
Subject: [PATCH] obnamlib: sftp: Add prefetch size argument
Paramiko made this argument required in v1.16. Details at
https://github.com/paramiko/paramiko/commit/49072f3537a8981e9d448c22481a1d2b92c03643
Attempt to fetch the entire file. I'm unsure if this is the original
intent. If the entire file isn't to be fetched, then the prefetch() is
probably not needed.
---
obnamlib/plugins/sftp_plugin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/obnamlib/plugins/sftp_plugin.py b/obnamlib/plugins/sftp_plugin.py
index c4d5c2f..a5bc72b 100644
--- a/obnamlib/plugins/sftp_plugin.py
+++ b/obnamlib/plugins/sftp_plugin.py
@@ -555,7 +555,7 @@ class SftpFS(obnamlib.VirtualFileSystem):
def cat(self, pathname):
self._delay()
f = self.open(pathname, 'rb')
- f.prefetch()
+ f.prefetch(self.lstat(pathname).st_size)
chunks = []
while True:
chunk = f.read(self.chunk_size)
--
2.6.2

@ -22,13 +22,17 @@ DEPEND="${PYTHON_DEPS}
dev-python/cliapp[${PYTHON_USEDEP}]
dev-python/fuse-python[${PYTHON_USEDEP}]
dev-python/larch[${PYTHON_USEDEP}]
>dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/tracing[${PYTHON_USEDEP}]
dev-python/ttystatus[${PYTHON_USEDEP}]
"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}/${P}-obnamlib-sftp-Add-prefetch-size-argument.patch"
}
src_compile() {
addwrite /proc/self/comm
distutils-r1_src_compile

@ -1,3 +1,4 @@
DIST dict_pack_ru-aot-0-4-0.oxt 1509261 SHA256 0d4e15c3eca931e690d6533be8d0b5ce22948f0d45e3df0d1a5e0e870c093db9 SHA512 00e63f5abcfbb2fecd72dc2a2b80dc5ebb4d16aac909b2f63670235edadd0d22a5ed3ae0508bfdb273a85f32ee60df4e84dc620fa1a44f42543848b71a9d1b01 WHIRLPOOL fce8e71e09d0d86375a2648968254a355e0569bd744627abb2ec71c6bb6e34a824dbb5550d79cda0f19539bee210ec0983f64d12ee167f3ed3196c06577dd9b9
DIST myspell-hyph_ru_RU-20060316.zip 11089 SHA256 95b2198f937f1ba1fe2373302c81517ee88a38c237a1ed5557c543a7e2b141df SHA512 4538a4fbdd61adafe321258fb4a9b1896d10747adf8203bd3a5eaa40ee15a9d5d3d8304a19a644f676a1224ac36f5d47ae7a10cbcae22ccbd2f8af49bf5e92ac WHIRLPOOL 46d284df470596c796b436fab9042d8c58625dc3f0c3da41434133afed0eb35b0b2c326005460b9eda4c20499420d7d1bf8d51ac41160f0bfaa125ff45d27baa
DIST myspell-ru_RU-20060316.zip 467216 SHA256 387e9fd6c24c34e27fe5f0eb227beec2522b8855dc44917a37a66571db15ed0d SHA512 2a1d62cd79d58ca093f477006e436e728ff2cf063c3b0e1ce127a0c83835afe7fce7846e9ec3577e848c9d911565b4fdff8475508bbbe29f2d9523fe0a858617 WHIRLPOOL dfe9e19ba00aa5c200073e5da08b9d7d832c002f2e83814b138f40480d04b6dc91b0455cc45e2266d7f77492df767889f2958ba5fb781cb7c362fffc153d263c
DIST myspell-ru_RU_ye-20060316.zip 984889 SHA256 8eecd25a1d16e43dde23fd72deb6c9290e0f328b7fb2956ec3fe07692ce8e653 SHA512 5d1e39166b8666ee2be599cd74872a80b34bba11ff389ca74919a0b2fca7f7e66dfd71188b97f08686161e5af54164b82d0fe86c9097c3aaad6c22432f867e19 WHIRLPOOL 05bb523e3c82a6dee7812c9642aa660998328858dd173af9d73db80c43eb73034aa48fb4e431e280b8d4af81f17c719c0cc3557927cafd35ca864572dc28e738

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
<herd>proxy-maintainers</herd>
<maintainer>
<email>perfect007gentleman@gmail.com</email>
<name>Perfect Gentleman</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
</pkgmetadata>

@ -0,0 +1,26 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MYSPELL_DICT=( russian-aot.{dic,aff} )
MYSPELL_HYPH=( hyph_ru_RU.dic )
MYSPELL_THES=( ru_th_aot.{dat,idx} )
inherit myspell-r2
EXT="extension-center"
DICT="russian-dictionary-pack"
MY_PN="dict_pack_ru-aot"
MY_PV="0.4.0"
DESCRIPTION="Russian spellcheck dictionary based on works of AOT group for myspell/hunspell"
HOMEPAGE="http://extensions.libreoffice.org/extension-center/russian-dictionary-pack"
SRC_URI="http://extensions.libreoffice.org/${EXT}/${DICT}/releases/${MY_PV}/${MY_PN}-0-4-0.oxt"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd"

@ -1,2 +1,3 @@
DIST scite355.tgz 2302137 SHA256 20515597ac986f1727c97bda2c27d88487ddb79cfe330b0b890b5e25330b7d9f SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d WHIRLPOOL c901804481042b859be68f44ab728544e97975d61219a4bb576ba3da00bd663c8877e9b23b981a0295d759cae3e9afd037d981923086c6850ff29f01c43ec9f6
DIST scite361.tgz 2347061 SHA256 bdffdc28c501dbb5e3dc6cbfe3808da2d574df983790c6ddfc2643040023a010 SHA512 5ead063ba98798ec5aa188735f219a19e788fbfaf12c84bce61a08c356e85e73cbbac412731cfdec02266bb8fa94d2a461239ffaba14b99ea65c31eb770dfcc3 WHIRLPOOL 8279b3fea54d2ef266dc5d5cb2b16896731e75d20bcdedaa59570e49d8b201fe7085ecac8f63cb06f2511ebd817d137b5189834d19ee7d4ffae43eaf06d465a7
DIST scite362.tgz 2368491 SHA256 6530d0d86c72485b815663e3b2c2987d59779340a71632ed8bb97a43530737a3 SHA512 cb9618e962a16db7484e16a494b3da39f210250277e9772b112af5e16649b38f27ead0ec61664b1211c9263880cb7f3c34b5b32d94a4e70087fb1503805740c1 WHIRLPOOL 52a31f0e1518a9d8f6107aa22eead7da89e1d1ea6523a2aae57fbd7a3a8ecbd192c124c3d2550acea6383457763d6e501b14791ec6490a54379c5d13356e42da

@ -0,0 +1,85 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit toolchain-funcs eutils
MY_PV=${PV//./}
DESCRIPTION="A very powerful editor for programmers"
HOMEPAGE="http://www.scintilla.org/SciTE.html"
SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
LICENSE="HPND lua? ( MIT )"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="lua"
RDEPEND="dev-libs/glib:2
x11-libs/cairo
x11-libs/gtk+:2
x11-libs/gdk-pixbuf
x11-libs/pango
lua? ( >=dev-lang/lua-5:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-apps/sed-4"
S="${WORKDIR}/${PN}/gtk"
src_prepare() {
cd "${WORKDIR}/scintilla/gtk"
sed -i makefile \
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e "s#-Os##" \
|| die "error patching makefile"
cd "${WORKDIR}/scite/gtk"
sed -i makefile \
-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
|| die "error patching makefile"
cd "${S}"
sed -i makefile \
-e 's#usr/local#usr#g' \
-e 's#/gnome/apps/Applications#/applications#' \
-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-e 's#${D}##' \
-e 's#-g root#-g 0#' \
-e "s#-Os##" \
|| die "error patching makefile"
}
src_compile() {
emake -C ../../scintilla/gtk AR="$(tc-getAR)"
if use lua; then
emake
else
emake NO_LUA=1
fi
}
src_install() {
dodir /usr/bin
dodir /usr/share/{pixmaps,applications}
emake prefix="${ED}/usr" install
# we have to keep this because otherwise it'll break upgrading
mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
dosym /usr/bin/scite /usr/bin/SciTE
# replace .desktop file with our own working version
rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
domenu "${FILESDIR}/scite.desktop"
doman ../doc/scite.1
dodoc ../README
}

@ -38,7 +38,7 @@ SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline vanilla"
DEPEND=">=sys-libs/ncurses-5.2-r2

@ -64,7 +64,6 @@ pkg_setup() {
# --use-system-tcmalloc is strongly NOT recommended:
# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
scons_opts+=" --disable-warnings-as-errors"
scons_opts+=" --use-system-boost"
scons_opts+=" --use-system-pcre"

@ -1 +1 @@
DIST Jama-1.0.3.tar.gz 82188 SHA256 a8f4c8f3a4a5d5f8908304638d03aa181b7c71debb2e3c08bb9dc14fcc350a75 SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d WHIRLPOOL aa9f303b906bead6f4620d1d307a372ccbc305bd0947948b3b26b160b4f5b6ab67901289d9525ff2705e8d9ab21d3a6c30f3715c9ae57394a373e1bbdfd9c436
DIST jama-1.0.3.tar.gz 82188 SHA256 a8f4c8f3a4a5d5f8908304638d03aa181b7c71debb2e3c08bb9dc14fcc350a75 SHA512 9bedf8f35ea1d400194b5a3b49914ebd04b5a31247959886f1967d062ceffae30993d34cd2f15d3942285a45c6930e2d4518f4ed0cc013ce853cc26aca021b0d WHIRLPOOL aa9f303b906bead6f4620d1d307a372ccbc305bd0947948b3b26b160b4f5b6ab67901289d9525ff2705e8d9ab21d3a6c30f3715c9ae57394a373e1bbdfd9c436

@ -13,13 +13,17 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="A Java Matrix Package"
HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz"
SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86 ~ppc ~ppc64"
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}"
java_prepare() {
java-pkg_clean
}

@ -14,23 +14,32 @@ SRC_URI="https://github.com/jline/${PN}/archive/${P}.tar.gz"
LICENSE="BSD"
SLOT="2"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/jansi:0
CDEPEND="
dev-java/jansi:0
dev-java/jansi-native:0"
DEPEND="${CDEPEND}
>=virtual/jdk-1.6
test? ( dev-java/junit:4 )"
DEPEND="
test? (
dev-java/junit:4
)
${CDEPEND}
>=virtual/jdk-1.6"
RDEPEND="${CDEPEND}
RDEPEND="
${CDEPEND}
>=virtual/jre-1.6"
S="${WORKDIR}/${PN}2-${P}"
JAVA_SRC_DIR="src/main/java"
JAVA_GENTOO_CLASSPATH="jansi,jansi-native"
JAVA_GENTOO_CLASSPATH="
jansi
jansi-native
"
java_prepare() {
# Easier to use java-pkg-simple.

@ -1,60 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A Java library for handling console input"
HOMEPAGE="https://github.com/jline/jline2"
SRC_URI="https://github.com/jline/jline2/archive/${P}.tar.gz"
LICENSE="BSD"
SLOT="2"
KEYWORDS="amd64 x86"
IUSE="test"
CDEPEND="dev-java/jansi:1.11
dev-java/jansi-native:0"
DEPEND="${CDEPEND}
>=virtual/jdk-1.5
test? ( dev-java/junit:4 )"
RDEPEND="${CDEPEND}
>=virtual/jre-1.5"
S="${WORKDIR}/${PN}2-${P}"
JAVA_SRC_DIR="src/main/java"
JAVA_GENTOO_CLASSPATH="jansi-1.11,jansi-native"
java_prepare() {
# Easier to use java-pkg-simple.
rm -v pom.xml || die
# Don't forget the resources!
mkdir -p target/classes || die
cp -r src/main/resources/* target/classes || die
}
src_install() {
java-pkg-simple_src_install
dodoc {CHANGELOG,README}.md
}
src_test() {
cd src/test/java || die
local CP=".:../resources:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
local TESTS=$(find * -name "*Test.java")
TESTS="${TESTS//.java}"
TESTS="${TESTS//\//.}"
ejavac -cp "${CP}" -d . $(find * -name "*.java")
ejunit4 -classpath "${CP}" ${TESTS}
}

@ -13,20 +13,21 @@ SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE=""
CDEPEND="dev-java/slf4j-log4j12:0
dev-java/slf4j-api:0
"
CDEPEND="
dev-java/slf4j-log4j12:0
dev-java/slf4j-api:0"
RDEPEND=">=virtual/jre-1.6
RDEPEND="
${CDEPEND}
"
DEPEND=">=virtual/jdk-1.6
app-arch/unzip
>=virtual/jre-1.6"
DEPEND="
${CDEPEND}
"
app-arch/unzip
>=virtual/jdk-1.6"
JAVA_GENTOO_CLASSPATH="
slf4j-log4j12

@ -0,0 +1,48 @@
diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
index 4b69010..1bb6195 100644
--- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
@@ -578,6 +578,34 @@ namespace System.Configuration
private ExeConfigurationFileMap exeMapPrev = null;
private SettingsPropertyValueCollection values = null;
+ /// <remarks>
+ /// Hack to remove the XmlDeclaration that the XmlSerializer adds.
+ /// <br />
+ /// see <a href="https://github.com/mono/mono/pull/2273">Issue 2273</a> for details
+ /// </remarks>
+ private string StripXmlHeader(string serializedValue)
+ {
+ if (serializedValue == null)
+ {
+ return string.Empty;
+ }
+
+ XmlDocument doc = new XmlDocument();
+ XmlElement valueXml = doc.CreateElement("value");
+ valueXml.InnerXml = serializedValue;
+
+ foreach (XmlNode child in valueXml.ChildNodes) {
+ if (child.NodeType == XmlNodeType.XmlDeclaration) {
+ valueXml.RemoveChild(child);
+ break;
+ }
+ }
+
+ // InnerXml will give you well-formed XML that you could save as a separate document, and
+ // InnerText will immediately give you a pure-text representation of this inner XML.
+ return valueXml.InnerXml;
+ }
+
private void SaveProperties (ExeConfigurationFileMap exeMap, SettingsPropertyValueCollection collection, ConfigurationUserLevel level, SettingsContext context, bool checkUserLevel)
{
Configuration config = ConfigurationManager.OpenMappedExeConfiguration (exeMap, level);
@@ -623,7 +651,7 @@ namespace System.Configuration
element.Value.ValueXml = new XmlDocument ().CreateElement ("value");
switch (value.Property.SerializeAs) {
case SettingsSerializeAs.Xml:
- element.Value.ValueXml.InnerXml = (value.SerializedValue as string) ?? string.Empty;
+ element.Value.ValueXml.InnerXml = StripXmlHeader(value.SerializedValue as string);
break;
case SettingsSerializeAs.String:
element.Value.ValueXml.InnerText = value.SerializedValue as string;

@ -0,0 +1,116 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
AUTOTOOLS_AUTORECONF=1
inherit eutils linux-info mono-env flag-o-matic pax-utils autotools-utils versionator
DESCRIPTION="Mono runtime and class libraries, a C# compiler/interpreter"
HOMEPAGE="http://www.mono-project.com/Main_Page"
SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
LICENSE="MIT LGPL-2.1 GPL-2 BSD-4 NPL-1.1 Ms-PL GPL-2-with-linking-exception IDPL"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="nls minimal pax_kernel xen doc"
COMMONDEPEND="
!minimal? ( >=dev-dotnet/libgdiplus-2.10 )
ia64? ( sys-libs/libunwind )
nls? ( sys-devel/gettext )
"
RDEPEND="${COMMONDEPEND}
|| ( www-client/links www-client/lynx )
"
DEPEND="${COMMONDEPEND}
sys-devel/bc
virtual/yacc
pax_kernel? ( sys-apps/elfix )
!dev-lang/mono-basic
"
MAKEOPTS="${MAKEOPTS} -j1" #nowarn
S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
pkg_pretend() {
# If CONFIG_SYSVIPC is not set in your kernel .config, mono will hang while compiling.
# See http://bugs.gentoo.org/261869 for more info."
CONFIG_CHECK="SYSVIPC"
use kernel_linux && check_extra_config
}
pkg_setup() {
linux-info_pkg_setup
mono-env_pkg_setup
}
src_prepare() {
# we need to sed in the paxctl-ng -mr in the runtime/mono-wrapper.in so it don't
# get killed in the build proces when MPROTECT is enable. #286280
# RANDMMAP kill the build proces to #347365
# use paxmark.sh to get PT/XT logic #532244
if use pax_kernel ; then
ewarn "We are disabling MPROTECT on the mono binary."
# issue 9 : https://github.com/Heather/gentoo-dotnet/issues/9
sed '/exec "/ i\paxmark.sh -mr "$r/@mono_runtime@"' -i "${S}"/runtime/mono-wrapper.in || die "Failed to sed mono-wrapper.in"
fi
# mono build system can fail otherwise
strip-flags
# Fix VB targets
# http://osdir.com/ml/general/2015-05/msg20808.html
epatch "${FILESDIR}/add_missing_vb_portable_targets.patch"
# Fix build when sgen disabled
# https://bugzilla.xamarin.com/show_bug.cgi?id=32015
epatch "${FILESDIR}/${PN}-4.0.2.5-fix-mono-dis-makefile-am-when-without-sgen.patch"
# Fix atomic_add_i4 support for 32-bit ppc
# https://github.com/mono/mono/compare/f967c79926900343f399c75624deedaba460e544^...8f379f0c8f98493180b508b9e68b9aa76c0c5bdf
epatch "${FILESDIR}/${PN}-4.0.2.5-fix-ppc-atomic-add-i4.patch"
epatch "${FILESDIR}/systemweb3.patch"
epatch "${FILESDIR}/fix-for-GitExtensions-issue-2710-another-resolution.patch"
epatch "${FILESDIR}/fix-for-bug36724.patch"
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
--disable-silent-rules
$(use_with xen xen_opt)
--without-ikvm-native
--disable-dtrace
$(use_with doc mcs-docs)
$(use_enable nls)
)
autotools-utils_src_configure
}
src_compile() {
autotools-utils_src_compile
}
src_test() {
cd mcs/tests || die
emake check
}
src_install() {
autotools-utils_src_install
# Remove files not respecting LDFLAGS and that we are not supposed to provide, see Fedora
# mono.spec and http://www.mail-archive.com/mono-devel-list@lists.ximian.com/msg24870.html
# for reference.
rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mscorlib.dll.so || die
rm -f "${ED}"/usr/lib/mono/{2.0,4.5}/mcs.exe.so || die
}

@ -12,7 +12,7 @@ SRC_URI="http://www.bastoul.net/cloog/pages/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0/4"
KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]

@ -45,9 +45,9 @@ RDEPEND="
fontconfig? ( media-libs/fontconfig )
fribidi? ( dev-libs/fribidi )
gif? ( media-libs/giflib )
glib? ( dev-libs/glib )
glib? ( dev-libs/glib:2= )
gnutls? ( net-libs/gnutls )
!gnutls? ( ssl? ( dev-libs/openssl ) )
!gnutls? ( ssl? ( dev-libs/openssl:0= ) )
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
@ -56,7 +56,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
oldlua? ( dev-lang/lua )
oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@ -68,7 +68,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
tiff? ( media-libs/tiff )
tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
wayland? (
>=dev-libs/wayland-1.3.0
@ -108,7 +108,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
virtual/jpeg
virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus

@ -50,7 +50,7 @@ RDEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
ssl? (
!libressl? ( dev-libs/openssl:0 )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)
@ -62,7 +62,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
oldlua? ( dev-lang/lua )
oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@ -74,7 +74,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
tiff? ( media-libs/tiff:0 )
tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
valgrind? ( dev-util/valgrind )
wayland? (
@ -115,7 +115,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
virtual/jpeg
virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus

@ -50,7 +50,7 @@ RDEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
ssl? (
!libressl? ( dev-libs/openssl:0 )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)
@ -62,7 +62,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
oldlua? ( dev-lang/lua )
oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@ -74,7 +74,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
tiff? ( media-libs/tiff:0 )
tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
valgrind? ( dev-util/valgrind )
wayland? (
@ -115,7 +115,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
virtual/jpeg
virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus

@ -50,7 +50,7 @@ RDEPEND="
gnutls? ( net-libs/gnutls )
!gnutls? (
ssl? (
!libressl? ( dev-libs/openssl:0 )
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl )
)
)
@ -62,7 +62,7 @@ RDEPEND="
ibus? ( app-i18n/ibus )
jpeg2k? ( media-libs/openjpeg:0 )
!oldlua? ( >=dev-lang/luajit-2.0.0 )
oldlua? ( dev-lang/lua )
oldlua? ( dev-lang/lua:* )
physics? ( >=sci-physics/bullet-2.80 )
pixman? ( x11-libs/pixman )
png? ( media-libs/libpng:0= )
@ -74,7 +74,7 @@ RDEPEND="
)
sound? ( media-libs/libsndfile )
systemd? ( sys-apps/systemd )
tiff? ( media-libs/tiff:0 )
tiff? ( media-libs/tiff:0= )
tslib? ( x11-libs/tslib )
valgrind? ( dev-util/valgrind )
wayland? (
@ -115,7 +115,7 @@ RDEPEND="
sys-apps/dbus
>=sys-apps/util-linux-2.20.0
sys-libs/zlib
virtual/jpeg
virtual/jpeg:0=
!dev-libs/ecore
!dev-libs/edbus
@ -168,9 +168,11 @@ src_prepare() {
# Remove stupid sleep command.
# Also back out gnu make hack that causes regen of Makefiles.
# Delete var setting that causes the build to abort.
sed -i \
-e '/sleep 10/d' \
-e '/^#### Work around bug in automake check macro$/,/^#### Info$/d' \
-e '/BARF_OK=/s:=.*:=:' \
configure || die
}
@ -191,7 +193,7 @@ src_configure() {
$(use_with X x)
--with-opengl=$(usex opengl full $(usex gles es none))
--with-glib=$(usex glib)
--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
$(use_enable bmp image-loader-bmp)
$(use_enable bmp image-loader-wbmp)

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>enlightenment</herd>
<use>
<flag name="bmp">Enable WBMP image loader.</flag>
<flag name="drm">Enable DRM engine.</flag>
<flag name="eet">Enable Eet image loader.</flag>
<flag name="egl">Enable EGL rendering.</flag>
<flag name="fribidi">Enable bidirectional text support.</flag>
<flag name="gles">Enable the OpenGL ES GL implementation.</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support.</flag>
<flag name="harfbuzz">Enable complex text shaping and layout support.</flag>
<flag name="ibus">Enable Intelligent Input Bus.</flag>
<flag name="ico">Enable Ico image loader.</flag>
<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
<flag name="physics">Enable Bullet physics effects and support.</flag>
<flag name="pixman">Enable PixMan for software rendering.</flag>
<flag name="ppm">Enable PMAPS image loader.</flag>
<flag name="psd">Enable PSD image loader.</flag>
<flag name="scim">Enable Smart Common Input Method.</flag>
<flag name="tga">Enable Tga image loader.</flag>
<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events.</flag>
<flag name="v4l2">Enable Video4Linux2 support.</flag>
<flag name='valgrind'>Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
<flag name="webp">Enable WebP image loader.</flag>
<flag name="xim">Enable X Input Method.</flag>
</use>
<herd>enlightenment</herd>
<use>
<flag name="bmp">Enable WBMP image loader.</flag>
<flag name="drm">Enable DRM engine.</flag>
<flag name="eet">Enable Eet image loader.</flag>
<flag name="egl">Enable EGL rendering.</flag>
<flag name="fribidi">Enable bidirectional text support.</flag>
<flag name="gles">Enable the OpenGL ES GL implementation.</flag>
<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support.</flag>
<flag name="harfbuzz">Enable complex text shaping and layout support.</flag>
<flag name="ibus">Enable Intelligent Input Bus.</flag>
<flag name="ico">Enable Ico image loader.</flag>
<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
<flag name="physics">Enable Bullet physics effects and support.</flag>
<flag name="pixman">Enable PixMan for software rendering.</flag>
<flag name="ppm">Enable PMAPS image loader.</flag>
<flag name="psd">Enable PSD image loader.</flag>
<flag name="scim">Enable Smart Common Input Method.</flag>
<flag name="tga">Enable Tga image loader.</flag>
<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events.</flag>
<flag name="v4l2">Enable Video4Linux2 support.</flag>
<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
<flag name="webp">Enable WebP image loader.</flag>
<flag name="xim">Enable X Input Method.</flag>
</use>
</pkgmetadata>

@ -12,7 +12,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0/10"
KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="static-libs"
RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"

@ -12,7 +12,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/3"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="blas"
RDEPEND="

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Communicate with the i3 window manager"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Provides a uniform interface to various event loops"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-solaris"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-solaris"
IUSE=""
SRC_TEST="do"

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Execute code after a scope finished compilation"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-macos"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x64-macos"
IUSE="test"
RDEPEND="

@ -1,22 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=ETHER
MODULE_VERSION=0.13
inherit perl-module
DESCRIPTION="Interface to perls parser variables"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="dev-perl/B-Hooks-OP-Check"
DEPEND="${RDEPEND}
>=dev-perl/ExtUtils-Depends-0.302
test? ( dev-perl/Test-Exception
dev-perl/B-Hooks-EndOfScope )"
SRC_TEST=do

@ -1,2 +1 @@
DIST B-Hooks-Parser-0.13.tar.gz 83951 SHA256 f6c838e59f52e21ccc0b2c9d85d6f7ba33119098ad3a261698b01690c2619646 SHA512 f1729830350d25f5decc4b08be23591920683d86d910bec99b478e58905dee6cc384af305b665a8a90dc48b9b819df6cbc975cf606b495448d25d00e3357a149 WHIRLPOOL d6505cbb95834b0a6084af24ba4f1ba96704016cf0180a79e479036d98567c29fbc42f60b91e5c72068e5403dc581d56c5b0493e173965ee571f9ce442094725
DIST B-Hooks-Parser-0.16.tar.gz 84593 SHA256 24e65268da41976fe3055091554848f6ef6eedd0c5c1a708b0fca5fe10cabab6 SHA512 5079b7233b5d69c4347cace3131e736c973d6c63daf063b39338d2b91dd44880fbfb255b9e9aac291ec0614e747115d14c2b7e13425336b97352ee1a41a10a2a WHIRLPOOL 9c53d5621b1648ef3636282cf51cc23b619fc4ece408a29e4980789fbf053642d89c98ae319c17a8217789727a6239e99d5be2fd05f04fa5861cecccd7d7bd83

@ -13,7 +13,7 @@ DESCRIPTION="Lists of reserved barewords and symbol names"
# GPL-2 - no later clause
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SRC_TEST="do"

@ -0,0 +1,19 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=RURBAN
DIST_VERSION=1.15
inherit perl-module
DESCRIPTION="Lists of reserved barewords and symbol names"
# GPL-2 - no later clause
LICENSE="|| ( Artistic GPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"

@ -1,2 +1,3 @@
DIST B-Keywords-1.13.tar.gz 9739 SHA256 073eb916f69bd337261de6cb6cab8ccdb06f67415d8c7291453ebdfdfe0be405 SHA512 6176dbe7ff25a7d355a03d887b6ec52e49c6bce634c3aa8dd5a7126201ac11e9f8ee6c78f7cacc353a5a83dea688646d25d675570fdba80d160abb45248eb08b WHIRLPOOL ffb6275127dcd468df89221c6b7c18cb41ef69d1c28615505d6f633e0f1c38e7cc42d7ad772f0e0cdcbf9de4efff3363b62ccdd280852202395ffde43066cb62
DIST B-Keywords-1.14.tar.gz 9981 SHA256 9c1662abbd573b408fdd13513e5cad7ef8fba28479d75e8dd33484633ac48ad2 SHA512 62e10e0f22fdce9855d7f4e1e96c8a2063a220d663ddc5ba0cb1a2e1b398b4f3a9d765dbc122797a66475535b5b6addf8eb655c8b27428355bc00e598930a5c4 WHIRLPOOL e8ca6175615955f144456187f88f02b12e858f4a756337b5b2e824c8b486b14b9f86c19b8b57eab31433531cb3ffca9681f369b55d5fe8374e01cc1ad3a14d58
DIST B-Keywords-1.15.tar.gz 10140 SHA256 65d2ef8e3cf4a37fbf2da07e6caa1da15e33a155e349e5b9a5c978d02abd0dda SHA512 41d06de68d010095efd643153db10fb6c3cf33e320d576f76b9b60b2a96d1f0ad9da41741b4e57a3c78c8516197b81a5a6110cc6a49ee4ddf1b33085d7bcd913 WHIRLPOOL b3fa473bb2937995e031e15e6be769dfdcb2d2e13cb87910772cbc749e6995d2b3ea025d078809ee31e5968e816f496c9ca903fab138f6f2c5b84668fc0e6e80

@ -1,23 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=FLORA
MODULE_VERSION=0.29
inherit perl-module
DESCRIPTION="PL_check hacks using Perl callbacks"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-perl/B-Utils-0.250.0
dev-perl/Scope-Guard"
DEPEND="${RDEPEND}
>=dev-perl/ExtUtils-Depends-0.302"
PATCHES=( "${FILESDIR}"/0.29-Perl_check_t.patch )
SRC_TEST=do

@ -1,2 +1 @@
DIST B-OPCheck-0.29.tar.gz 61578 SHA256 8a1d07ed51d5c867dbecd9e81d50a43470eb2aff2d144cd2b16ef2c33e9e20eb SHA512 4b9afb0e3acbf654a4393ec55814747f382cc0385d9b9d0d9f34a42ec0ce76009b169352238e7aa37bee7b699bce3e967e320f81bfc293b73c62ddf573cf630c WHIRLPOOL fb2ec13301b7b646158b61f4f63b225b66cb5e109b3c1d07995fd4bee618deebda2707c078c3e2a3d70da5f7e7e8c49dff223c5559bc84990486d2a4d5e391bf
DIST B-OPCheck-0.30.tar.gz 74668 SHA256 3a01bb406543cd204453322647fa48fcad2ecd9d5cc689154dfad71a441ad1bd SHA512 09aac95626c2594a1833682b6e1d5fc3f631570ceb0f1773c9d3c3c8a2aff57a903d5d24a51aa117cb8027d9c201153f790546300272c2a0748320f4f49274fc WHIRLPOOL 8aa8b69c367765a5df8d92d59f8a1bae3ab382933d7836adc9080f2dc060097028dec7a1439d0b97e283d825b012cd907c3cb679bce6645ea2a06d3e3e71ae96

@ -1,30 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=ETHER
MODULE_VERSION=0.26
inherit perl-module
DESCRIPTION="Helper functions for op tree manipulation"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="test"
RDEPEND="
virtual/perl-Exporter
virtual/perl-Scalar-List-Utils
dev-perl/Task-Weaken
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-CBuilder
>=dev-perl/ExtUtils-Depends-0.301.0
test? (
virtual/perl-Test-Simple
)
"
SRC_TEST=do

@ -1,2 +1 @@
DIST B-Utils-0.26.tar.gz 73325 SHA256 15f9143bb86893813f5acdbe01deb84bafd45e725b536e15984fefc9f64c97e0 SHA512 14fb9f3b1ba95181c5e57368350fec60e5933e813278d522fec122f0888fe4bd84ca75a798722cefee07e3f7cb2ffec1cd0535d956bc7f0ef26504f9a65200d9 WHIRLPOOL a217fa2491fb2de6a485f527f8cc012ff5d666b4ec402ca87e66ea651db812059b0f682d37afea82b69ae67b9ad43fb629122eecfa462b903b5fbc1499f6086b
DIST B-Utils-0.27.tar.gz 74612 SHA256 f97f53f6a3050109aa414feeb184cad101812d41760e952b5d84993f6685ffea SHA512 a896476f59a424fa9062c5dfe6431493c020e51746fa7f7b4c7fcdb109d1c0fa252292b891263d676884f064db95f16958a5d2ed5981dc5997436dced6579e74 WHIRLPOOL 86ebdf04f8e659f21a2e546412313e8287e41ba9b93beb2e2658d20736b92bd72c82804c16464a6f3f5e987404ca8560fcd2521b3a926c9386f3cdc8f410aee6

@ -1,28 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=DCOPPIT
MODULE_VERSION=0.7106
inherit perl-module
DESCRIPTION="Perl code benchmarking tool"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
dev-perl/Statistics-TTest
virtual/perl-Time-HiRes
"
DEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.360.0
test? ( virtual/perl-Test-Simple )
"
SRC_TEST=do

@ -1,2 +1 @@
DIST Benchmark-Timer-0.7106.tar.gz 45648 SHA256 f4a2d6103197418b488ff85ca2272dc6a7f4b5f642921d7cebab48311d871cea SHA512 89fbf2695886a08efdbedd5cf85fe65dcf61ef422a747fe947950404cc0a7e7bdb7362b69253ee787166803eb56842966362d29ecb6e7001c32cebbaf28e5ee8 WHIRLPOOL c49ecf13566f2ebade1c8521d43db44dc9e69d19f78c1a1cb9be0f4ca05a6c40a20433200c80dd2ede41f7c5766b5a03ac2cdc3ba99c7ec5103285e1108b127d
DIST Benchmark-Timer-0.7107.tar.gz 45734 SHA256 64f70fabc896236520bfbf43c2683fdcb0f2c637d77333aed0fd926b92226b60 SHA512 6faa50a90173a075a4bb398212e2db77348f59a47ff483db9e1885dc7dce9636557684574a21f228c53f0c29a468e663706843840b2e59abbaaed1222f400e05 WHIRLPOOL 8f09e9687a42f82b4bccd47aca76ab10d8d406c27be4fb5224e188a55c24235067702e4e19a97677982771b46aa101abf5fe64779148f97c4afca34cb8f0552f

@ -17,7 +17,7 @@ IUSE="test"
# Install DB_File if you want older support. BerkleyDB no longer
# supports less than 2.0.
RDEPEND=">=sys-libs/db-2.0"
RDEPEND=">=sys-libs/db-2.0:*"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? ( dev-perl/Test-Pod )"

@ -1 +0,0 @@
DIST Parse-CPAN-Meta-1.4417.tar.gz 24808 SHA256 dd1df72c80390551563159f18f81a26baabeda8d4b0e94df7f1c223391967121 SHA512 2a7ac80bac66f9381149d1666345b92f3203c712a0ae1adefcac717069edf08e4d3f9b59b818400fe40b4aaf612c7c9244488d5459c536f51352f3c972d7b446 WHIRLPOOL cc0bef6ae59283db523825db1b5e060fb31b44c6c4e5d32ce7cdf2847d16f4bcac67ca5fc4b86f6c884f6d00e7c537e79330dadf95873cb88a6faf5a063e85a8

@ -1,24 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=DAGOLDEN
MODULE_VERSION=1.4417
inherit perl-module
DESCRIPTION="Parse META.yml and META.json CPAN metadata files"
SLOT="0"
KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND=""
DEPEND="${RDEPEND}
test? (
virtual/perl-File-Spec
)
"
SRC_TEST="do"

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>perl</herd>
<maintainer>
<email>monsieurp@gentoo.org</email>
</maintainer>
<upstream>
<remote-id type="cpan">Parse-CPAN-Meta</remote-id>
<remote-id type="cpan-module">Parse::CPAN::Meta</remote-id>
</upstream>
</pkgmetadata>

@ -20,6 +20,7 @@ IUSE=""
PATCHES=(
"${FILESDIR}"/${P}-unbundle.patch
"${FILESDIR}"/${P}-online.patch
)
python_prepare_all() {
@ -29,20 +30,24 @@ python_prepare_all() {
tests/test_shutil.py* \
tests/test_sysconfig.py* || die
distutils-r1_python_prepare_all
# Broken tests
# 1 fails due to it being sensitive to dictionary ordering
# inconsistency between code and test
sed \
-e 's:test_dependency_finder:_&:g' \
-e 's:test_abi:_&:g' \
-i tests/*py || die
distutils-r1_python_prepare_all
# Gentoo still doesn't report correct ABI
sed \
-e 's:test_abi:_&:g' \
-i tests/*py || die
}
python_test() {
sed \
-e '/PIP_AVAILABLE/s:True:False:g' \
-i tests/*py || die
PYTHONHASHSEED=0 esetup.py test
SKIP_ONLINE=True PYTHONHASHSEED=0 esetup.py test
}

@ -0,0 +1,113 @@
tests/test_index.py | 1 +
tests/test_locators.py | 10 ++++++++++
tests/test_util.py | 1 +
3 files changed, 12 insertions(+)
diff --git a/tests/test_index.py b/tests/test_index.py
index a188816..dbef670 100644
--- a/tests/test_index.py
+++ b/tests/test_index.py
@@ -290,6 +290,7 @@ class PackageIndexTestCase(unittest.TestCase):
self.assertRaises(DistlibException, self.index.download_file, url, fn,
digest[:-1] + '8')
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_search(self):
self.index = PackageIndex()
result = self.index.search({'name': 'tatterdema'})
diff --git a/tests/test_locators.py b/tests/test_locators.py
index de97541..436ea9d 100644
--- a/tests/test_locators.py
+++ b/tests/test_locators.py
@@ -29,6 +29,7 @@ PYPI_WEB_HOST = os.environ.get('PYPI_WEB_HOST', 'https://pypi.python.org/simple/
class LocatorTestCase(unittest.TestCase):
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_xmlrpc(self):
locator = PyPIRPCLocator(PYPI_RPC_HOST)
try:
@@ -53,6 +54,7 @@ class LocatorTestCase(unittest.TestCase):
self.assertGreater(len(names), 25000)
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_json(self):
locator = PyPIJSONLocator(PYPI_RPC_HOST)
result = locator.get_project('sarge')
@@ -69,6 +71,7 @@ class LocatorTestCase(unittest.TestCase):
self.assertRaises(NotImplementedError, locator.get_distribution_names)
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_scraper(self):
locator = SimpleScrapingLocator('https://pypi.python.org/simple/')
for name in ('sarge', 'Sarge'):
@@ -88,6 +91,7 @@ class LocatorTestCase(unittest.TestCase):
self.assertGreater(len(names), 25000)
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_unicode_project_name(self):
# Just checking to see that no exceptions are raised.
NAME = '\u2603'
@@ -166,6 +170,7 @@ class LocatorTestCase(unittest.TestCase):
sys.path.pop(0)
@unittest.skipIf('SKIP_SLOW' in os.environ, 'Skipping slow test')
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_aggregation(self):
d = os.path.join(HERE, 'fake_archives')
loc1 = DirectoryLocator(d)
@@ -201,6 +206,7 @@ class LocatorTestCase(unittest.TestCase):
n2 = loc2.get_distribution_names()
self.assertEqual(locator.get_distribution_names(), n1 | n2)
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_dependency_finder(self):
locator = AggregatingLocator(
JSONLocator(),
@@ -280,6 +286,7 @@ class LocatorTestCase(unittest.TestCase):
for url1, url2 in cases:
self.assertEqual(default_locator.prefer_url(url1, url2), url1)
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_prereleases(self):
locator = AggregatingLocator(
JSONLocator(),
@@ -308,6 +315,7 @@ class LocatorTestCase(unittest.TestCase):
self.assertEqual(dists, set([actual[0], dist]))
self.assertFalse(problems)
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_dist_reqts(self):
r = 'config (<=0.3.5)'
dist = default_locator.locate(r)
@@ -316,6 +324,7 @@ class LocatorTestCase(unittest.TestCase):
self.assertTrue(dist.matches_requirement(r))
self.assertFalse(dist.matches_requirement('config (0.3.6)'))
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_dist_reqts_extras(self):
r = 'config[doc,test](<=0.3.5)'
dist = default_locator.locate(r)
@@ -323,6 +332,7 @@ class LocatorTestCase(unittest.TestCase):
self.assertTrue(dist.matches_requirement(r))
self.assertEqual(dist.extras, ['doc', 'test'])
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_all(self):
d = default_locator.get_project('setuptools')
self.assertTrue('urls' in d)
diff --git a/tests/test_util.py b/tests/test_util.py
index 1b615d7..2908eee 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -461,6 +461,7 @@ class UtilTestCase(unittest.TestCase):
self.assertFalse(is_string_sequence(['a', 'b', None]))
self.assertRaises(AssertionError, is_string_sequence, [])
+ @unittest.skipIf('SKIP_ONLINE' in os.environ, 'Skipping online tests')
def test_package_data(self):
data = get_package_data(name='config', version='0.3.6')
self.assertTrue(data)

@ -0,0 +1,35 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit distutils-r1
DESCRIPTION="More routines for operating on iterables, beyond itertools"
HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
python_compile_all() {
use doc && emake -C docs html
}
python_test() {
nosetests -w "${BUILD_DIR}" more_itertools --with-doctest \
|| die "tests fail with ${EPYTHON}"
}
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/html/. )
distutils-r1_python_install_all
}

@ -58,10 +58,10 @@ python_install_all() {
COMPLETION="${T}"/completion.tmp
"${PYTHON}" pip/__init__.py completion --bash > "${COMPLETION}" || die
"${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die
newbashcomp "${COMPLETION}" ${PN}
"${PYTHON}" pip/__init__.py completion --zsh > "${COMPLETION}" || die
"${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die
insinto /usr/share/zsh/site-functions
newins "${COMPLETION}" _pip
}

@ -6,3 +6,4 @@ DIST setuptools-18.7.tar.gz 628702 SHA256 c57c1f5aa3b83e4c5e0ce5b144a7f96eea1dab
DIST setuptools-18.8.1.tar.gz 629889 SHA256 ac472c7c4752e8cd44d646fcb4f15d13e72a4ae20e4d853c61adba3b9cabe1d5 SHA512 4ebb36cb54a1c581e3b06ce224fdd97211da9b93962eeae0151b064ac107244dab9111dd1441e76997275f9c559dca2cf0c480544f526c8643bf21beda30bf14 WHIRLPOOL a82fba00a874de1b1cc832f062ed27dae17d34e2782a6353ad980884f6b839990acf3f8f1b00066e14ddc96b3ea35e9dc2ed27cda52ef792f6227db03283cf82
DIST setuptools-18.8.tar.gz 629367 SHA256 04180e33a40a114ff9b458f31786d885964612af2b2111c3d0efdc9a1ac76c4d SHA512 718f8ef19e639450f62e1751715bac65ce2bd218b81614d07c9283a01be3a085ec5422ff9d96a54e74c05135a1a4bb167ece6d4ecece588716d05982c9f25811 WHIRLPOOL 412545b8b2625675612c9d79b366c7b5287e0f6f48596a49fdbd1b358a4efefcd4cbf8993ff42ad7d7f14868fc86e5136c7af650dfe954ab015060ea57268523
DIST setuptools-19.1.1.tar.gz 640997 SHA256 32ebb08b72aee11fefa6907ddf5db5a81e0eef9cf62c7fa6b58d8e32da249960 SHA512 480aaed577ab9bc4d3cae71d957407ecb71e743dab7fb06f165b76683445f356ce141e1057b5a057101f9546df8c62e2abc2c35ebd751e4bb3febb846a71ac41 WHIRLPOOL 608af5cb22e9b87de3cb0181519058cc7437b7e74b7be4774337d18a562e869cb361edf17f0488c2594039e87dcdc1f201723520568490b0e0be105992abeb37
DIST setuptools-19.2.tar.gz 641777 SHA256 f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a SHA512 2494606930d6d422e8c105e8e5b40a07b23709f361164c5df40ff24c80328b861179652c7212fa38137534206c187bc4de42d249bc686d43fad18f23d0a26126 WHIRLPOOL ee861dc97a48ec7a07eadc3ceb42077b396a14c1448f0c3d8c6edf2266f4da241bb0e9f31922bc687b6e943802b95b440aea9f2e5d60b8d338c8392102353100

@ -0,0 +1,54 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Collection of extensions to Distutils"
HOMEPAGE="https://pypi.python.org/pypi/setuptools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? (
>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)
"
PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]"
# Force in-source build because build system modifies sources.
DISTUTILS_IN_SOURCE_BUILD=1
DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
python_prepare_all() {
rm -r ./pkg_resources/_vendor || die
# disable tests requiring a network connection
rm setuptools/tests/test_packageindex.py || die
# don't run integration tests
rm setuptools/tests/test_integration.py || die
distutils-r1_python_prepare_all
}
python_test() {
# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
# It tries to sandbox the test in a tempdir
HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}"
}
python_install() {
export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
distutils-r1_python_install
}

@ -26,16 +26,6 @@ PATCHES=(
"${FILESDIR}"/1.9.0-mapping.patch
)
pkg_setup() {
six_dir_check() {
local dir="${ROOT%/}$(python_get_sitedir)"/six
if [[ -d "${dir}" ]]; then
die "${PN} doesn't work if ${dir} is a directory #546730"
fi
}
python_foreach_impl six_dir_check
}
python_prepare_all() {
# https://bitbucket.org/gutworth/six/issues/139/
sed \

@ -1 +1,2 @@
DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1

@ -0,0 +1,46 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_TASK_TEST="test features"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
RUBY_FAKEGEM_EXTRAINSTALL="data"
inherit ruby-fakegem
DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RUBY_PATCHES=( ${P}-slim-options.patch )
ruby_add_bdepend "test? (
dev-util/cucumber
dev-ruby/rspec-expectations:*
dev-ruby/asciimath
dev-ruby/coderay
dev-ruby/erubis
dev-ruby/haml
dev-ruby/nokogiri
dev-ruby/slim
dev-ruby/tilt )"
all_ruby_prepare() {
rm Gemfile || die
}
all_ruby_install() {
all_fakegem_install
doman man/asciidoctor.1
}

@ -0,0 +1,31 @@
From 04b9d6153d1e289bd450a2f52bffde754ef4d1b0 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro <terceiro@softwarelivre.org>
Date: Tue, 17 Nov 2015 11:17:16 -0200
Subject: [PATCH] Initialize slim-related attributes regardless of when slim
was loaded
Setting instance attributes of the Template class cannot depend on
whether slim has been loaded before or not.
---
lib/asciidoctor/converter/template.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/asciidoctor/converter/template.rb b/lib/asciidoctor/converter/template.rb
index 10eaa99..43be87b 100644
--- a/lib/asciidoctor/converter/template.rb
+++ b/lib/asciidoctor/converter/template.rb
@@ -253,10 +253,10 @@ def scan_dir template_dir, pattern, template_cache = nil
unless defined? ::Slim
# slim doesn't get loaded by Tilt, so we have to load it explicitly
Helpers.require_library 'slim'
- if @safe && ::Slim::VERSION >= '3.0'
- slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
- slim_asciidoc_opts[:safe] ||= @safe
- end
+ end
+ if @safe && ::Slim::VERSION >= '3.0'
+ slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
+ slim_asciidoc_opts[:safe] ||= @safe
end
# load include plugin when using Slim >= 2.1
require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'

@ -0,0 +1 @@
DIST asciimath-1.0.2.gem 13824 SHA256 d3c4485b6f32a61732d007337f74f6242d02ff572873b44bdbc1110cac9cfc37 SHA512 109995b8c67dc159671a1498f4507d926bdb10bb6c3a84552137fc84aa3477a237aa6c739de3011981f6815cd70fd9a0dc4ce47e172ab24d02a55f80ada0af46 WHIRLPOOL b83b33b31d059e0615f7eb84cc27540f1daa342b53f21e0ba57b7743a8914a73acf1a4f01225c3f5670776a4bc558deb11a24d19659fe603a8a4873d4bd86bf2

@ -0,0 +1,25 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
HOMEPAGE="https://github.com/pepijnve/asciimath"
LICENSE="MIT"
SLOT="1"
KEYWORDS="~amd64"
IUSE=""
each_ruby_test() {
RSPEC_VERSION=3 ruby-ng_rspec test
}

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>ruby</herd>
<upstream>
<remote-id type="github">pepijnve/asciimath</remote-id>
</upstream>
</pkgmetadata>

@ -2,3 +2,4 @@ DIST rebar-2.3.1.tar.gz 147014 SHA256 dddb3c13a3a875dd91c368e3294619ab377cfc88bc
DIST rebar-2.4.0.tar.gz 152328 SHA256 43ae0d9c1439d935086db349c5b6a8646707f5538720167b2bbcc1ad32516b6a SHA512 dda9915d8b8b2408d65156f5af8387858ad19ed4b29b99d3e5d8f9131ea6b76a218b99520d4f9501c0b698b11216076e779ccebba16b6c1ccdae13d333b4dae7 WHIRLPOOL b573a83b823ef451901fd334f54bf49f1ac6c87a647a012fc2540fc850324988427ed9f3dee0d7a7bc0927667d4f6928cd6c4feb6dfb82c9204a3c11fc42988e
DIST rebar-2.5.0.tar.gz 152390 SHA256 d585fa4c7f59c66017d2552764bb423abeed3a3c99503be91b41fb931245ccbe SHA512 6fbb15d6c2bd3f4f7f83c35f4f8fa9d6dafc6bc9a739ac5e002a046d34d9da4216d64c5ea59b73a1b54cb11b9de32d0618f821912c26e63b8bbfdea9bd08f1fa WHIRLPOOL 712be4b52959230217a1a25e3f618db983626a0e06d0260afed3fe2ab319affc111a2beedc401d844663132f097b9a65591c217109e0fd777caf0d22d333a410
DIST rebar-2.5.1.tar.gz 154486 SHA256 86cb849a0d2b8275dcfdbc9a2b0a374d21c7eaa73312d74f0ab83cc0ab062bf9 SHA512 4617397d415f222ad0245ae2b55619c5418f049851aa953908778e9a96a9f0dfc57803ba08ebb757cd62a6bddce064fe73b2a33df25a8cc44183188d73e4938a WHIRLPOOL 403786ef632b69b991d5c3b52954e20bfd1adcecaa60627aaa2611a5f7c82b38ce898108afe9abba9e83eb21bd92d59dce08498af5e5fc3488d0a1bb990313e0
DIST rebar-2.6.0.tar.gz 186357 SHA256 9f30ea5ab9da8638273cb55b49780e58fed1f4aa8623b835bcdd983bb451f7a7 SHA512 848a28a40215bc54bbbb1aeb101fb5c3578ce9668212f9f270be05ba268a63cf740ec6ed88e6df962da60a6f6e336c0e1b1e3cca3112c32e3bd8f5b3dd121c41 WHIRLPOOL fa9b8d159db884408ad6c20d2e9d4e1b12ff1ab0aa227b365846892fb5820a7a50e9f014fdc5b7cda0eeb8e8608d607281274f9ff566091f66fc473ab87052bf

@ -0,0 +1,29 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit bash-completion-r1
DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
HOMEPAGE="https://github.com/rebar/rebar"
SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-lang/erlang"
DEPEND="${RDEPEND}"
src_test() {
emake xref
}
src_install() {
dobin rebar
dodoc rebar.config.sample THANKS
dobashcomp priv/shell-completion/bash/${PN}
}

@ -77,13 +77,16 @@ for _f_use in ${FORTRAN_NEEDED}; do
;;
esac
done
unset _f_use
# @FUNCTION: fortran_int64_abi_fflags
# @DESCRIPTION: Return the Fortran compiler flag to enable 64 bit integers for
# @DESCRIPTION:
# Return the Fortran compiler flag to enable 64 bit integers for
# array indices
# @CODE
fortran_int64_abi_fflags() {
debug-print-function ${FUNCNAME} "${@}"
_FC=$(tc-getFC)
if [[ ${_FC} == *gfortran* ]]; then
echo "-fdefault-integer-8"
@ -99,6 +102,8 @@ fortran_int64_abi_fflags() {
# @DESCRIPTION:
# writes fortran test code
_fortran_write_testsuite() {
debug-print-function ${FUNCNAME} "${@}"
local filebase=${T}/test-fortran
# f77 code
@ -125,6 +130,8 @@ _fortran_write_testsuite() {
# Takes fortran compiler as first argument and dialect as second.
# Checks whether the passed fortran compiler speaks the fortran dialect
_fortran_compile_test() {
debug-print-function ${FUNCNAME} "${@}"
local filebase=${T}/test-fortran
local fcomp=${1}
local fdia=${2}
@ -150,6 +157,8 @@ _fortran_compile_test() {
# @DESCRIPTION:
# See if the fortran supports OpenMP.
_fortran-has-openmp() {
debug-print-function ${FUNCNAME} "${@}"
local flag
local filebase=${T}/test-fc-openmp
local fcode=${filebase}.f
@ -177,6 +186,8 @@ _fortran-has-openmp() {
# @DESCRIPTION:
# Detailed description how to handle fortran support
_fortran_die_msg() {
debug-print-function ${FUNCNAME} "${@}"
echo
eerror "Please install currently selected gcc version with USE=fortran."
eerror "If you intend to use a different compiler then gfortran, please"
@ -192,6 +203,8 @@ _fortran_die_msg() {
# Internal test function for working fortran compiler.
# It is called in fortran-2_pkg_setup.
_fortran_test_function() {
debug-print-function ${FUNCNAME} "${@}"
local dialect
: ${F77:=$(tc-getFC)}
@ -256,6 +269,8 @@ _fortran-2_pkg_setup() {
# Setup functionality,
# checks for a valid fortran compiler and optionally for its openmp support.
fortran-2_pkg_setup() {
debug-print-function ${FUNCNAME} "${@}"
case ${EAPI:-0} in
0|1|2|3)
eqawarn "Support for EAPI < 4 will be removed from the"
@ -272,7 +287,7 @@ fortran-2_pkg_setup() {
}
case ${EAPI:-0} in
0|1|2|3|4|5) EXPORT_FUNCTIONS pkg_setup ;;
0|1|2|3|4|5|6) EXPORT_FUNCTIONS pkg_setup ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac

@ -225,7 +225,8 @@ ghc-package-exists() {
}
# @FUNCTION: check-for-collisions
# @DESCRIPTION: makes sure no packages
# @DESCRIPTION:
# makes sure no packages
# have the same version as initial package setup
check-for-collisions() {
local localpkgconf=$1

@ -5,3 +5,4 @@ DIST live.2015.08.07.tar.gz 616595 SHA256 1a27410aea9723e9e0c60850c57b52a08eed32
DIST live.2015.10.12.tar.gz 627366 SHA256 4402a2a803ee31ab1a0a79c85ddee107c8c458295388ea091d9da80689e61c17 SHA512 a282b1f7d8170e8edf13b4d4e632fe26ad74e1efc28a9c4b568c2da28aa72d3a0a7029b3e045f744ba217320fd67182658581d96018969b81bdeffe78c1a89f5 WHIRLPOOL 17cfe5784cfe1227dd12e05112273bdcebea9078d2d699a37be6d172db085efd27860831f46b33f9a65b539b068f438edf0f5b5b2f81a5d3087fe8c17dbe8c52
DIST live.2015.10.29.tar.gz 627327 SHA256 05bb03b58c9a758a735a2c5bb0b993c5e157d7a60b08df49cc29619d02fbc962 SHA512 03d10881e62b12676898e5cd889169d1d7de3640024198f8908c820375233535b9706bd309abbf26f7ad6e957338bf7371b1443f65b2d245d1b06345b5922e75 WHIRLPOOL 14998fe3da4854ab26063a88486e6e81e020c097f59c9a32e17e18184f085c92d8a85e52dbbca0a7fbf1643e657f54c0691e6ca6398ec33ba0e0a6337e733245
DIST live.2015.11.09.tar.gz 617651 SHA256 33dc683aae4cab9dd7cb05ff25ad35ddbd5ff6769f588a910644dced90e64ce8 SHA512 4c96f81a4c9379f7d1e2d63fa8db75bad6fba914862f538a4cb283ce7d7594f450682276ac684aa74b612d646eb05c0729eae48e00709f71215acb706c8a653f WHIRLPOOL c973a49fd0e5ed195dc4747e796a06b25d401792db3f469c8e8393b0407f3cefc3fdcaea2392bc59a7dd8762c99377adb8022f5fa1fd128cd8b62c86f03d2c1b
DIST live.2015.12.22.tar.gz 5644431 SHA256 d0a8a0d13b79a8e34057d4c5c0a65572c2eba4948fcf5548d9d53ce994e14b91 SHA512 e5cec29b769e8c10dcc932c1ed96f88d216a3643b2301d36d8df58b8db9bf823247876f2b4cbccac0fcb61ae098eebff3df3b767b1710e5b8b279ffc3bec4eb1 WHIRLPOOL 46b7f3f5885115d5b7c4b024cd7ce95b1c47a8f7055c2640357f5beb6f1c0d0270a34a176b1ff8e7942394ede41ef2fc486238b1355860b7ee0a5ff3cf481df1

@ -0,0 +1,129 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
HOMEPAGE="http://www.live555.com/"
SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
mirror://gentoo/${P/-/.}.tar.gz"
LICENSE="LGPL-2.1"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="examples static-libs"
DOCS=( "live-shared/README" )
# Alexis Ballier <aballier@gentoo.org>
# Be careful, bump this everytime you bump the package and the ABI has changed.
# If you don't know, ask someone.
LIVE_ABI_VERSION=7
SLOT="0/${LIVE_ABI_VERSION}"
src_unpack() {
unpack ${A}
mkdir -p "${S}"
mv "${WORKDIR}/live" "${S}/" || die
}
src_prepare() {
epatch "${FILESDIR}/${PN}-recursive2.patch"
if use static-libs ; then
cp -pPR live live-shared
mv live live-static
else
mv live live-shared
fi
use static-libs && cp "${FILESDIR}/config.gentoo" live-static
cp "${FILESDIR}/config.gentoo-so-r1" live-shared
case ${CHOST} in
*-solaris*)
use static-libs && { sed -i \
-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
live-static/config.gentoo \
|| die ; }
sed -i \
-e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
live-shared/config.gentoo-so-r1 \
|| die
;;
*-darwin*)
use static-libs && { sed -i \
-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-e '/^LINK /s/$/ /' \
-e '/^LIBRARY_LINK /s/$/ /' \
-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
live-static/config.gentoo \
|| die static ; }
sed -i \
-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-e '/^LINK /s/$/ /' \
-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-e '/^LIB_SUFFIX /s/so/dylib/' \
live-shared/config.gentoo-so-r1 \
|| die shared
;;
esac
multilib_copy_sources
}
src_configure() { :; }
multilib_src_compile() {
tc-export CC CXX LD
if use static-libs ; then
cd "${BUILD_DIR}/live-static"
einfo "Beginning static library build"
./genMakefiles gentoo
emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
fi
cd "${BUILD_DIR}/live-shared"
einfo "Beginning shared library build"
./genMakefiles gentoo-so-r1
local suffix=$(get_libname ${LIVE_ABI_VERSION})
emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
popd > /dev/null
done
if multilib_is_native_abi; then
einfo "Beginning programs build"
for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
cd "${BUILD_DIR}/live-shared/${i}"
emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
done
fi
}
multilib_src_install() {
for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
use static-libs && dolib.a live-static/${library}/lib${library}.a
dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
insinto /usr/include/${library}
doins live-shared/${library}/include/*h
done
if multilib_is_native_abi; then
# Should we really install these?
use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
xargs -0 dobin
dobin live-shared/mediaServer/live555MediaServer
dobin live-shared/proxyServer/live555ProxyServer
fi
}

@ -1,5 +1,2 @@
DIST aegisub-2.1.9.tar.xz 1670496 SHA256 e0591c96183f7713bb14f9d357a2e12bdd3478e4d0a8fad77f14f87a4fc22db7 SHA512 bdb02e3d29db2b7ed165eaf1d541515c15f22199bb209d517089e2c35289b7fc22f6159589004c7f8667a57d26eb7ab6211f9d85ca4bbcd076c5856ac10a3d4f WHIRLPOOL 4ac402e067ff0d863042a8f314c1e55154bacfcc13103772e7c4036b7d927f687b2172003eb51e35469f7af2b640e20f224ff1fa5be83f729eacfaac89c73144
DIST aegisub-3.0.4.tar.xz 4155728 SHA256 7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a SHA512 2917195a61d16578a83ce0b69006dd0269c086c6eff2f622c47d9880697e4e531a7c0c0232c187f9023635c9d3857a1d6a0cee4f6251e49d22e2b625ac5dda7f WHIRLPOOL 60bd3e0374a60f6af62fe450488e8c68e18957283fff59d704f40e192da624bdf90d68c3cea41122e5b9ca440d218c3bd6d9d8091ed5226a2e9d1b9fdc2ce689
DIST aegisub-3.1.2.tar.xz 4126244 SHA256 36ebfd05cc642b050da1e91ce2d2082b317a37bdfab109e191f861170d7cff86 SHA512 d15e16f9f98c01447b72cde1998c915a2bfc1aa918a4380b54303de8e88ef881f46c3896ab9dc5eddaf4f1376f0908abd8427dbf6af395e6e0b3969ddca402ab WHIRLPOOL fa7afa1a3e736a410d686bc14d173518267e4b1570a468d9871334f06af821040fe7f40d6ba3b1bece9350a70dd43613c4aedfe8480629a283c9a16a2f54ab6d
DIST aegisub-3.1.3.tar.xz 4215196 SHA256 efea5bc2bc5e0651ada4f65cfdd8af1b422a15f87933710d11287bf51e2b5e58 SHA512 c406925623e7b8425df47d1cd31ef77d536861335d25c626ecb916ef091341a8156879430f094ffa1d27490a65f79e2edb84593609d589834f3411b2c2841297 WHIRLPOOL 12e40c2ce78e1659046d093d7d34b68b7ceda2744c36be0e15a71a379cc3ced4fb8cde2c364bbd3b7efa803f78229794d5d417c601ae140d79e0c0a9a2711fb0
DIST aegisub-3.2.2.tar.xz 5252052 SHA256 c55e33945b82d8513c02ea6e782f0d72c726adcd3707e95b8c0022f6151e6885 SHA512 54f825e52f238fef8d5cc31c37436e21355aee27883347f905271e5d2a8ff2a77e1b67d5aef38b0f8468bd0bad851fe944e02de27ec96310b902fbe5b1086722 WHIRLPOOL fe948edbb01f11385e14d1912b73942605df18325fcd95f4284a3c2edb73778d90d73038ac4a062e211fd56879590040e3c558fe1e361ec9fe2eee6a5c016448

@ -1,61 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
WX_GTK_VER="2.8"
inherit autotools wxwidgets
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
SRC_URI="https://rion-overlay.googlecode.com/files/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="alsa debug +ffmpeg lua nls openal oss portaudio pulseaudio spell"
RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
virtual/opengl
virtual/glu
>=media-libs/libass-0.9.11[fontconfig]
virtual/libiconv
>=media-libs/fontconfig-2.4.2
media-libs/freetype:2
alsa? ( media-libs/alsa-lib )
portaudio? ( =media-libs/portaudio-19* )
pulseaudio? ( media-sound/pulseaudio )
openal? ( media-libs/openal )
lua? ( >=dev-lang/lua-5.1.1 )
spell? ( >=app-text/hunspell-1.2 )
ffmpeg? ( >=media-libs/ffmpegsource-2.17 )
"
DEPEND="${RDEPEND}
dev-util/intltool
virtual/pkgconfig
media-gfx/imagemagick
"
src_prepare() {
sh autogen.sh --skip-configure
eautoreconf
}
src_configure() {
econf \
$(use_with alsa) \
$(use_with oss) \
$(use_with portaudio) \
$(use_with pulseaudio) \
$(use_with openal) \
$(use_with lua) \
$(use_with ffmpeg ffms) \
$(use_with spell hunspell) \
$(use_enable debug) \
$(use_enable nls)
}

@ -1,101 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"
WX_GTK_VER="3.0"
PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
REQUIRED_USE="
|| ( alsa openal oss portaudio pulseaudio )
"
RDEPEND="
>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
virtual/opengl
virtual/glu
>=media-libs/libass-0.10.0[fontconfig]
virtual/libiconv
>=dev-lang/lua-5.1.1
>=dev-libs/boost-1.52.0:=[icu,nls,threads]
>=dev-libs/icu-4.8.1.1:=
>=media-libs/fontconfig-2.4.2
>=media-libs/freetype-2.3.5:2
alsa? ( >=media-libs/alsa-lib-1.0.16 )
portaudio? ( =media-libs/portaudio-19* )
pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
openal? ( media-libs/openal )
spell? ( >=app-text/hunspell-1.2.2 )
ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
fftw? ( >=sci-libs/fftw-3.3 )
"
DEPEND="${RDEPEND}
oss? ( virtual/os-headers )
>=sys-devel/gettext-0.18
dev-util/intltool
virtual/pkgconfig
"
S=${WORKDIR}/${P}/${PN}
src_prepare() {
my_rm_loc() {
sed -i -e "s:${1}\.po::" po/Makefile || die
rm "po/${1}.po" || die
}
l10n_find_plocales_changes 'po' '' '.po'
if [ -z "$(l10n_get_locales)" ]; then
sed -e 's/^\s*po\s*$//' -i Makefile || die
else
l10n_for_each_disabled_locale_do my_rm_loc
fi
autotools-utils_src_prepare
}
src_configure() {
# testing openal does not work in sandbox, bug #508184
use openal && export agi_cv_with_openal="yes"
local myeconfargs=(
$(use_with alsa)
$(use_with oss)
$(use_with portaudio)
$(use_with pulseaudio libpulse)
$(use_with openal)
$(use_with ffmpeg ffms2)
$(use_with fftw fftw3)
$(use_with spell hunspell)
$(use_enable debug)
)
autotools-utils_src_configure
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}

@ -1,98 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"
WX_GTK_VER="3.0"
PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS@latin sr_RS vi zh_CN zh_TW"
inherit autotools-utils wxwidgets l10n fdo-mime gnome2-utils
DESCRIPTION="Advanced subtitle editor"
HOMEPAGE="http://www.aegisub.org/"
SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
REQUIRED_USE="
|| ( alsa openal oss portaudio pulseaudio )
"
RDEPEND="
>=x11-libs/wxGTK-3.0.0:${WX_GTK_VER}[X,opengl,debug?]
virtual/opengl
virtual/glu
>=media-libs/libass-0.10.0[fontconfig]
virtual/libiconv
>=dev-libs/boost-1.53.0:=[icu,nls,threads]
>=dev-libs/icu-4.8.1.1:=
>=media-libs/fontconfig-2.4.2
>=media-libs/freetype-2.3.5:2
alsa? ( >=media-libs/alsa-lib-1.0.16 )
portaudio? ( =media-libs/portaudio-19* )
pulseaudio? ( >=media-sound/pulseaudio-0.9.5 )
openal? ( media-libs/openal )
spell? ( >=app-text/hunspell-1.2.2 )
ffmpeg? ( >=media-libs/ffmpegsource-2.17:= )
fftw? ( >=sci-libs/fftw-3.3 )
"
DEPEND="${RDEPEND}
oss? ( virtual/os-headers )
>=sys-devel/gettext-0.18
dev-util/intltool
virtual/pkgconfig
"
src_prepare() {
my_rm_loc() {
sed -i -e "s:${1}\.po::" po/Makefile || die
rm "po/${1}.po" || die
}
l10n_find_plocales_changes 'po' '' '.po'
if [ -z "$(l10n_get_locales)" ]; then
sed -e 's/^\s*po\s*$//' -i Makefile || die
else
l10n_for_each_disabled_locale_do my_rm_loc
fi
autotools-utils_src_prepare
}
src_configure() {
# testing openal does not work in sandbox, bug #508184
use openal && export agi_cv_with_openal="yes"
local myeconfargs=(
$(use_with alsa)
$(use_with oss)
$(use_with portaudio)
$(use_with pulseaudio libpulse)
$(use_with openal)
$(use_with ffmpeg ffms2)
$(use_with fftw fftw3)
$(use_with spell hunspell)
$(use_enable debug)
)
autotools-utils_src_configure
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}

@ -61,7 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2.2-fix-lua-regexp.patch"
"${FILESDIR}/${P}-unbundle-luajit.patch"
"${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${P}-respect-user-compiler-flags.patch"
"${FILESDIR}/${PN}-3.2.2-respect-user-compiler-flags.patch"
)
pkg_pretend() {

@ -1,16 +1,40 @@
diff --git a/Makefile.inc.in b/Makefile.inc.in
index c93b9dc..8c5678a 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
-LIBS_PTHREAD = @PTHREAD_LIBS@
+LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
ifeq (yes, $(BUILD_DARWIN))
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
diff --git a/libaegisub/Makefile b/libaegisub/Makefile
index 64204ef..178044d 100644
--- a/libaegisub/Makefile
+++ b/libaegisub/Makefile
@@ -41,7 +41,8 @@ aegisub_OBJ += $(d)common/dispatch.o
endif
aegisub_PCH := $(d)lagi_pre.h
-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) -fPIC \
+ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
$(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
$(d)common/parser.o_FLAGS := -ftemplate-depth=256
diff --git a/tools/Makefile b/tools/Makefile
index 81bcef3..f9a6cd3 100644
index 81bcef3..d9f64b8 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -7,8 +7,9 @@ PROGRAM += $(d)osx-bundle-restart-helper
@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
endif
repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
PROGRAM += $(d)repack-thes-dict

@ -28,3 +28,23 @@ index be657b0..fca48e0 100644
])
])
diff --git a/src/Makefile b/src/Makefile
index 60d7101..1f7b2bc 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -182,14 +182,13 @@ endif
#####################
# SOURCE-LEVEL CFLAGS
#####################
-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
$(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
$(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
$(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
$(d)charset_detect.o_FLAGS := -D_X86_
$(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
$(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
$(d)text_file_reader.o_FLAGS := -D_X86_
$(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include

@ -28,6 +28,22 @@ index c93b9dc..ae018c3 100644
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
#####################
diff --git a/automation/Makefile b/automation/Makefile
index 45a5ce2..db51a61 100644
--- a/automation/Makefile
+++ b/automation/Makefile
@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
$(DESTDIR)$(P_DATA)/automation/%: $(d)%
$(MKDIR_INSTALL)
-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
PROGRAM += $(d)aegisub-lua
diff --git a/configure.ac b/configure.ac
index be657b0..de586d5 100644
--- a/configure.ac
@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
index 60d7101..757bdc6 100644
index 60d7101..1d4779c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
@ -70,8 +86,8 @@ index 60d7101..757bdc6 100644
src_CXXFLAGS := $(CXXFLAGS_WX)
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
+ $(LIBS_LUA)
+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
+ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)

@ -1,14 +1,27 @@
diff --git a/tools/Makefile b/tools/Makefile
index d9f64b8..f9a6cd3 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -8,7 +8,8 @@ endif
diff --git a/Makefile.inc.in b/Makefile.inc.in
index d1e1da4..699ac77 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -99,7 +99,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
LIBS_OPENAL = @OPENAL_LIBS@
LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
-LIBS_PTHREAD = @PTHREAD_LIBS@
+LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
-repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
+repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include \
+ $(CFLAGS_ICU) $(CFLAGS_PTHREAD)
ifeq (yes, $(BUILD_DARWIN))
LIBS_LUA = $(TOP)vendor/luajit/src/libluajit-aegisub.so
diff --git a/libaegisub/Makefile b/libaegisub/Makefile
index 4efb685..f53c372 100644
--- a/libaegisub/Makefile
+++ b/libaegisub/Makefile
@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
endif
PROGRAM += $(d)repack-thes-dict
aegisub_PCH := $(d)lagi_pre.h
-aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
+ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
$(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
$(d)common/parser.o_FLAGS := -ftemplate-depth=256

@ -1,50 +0,0 @@
diff --git a/configure.ac b/configure.ac
index d0b5152..2609161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,20 +136,17 @@ AS_IF([test x$build_darwin != xyes], [
AC_ARG_ENABLE(compiler-flags, AS_HELP_STRING([--disable-compiler-flags],[Disable *all* additional compiler flags. [no]]))
AS_IF([test x$enable_compiler_flags != xno], [
- CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
- CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
+ CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter"
+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter"
+ AC_C_FLAG([-std=gnu99])
AC_CXX_FLAG([-std=c++11])
- AC_CXX_FLAG([-Wno-c++11-narrowing])
AC_C_FLAG([-Wno-unused-local-typedefs])
AC_CXX_FLAG([-Wno-unused-local-typedefs])
# -O* messes with debugging.
AS_IF([test x$enable_debug = xyes], [
- CFLAGS="$CFLAGS -O0"
- CXXFLAGS="$CXXFLAGS -O0"
- ], [
- CFLAGS="$CFLAGS -O3"
- CXXFLAGS="$CXXFLAGS -O3"
+ CFLAGS="$CFLAGS -O0 -g"
+ CXXFLAGS="$CXXFLAGS -O0 -g"
])
])
diff --git a/src/Makefile b/src/Makefile
index 08f9216..e2e5602 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -182,14 +182,13 @@ endif
#####################
# SOURCE-LEVEL CFLAGS
#####################
-$(d)MatroskaParser.o_FLAGS := -Wno-sometimes-uninitialized
$(d)audio_player.o_FLAGS := $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
$(d)audio_provider_factory.o_FLAGS := $(CFLAGS_FFMS2)
$(d)auto4_base.o_FLAGS := $(CFLAGS_FREETYPE)
$(d)charset_detect.o_FLAGS := -D_X86_
$(d)font_file_lister_fontconfig.o_FLAGS := $(CFLAGS_FONTCONFIG)
$(d)subtitles_provider.o_FLAGS := $(CFLAGS_LIBASS)
-$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS) -Wno-c++11-narrowing
+$(d)subtitles_provider_libass.o_FLAGS := $(CFLAGS_LIBASS)
$(d)text_file_reader.o_FLAGS := -D_X86_
$(d)video_provider_manager.o_FLAGS := $(CFLAGS_FFMS2)
$(d)auto4_lua.o_FLAGS := -I$(TOP)vendor/luajit/include

@ -28,6 +28,22 @@ index d1e1da4..aa26b81 100644
FONTCONFIG_CONF_DIR = @FONTCONFIG_CONF_DIR@
#####################
diff --git a/automation/Makefile b/automation/Makefile
index d5425b7..121aae7 100644
--- a/automation/Makefile
+++ b/automation/Makefile
@@ -12,9 +12,9 @@ DATA_AUTOMATION_INSTALLED = $(addprefix $(DESTDIR)$(P_DATA)/automation/, $(DATA_
$(DESTDIR)$(P_DATA)/automation/%: $(d)%
$(MKDIR_INSTALL)
-aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a $(LIBS_LUA)
+aegisub-lua_OBJ := $(d)tests/aegisub.o $(TOP)lib/libaegisub.a $(TOP)lib/libluabins.a
aegisub-lua_CPPFLAGS := $(CPPFLAGS_BOOST) $(CFLAGS_LUA) -I$(TOP)libaegisub/include -I$(TOP)src $(CXXFLAGS_WX)
-aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU)
+aegisub-lua_LIBS := $(LIBS_WX) $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_LUA)
PROGRAM += $(d)aegisub-lua
diff --git a/configure.ac b/configure.ac
index d0b5152..ecec4de 100644
--- a/configure.ac
@ -62,7 +78,7 @@ index 61c8ba1..050472d 100644
subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
diff --git a/src/Makefile b/src/Makefile
index 08f9216..bb9233b 100644
index 08f9216..53c60b6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,8 @@ src_CPPFLAGS := -I$(d) -I.. -I$(d)include -I$(TOP)libaegisub/include -I$(TOP)bui
@ -70,8 +86,8 @@ index 08f9216..bb9233b 100644
src_CXXFLAGS := $(CXXFLAGS_WX)
src_LIBS := $(LIBS_GL) $(LIBS_PTHREAD) $(LIBS_WX) $(LIBS_FREETYPE) \
- $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU)
+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) $(LIBS_ICU) \
+ $(LIBS_LUA)
+ $(LIBS_LIBASS) $(LIBS_FONTCONFIG) $(LIBS_FFTW3) $(LIBS_BOOST) \
+ $(LIBS_ICU) $(LIBS_LUA)
src_PCH := $(d)agi_pre.h
src_INSTALLNAME := $(AEGISUB_COMMAND)

@ -208,7 +208,7 @@ RDEPEND="
>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
)
jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
libass? ( >=media-libs/libass-0.10.2[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )

@ -1,8 +1,2 @@
DIST mkvtoolnix-6.6.0.tar.xz 5174424 SHA256 cb1f965617fe064cf78457d3fbd0685eb31ae5b7e205cf4c8e74b6f27f3399e3 SHA512 c86f10a0a919e6d28c2587b60663c38713cfa6ca0a5188524b81af2fd60e4ea626a01431d29c6ae5885eae05d71af93d857986c5008aec4963dacc3ead9dc26f WHIRLPOOL 55a15bb2fdb62af85e189c39b1a1391d33eb08b4ba116fc307965be6817a944b21d18c034b9a3da16a6e84e93544dbd59f3c7fe9406ab454e15cf8ee1eb815c3
DIST mkvtoolnix-8.2.0.tar.xz 5856988 SHA256 eb6d3d7a0254bb4326dccc9983418801783198cdf4a259f31261dab4e843a5c4 SHA512 200fad08f6912081d7aabbae9330dc41b90af8d6fdce592090b9fedf2325a91f70d3a85ff40b03b57b0682a075050b6b73307872c1e716e8261849c3fb97968b WHIRLPOOL 1b25cd8913eb02018d62de369171ee1a48d31cbce6684c0c7febd2f88c3286bbf386c825ddeae54ef411dc14cc128c9e833408f9b0ac9cb1d5e525ba34aaa4ae
DIST mkvtoolnix-8.3.0.tar.xz 5863384 SHA256 87bd82222995d35c310a426ed43e0b27cbfefa0caadcbcca8296787314affc37 SHA512 fb3ac11480c20ae360fef9081991876ef2d7a717f24ec631bb8482ee7d22f79164aafeaf561dee503f1c0a83fe3ed6db319b420c34d638450aada762e6eb00c0 WHIRLPOOL b3cd3f4785c891c75eac3754136aa0b709ff0e784eea6d0e915478eea6fbdbe7132c56a997a007ba6d690649b6caaae46a8b45ae055aab7ae557486d99aab417
DIST mkvtoolnix-8.4.0.tar.xz 3234284 SHA256 f6a5506d14a0b16abb3765d6f78cded0267e01096926b30e8f72df9d30aaf878 SHA512 ab9ab49baf06a8ef713872a09c58fdb1560628dbe3b2b661d809972f56a36c751a390a78ae260624510963b92e177d090088030bb96f9ab9e96e1a372772d22f WHIRLPOOL 811a0466413bdba84959c5ae84d637aba4371018ee3deed70d65f24472c0bf6a714003574efb4e4dcdc3bfb1b3c48595a347ab0bcdd935a9b49e2f1ab4c36c58
DIST mkvtoolnix-8.5.0.tar.xz 3280556 SHA256 ec3f4566dbc324c3bda7314c70d87046136664d72888945f9fdb8d129e1e05a3 SHA512 18f1bac6ba46d3ec3235d4b8ec8fc9bd0b5993344205172f254d3ca8aa7afdb399d81d9e7d8b24fe004661c83757e82b4874865acaa231e7721b1d8382adfdd3 WHIRLPOOL 453a55adf80fca61be3b102c39ccd48aa057983e8e3d4aea563ffe67ad86ded6889f0e1926e600556d43c4fccacdc79facd6438b8dccb9591a6e86de2919e8b1
DIST mkvtoolnix-8.5.1.tar.xz 3288800 SHA256 db9ae151ef236afac190c0137d8d4df4e43c105dbd298e3913b5afae1fdd5b43 SHA512 cf2d254df0851f4450a59b187ec9c4d293c1128d062ab12d098bc77ea4c2213a2d5b78989ee170789aa2bac9c23a531ed7b87f6d7206f03ee73a0821c021fffa WHIRLPOOL 7a7858fd6f22c9bf812cb28528f7612a3fb7a7056889534e24a45fe1bc88e69c9c6220088cd45e66f2072150b876af7eeaa417b2f7f02dff19c1ea4d03853ba9
DIST mkvtoolnix-8.5.2.tar.xz 3304356 SHA256 efaae6d5e3d0963e2f53ae9c45f151be28561a6c6a28fad46e6220baf9862bbc SHA512 14a2d3d20499ccc2cfd0b1cfbbaa66def6ba512df0624f3e79d317670c4c17bf6552b9e62daed225b369fbab2fad3ce98877ccb7583096cd61da4c91ffed54ef WHIRLPOOL 536bbf36ac76e46d0205f5b2db58d986065ba38acd513129e0604154130cdf8861f3d8a52cb341980161b302f2853199c031b9908665ff13d2bb7db193a56a66
DIST mkvtoolnix-8.6.1.tar.xz 3242840 SHA256 815d8355b6a83af01c957543cee8716f1dad53e03b2ecf58b821099cd3c8fa77 SHA512 f3b14547da01a3a1268ec9b356e830391da7058741d7d8b67dcc9df5098ae9617fece67b82d6a73324f95c7060b182d94929c637baa6b9c806b2d472937151e1 WHIRLPOOL d8f4f9d3b2db77820bc018f41ac5a864057f18b22ed7711fc5c7bc3996b31041606a244b4f06b19abbaec6686990834c37ab27d5e58dd37b7c8313b24afdca51

@ -1,63 +0,0 @@
diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
index 97c4ad0..87b94a8 100644
--- a/ac/ax_boost_filesystem.m4
+++ b/ac/ax_boost_filesystem.m4
@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_filesystem_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
+ for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
[link_filesystem="no"],[$BOOST_SYSTEM_LIB])
done
if test "x$link_filesystem" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
+ for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
index ffd537f..2cef64f 100644
--- a/ac/ax_boost_regex.m4
+++ b/ac/ax_boost_regex.m4
@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_regex_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
+ for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
[link_regex="no"])
done
if test "x$link_regex" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
+ for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
index b0685b9..a71907b 100644
--- a/ac/ax_boost_system.m4
+++ b/ac/ax_boost_system.m4
@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
LDFLAGS_SAVE=$LDFLAGS
if test "x$ax_boost_user_system_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
+ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
done
if test "x$link_system" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
+ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],

@ -1,31 +0,0 @@
--- mkvtoolnix-5.8.0/rake.d/target.rb
+++ mkvtoolnix-5.8.0/rake.d/target.rb
@@ -107,7 +107,6 @@
when :mtxunittest then "tests/unit/libmtxunittest.a"
when :avi then "lib/avilib-0.6.10/libavi.a"
when :rmff then "lib/librmff/librmff.a"
- when :pugixml then "lib/pugixml/src/libpugixml.a"
when :mpegparser then "src/mpegparser/libmpegparser.a"
when :ebml then c?("EBML_MATROSKA_INTERNAL") ? "lib/libebml/src/libebml.a" : nil
when :matroska then c?("EBML_MATROSKA_INTERNAL") ? "lib/libmatroska/src/libmatroska.a" : nil
--- mkvtoolnix-5.8.0/Rakefile
+++ mkvtoolnix-5.8.0/Rakefile
@@ -55,8 +55,8 @@
$applications = $programs.collect { |name| "src/#{$application_subdirs[name]}#{name}" + c(:EXEEXT) }
$manpages = $programs.collect { |name| "doc/man/#{name}.1" }
- $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Ilib/pugixml/src -Isrc"
- $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Llib/pugixml/src -Lsrc/common"
+ $system_includes = "-I. -Ilib -Ilib/avilib-0.6.10 -Ilib/utf8-cpp/source -Isrc"
+ $system_libdirs = "-Llib/avilib-0.6.10 -Llib/librmff -Lsrc/common"
$source_directories = %w{lib/avilib-0.6.10 lib/librmff src src/input src/output src/common src/common/chapters src/common/compression src/common/strings src/common/tags src/common/xml
src/mmg src/mmg/header_editor src/mmg/options src/mmg/tabs src/extract src/propedit src/merge src/info src/mpegparser}
@@ -605,7 +605,6 @@
[ { :name => 'avi', :dir => 'lib/avilib-0.6.10' },
{ :name => 'rmff', :dir => 'lib/librmff' },
- { :name => 'pugixml', :dir => 'lib/pugixml/src' },
{ :name => 'mpegparser', :dir => 'src/mpegparser' },
{ :name => 'mtxcommon', :dir => [ 'src/common' ] + %w{chapters compression strings tags xml }.collect { |e| "src/common/#{e}" } },
{ :name => 'mtxinput', :dir => 'src/input' },

@ -1,52 +0,0 @@
diff -Nuar mkvtoolnix-6.6.0/src/common/iso639.cpp mkvtoolnix-6.6.0-fix/src/common/iso639.cpp
--- mkvtoolnix-6.6.0/src/common/iso639.cpp 2013-12-01 16:51:35.000000000 +0000
+++ mkvtoolnix-6.6.0-fix/src/common/iso639.cpp 2015-02-09 07:00:26.134735208 +0000
@@ -13,6 +13,7 @@
#include "common/common_pch.h"
+#include <boost/version.hpp>
#include <unordered_map>
#include "common/iso639.h"
@@ -590,20 +591,36 @@
auto range = iso639_languages | badap::indexed(0);
auto end = boost::end(range);
for (auto lang = boost::begin(range); lang != end; lang++) {
- auto names = split(lang->english_name, ";");
+#if BOOST_VERSION < 105600
+ auto const &english_name = lang->english_name;
+ auto index = lang.index();
+#else
+ auto const &english_name = lang->value().english_name;
+ auto index = lang->index();
+#endif
+
+ auto names = split(english_name, ";");
strip(names);
if (brng::find(names, s) != names.end())
- return lang.index();
+ return index;
}
if (!allow_short_english_name)
return -1;
for (auto lang = boost::begin(range); lang != end; lang++) {
- auto names = split(lang->english_name, ";");
+#if BOOST_VERSION < 105600
+ auto const &english_name = lang->english_name;
+ auto index = lang.index();
+#else
+ auto const &english_name = lang->value().english_name;
+ auto index = lang->index();
+#endif
+
+ auto names = split(english_name, ";");
strip(names);
if (names.end() != brng::find_if(names, [&](std::string const &name) { return balg::istarts_with(name, s); }))
- return lang.index();
+ return index;
}
return -1;

@ -1,11 +0,0 @@
--- a/src/mkvtoolnix-gui/main_window/main_window.cpp
+++ b/src/mkvtoolnix-gui/main_window/main_window.cpp
@@ -118,7 +118,7 @@ MainWindow::setupMenu() {
#if defined(HAVE_CURL_EASY_H)
connect(ui->actionHelpCheckForUpdates, &QAction::triggered, this, &MainWindow::checkForUpdates);
#else
- ui->actionGUICheckForUpdates->setVisible(false);
+ ui->actionHelpCheckForUpdates->setVisible(false);
#endif // HAVE_CURL_EASY_H
}

@ -1,89 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug pch qt4 wxwidgets"
RDEPEND="
>=dev-libs/libebml-1.3.0:=
>=media-libs/libmatroska-1.4.1:=
>=dev-libs/boost-1.46.0:=
dev-libs/pugixml
media-libs/flac
media-libs/libogg
media-libs/libvorbis
sys-apps/file
>=sys-devel/gcc-4.6
sys-libs/zlib
qt4? (
dev-qt/qtcore:4
dev-qt/qtgui:4
)
wxwidgets? ( x11-libs/wxGTK:2.8[X] )
"
DEPEND="${RDEPEND}
dev-lang/ruby
virtual/pkgconfig
"
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
if ! version_is_at_least ${ver} $(gcc-version); then
eerror ${msg}
die ${msg}
fi
}
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.8.0-system-pugixml.patch \
"${FILESDIR}"/${PN}-5.8.0-boost-configure.patch \
"${FILESDIR}"/${PN}-6.6.0-boost-1.56.patch
eautoreconf
}
src_configure() {
local myconf
if use wxwidgets ; then
WX_GTK_VER="2.8"
need-wxwidgets unicode
myconf="--with-wx-config=${WX_CONFIG}"
fi
econf \
$(use_enable debug) \
$(use_enable qt4 qt) \
$(use_enable wxwidgets) \
$(usex pch "" --disable-precompiled-headers) \
${myconf} \
--disable-optimization \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--with-boost="${EPREFIX}"/usr \
--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir) \
--without-curl
}
src_compile() {
./drake V=1 -j$(makeopts_jobs) || die
}
src_install() {
DESTDIR="${D}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README TODO
doman doc/man/*.1
use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
}

@ -1,123 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
WX_GTK_VER="3.0"
inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch qt5 wxwidgets"
ruby_atom() {
local ruby_slot=${1/ruby/}
ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
echo "dev-lang/ruby:${ruby_slot}"
}
# hacks to avoid using the ruby eclasses since this requires something similar
# to the python-any-r1 eclass for ruby which currently doesn't exist
RUBY_IMPLS=( ruby22 ruby21 ruby20 )
RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
RDEPEND="
>=dev-libs/boost-1.46.0:=
>=dev-libs/libebml-1.3.1:=
dev-libs/pugixml
media-libs/flac
>=media-libs/libmatroska-1.4.2:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file
>=sys-devel/gcc-4.6
sys-libs/zlib
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
)
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
"
DEPEND="${RDEPEND}
|| ( ${RUBY_BDEPS} )
sys-devel/gettext
virtual/pkgconfig
"
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
if ! version_is_at_least ${ver} $(gcc-version); then
eerror ${msg}
die ${msg}
fi
}
src_prepare() {
local ruby_impl
for ruby_impl in "${RUBY_IMPLS[@]}"; do
if has_version "$(ruby_atom ${ruby_impl})"; then
export RUBY=${ruby_impl}
break
fi
done
[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
epatch "${FILESDIR}"/${PN}-5.8.0-boost-configure.patch
epatch "${FILESDIR}"/${P}-fix-curl-support.patch #555340
epatch_user
eautoreconf
}
src_configure() {
local myconf
if use qt5 ; then
# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
myconf+=(
--with-moc=/usr/$(get_libdir)/qt5/bin/moc
--with-uic=/usr/$(get_libdir)/qt5/bin/uic
--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
--with-mkvtoolnix-gui
)
fi
if use wxwidgets ; then
need-wxwidgets unicode
myconf+=( --with-wx-config=${WX_CONFIG} )
fi
econf \
$(use_enable debug) \
$(use_enable qt5 qt) \
$(use_enable wxwidgets) \
$(use_with curl) \
$(usex pch "" --disable-precompiled-headers) \
"${myconf[@]}" \
--disable-optimization \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--with-boost="${EPREFIX}"/usr \
--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
}
src_compile() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
}
src_install() {
DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README.md TODO
doman doc/man/*.1
use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
}

@ -1,121 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
WX_GTK_VER="3.0"
inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch qt5 wxwidgets"
ruby_atom() {
local ruby_slot=${1/ruby/}
ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
echo "dev-lang/ruby:${ruby_slot}"
}
# hacks to avoid using the ruby eclasses since this requires something similar
# to the python-any-r1 eclass for ruby which currently doesn't exist
RUBY_IMPLS=( ruby22 ruby21 ruby20 )
RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
RDEPEND="
>=dev-libs/boost-1.46.0:=
>=dev-libs/libebml-1.3.1:=
dev-libs/pugixml
media-libs/flac
>=media-libs/libmatroska-1.4.2:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file
>=sys-devel/gcc-4.6
sys-libs/zlib
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
)
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
"
DEPEND="${RDEPEND}
|| ( ${RUBY_BDEPS} )
sys-devel/gettext
virtual/pkgconfig
"
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
if ! version_is_at_least ${ver} $(gcc-version); then
eerror ${msg}
die ${msg}
fi
}
src_prepare() {
local ruby_impl
for ruby_impl in "${RUBY_IMPLS[@]}"; do
if has_version "$(ruby_atom ${ruby_impl})"; then
export RUBY=${ruby_impl}
break
fi
done
[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
epatch_user
eautoreconf
}
src_configure() {
local myconf
if use qt5 ; then
# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
myconf+=(
--with-moc=/usr/$(get_libdir)/qt5/bin/moc
--with-uic=/usr/$(get_libdir)/qt5/bin/uic
--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
--with-mkvtoolnix-gui
)
fi
if use wxwidgets ; then
need-wxwidgets unicode
myconf+=( --with-wx-config=${WX_CONFIG} )
fi
econf \
$(use_enable debug) \
$(use_enable qt5 qt) \
$(use_enable wxwidgets) \
$(use_with curl) \
$(usex pch "" --disable-precompiled-headers) \
"${myconf[@]}" \
--disable-optimization \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--with-boost="${EPREFIX}"/usr \
--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
}
src_compile() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
}
src_install() {
DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README.md TODO
doman doc/man/*.1
use wxwidgets && docompress -x /usr/share/doc/${PF}/guide
}

@ -1,116 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
WX_GTK_VER="3.0"
inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch test qt5"
ruby_atom() {
local ruby_slot=${1/ruby/}
ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
echo "dev-lang/ruby:${ruby_slot}"
}
# hacks to avoid using the ruby eclasses since this requires something similar
# to the python-any-r1 eclass for ruby which currently doesn't exist
RUBY_IMPLS=( ruby22 ruby21 ruby20 )
RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
RDEPEND="
>=dev-libs/boost-1.46.0:=
>=dev-libs/libebml-1.3.1:=
dev-libs/pugixml
media-libs/flac
>=media-libs/libmatroska-1.4.2:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file
sys-libs/zlib
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
)
"
DEPEND="${RDEPEND}
|| ( ${RUBY_BDEPS} )
sys-devel/gettext
virtual/pkgconfig
test? ( dev-cpp/gtest )
"
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
if ! version_is_at_least ${ver} $(gcc-version); then
eerror ${msg}
die ${msg}
fi
}
src_prepare() {
local ruby_impl
for ruby_impl in "${RUBY_IMPLS[@]}"; do
if has_version "$(ruby_atom ${ruby_impl})"; then
export RUBY=${ruby_impl}
break
fi
done
[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
epatch_user
eautoreconf
}
src_configure() {
local myconf
if use qt5 ; then
# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
myconf+=(
--with-moc=/usr/$(get_libdir)/qt5/bin/moc
--with-uic=/usr/$(get_libdir)/qt5/bin/uic
--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
)
fi
econf \
$(use_enable debug) \
$(use_enable qt5 qt) \
$(use_with curl) \
$(usex pch "" --disable-precompiled-headers) \
"${myconf[@]}" \
--disable-optimization \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--with-boost="${EPREFIX}"/usr \
--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
}
src_compile() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
}
src_test() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
}
src_install() {
DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README.md
doman doc/man/*.1
}

@ -1,116 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
WX_GTK_VER="3.0"
inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch test qt5"
ruby_atom() {
local ruby_slot=${1/ruby/}
ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
echo "dev-lang/ruby:${ruby_slot}"
}
# hacks to avoid using the ruby eclasses since this requires something similar
# to the python-any-r1 eclass for ruby which currently doesn't exist
RUBY_IMPLS=( ruby22 ruby21 ruby20 )
RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
RDEPEND="
>=dev-libs/boost-1.46.0:=
>=dev-libs/libebml-1.3.1:=
dev-libs/pugixml
media-libs/flac
>=media-libs/libmatroska-1.4.2:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file
sys-libs/zlib
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
)
"
DEPEND="${RDEPEND}
|| ( ${RUBY_BDEPS} )
sys-devel/gettext
virtual/pkgconfig
test? ( dev-cpp/gtest )
"
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
if ! version_is_at_least ${ver} $(gcc-version); then
eerror ${msg}
die ${msg}
fi
}
src_prepare() {
local ruby_impl
for ruby_impl in "${RUBY_IMPLS[@]}"; do
if has_version "$(ruby_atom ${ruby_impl})"; then
export RUBY=${ruby_impl}
break
fi
done
[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
epatch_user
eautoreconf
}
src_configure() {
local myconf
if use qt5 ; then
# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
myconf+=(
--with-moc=/usr/$(get_libdir)/qt5/bin/moc
--with-uic=/usr/$(get_libdir)/qt5/bin/uic
--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
)
fi
econf \
$(use_enable debug) \
$(use_enable qt5 qt) \
$(use_with curl) \
$(usex pch "" --disable-precompiled-headers) \
"${myconf[@]}" \
--disable-optimization \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--with-boost="${EPREFIX}"/usr \
--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
}
src_compile() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
}
src_test() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
}
src_install() {
DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README.md
doman doc/man/*.1
}

@ -1,115 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs versionator multiprocessing autotools
DESCRIPTION="Tools to create, alter, and inspect Matroska files"
HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch test qt5"
ruby_atom() {
local ruby_slot=${1/ruby/}
ruby_slot="${ruby_slot:0:1}.${ruby_slot:1:2}"
echo "dev-lang/ruby:${ruby_slot}"
}
# hacks to avoid using the ruby eclasses since this requires something similar
# to the python-any-r1 eclass for ruby which currently doesn't exist
RUBY_IMPLS=( ruby22 ruby21 ruby20 )
RUBY_BDEPS="$(for ruby_impl in "${RUBY_IMPLS[@]}"; do
echo "( $(ruby_atom ${ruby_impl}) virtual/rubygems[ruby_targets_${ruby_impl}] )"; done)"
RDEPEND="
>=dev-libs/boost-1.46.0:=
>=dev-libs/libebml-1.3.3:=
dev-libs/pugixml
media-libs/flac
>=media-libs/libmatroska-1.4.4:=
media-libs/libogg
media-libs/libvorbis
sys-apps/file
sys-libs/zlib
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtwidgets:5
)
"
DEPEND="${RDEPEND}
|| ( ${RUBY_BDEPS} )
sys-devel/gettext
virtual/pkgconfig
test? ( dev-cpp/gtest )
"
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
if ! version_is_at_least ${ver} $(gcc-version); then
eerror ${msg}
die ${msg}
fi
}
src_prepare() {
local ruby_impl
for ruby_impl in "${RUBY_IMPLS[@]}"; do
if has_version "$(ruby_atom ${ruby_impl})"; then
export RUBY=${ruby_impl}
break
fi
done
[[ -z ${RUBY} ]] && die "No available ruby implementations to build with"
epatch_user
eautoreconf
}
src_configure() {
local myconf
if use qt5 ; then
# ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
myconf+=(
--with-moc=/usr/$(get_libdir)/qt5/bin/moc
--with-uic=/usr/$(get_libdir)/qt5/bin/uic
--with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
)
fi
econf \
$(use_enable debug) \
$(use_enable qt5 qt) \
$(use_with curl) \
$(usex pch "" --disable-precompiled-headers) \
"${myconf[@]}" \
--disable-optimization \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--with-boost="${EPREFIX}"/usr \
--with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
}
src_compile() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) || die
}
src_test() {
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:unit || die
"${RUBY}" ./drake V=1 -j$(makeopts_jobs) tests:run_unit || die
}
src_install() {
DESTDIR="${D}" "${RUBY}" ./drake -j$(makeopts_jobs) install || die
dodoc AUTHORS ChangeLog README.md
doman doc/man/*.1
}

@ -1,4 +1,5 @@
DIST mpv-0.11.0.tar.gz 2689655 SHA256 a2157174e46db46dad5deb1fde94283e72ebe922fd15447cb16a2a243fae5bda SHA512 f85da000770dbca09be2a59c4eda7e6d7142ca17328844d2b08a173f64554159f50ba9b32661ba67924b789e886940cda1add993862f02f295e7753f50388bdb WHIRLPOOL 1184f09435d6f30119143ab98ddd4767e53c701bdc5b850eb62c19607652a7103699a6b54a0d165acb548f4cced4179af6f7decbf64c8289ff56736e26ed7924
DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
DIST mpv-0.9.2_p20150824.tar.xz 1867384 SHA256 67fa5ce11740b83ceef8bc435d5ef17803f1ec328dd2fee93b67e46ccc195209 SHA512 1ae0fd4faa180472c023c0ba77a28f2d1319f597763d5249259d55a04387b5f6384e2c5a8ff78bb514dfda86c30ceb474c35e54468a29ad3fc6327c4baaf75cc WHIRLPOOL cb61758234f9186880def4dcb7cb7e54d03abd6734484b5691926e2514cae1bebef6f9a53465e2aa2710e4ad5dbe1875369d483489a5cb853c3fa756ff7e968a
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b

@ -0,0 +1,37 @@
For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631
Upstream commits:
https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035
https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
index 00cd535..f607c23 100644
--- a/video/out/opengl/common.c
+++ b/video/out/opengl/common.c
@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
}
#if HAVE_C11_TLS
-static _Thread_local MPGLContext *current_context;
+#define MP_TLS _Thread_local
+#elif defined(__GNU__)
+#define MP_TLS __thread
+#endif
+
+#ifdef MP_TLS
+static MP_TLS MPGLContext *current_context;
static void * GLAPIENTRY get_native_display(const char *name)
{
diff --git a/wscript b/wscript
index a5e6914..969d9cc 100644
--- a/wscript
+++ b/wscript
@@ -718,7 +718,6 @@ video_output_features = [
}, {
'name': 'vaapi-egl',
'desc': 'VAAPI EGL',
- 'deps': [ 'c11-tls' ], # indirectly
'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ],
'func': check_true,
}, {

@ -1,12 +0,0 @@
diff --git a/demux/demux.c b/demux/demux.c
index 0649175..bd16a7a 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -43,6 +43,7 @@
#include "audio/format.h"
#include <libavcodec/avcodec.h>
+#include <libavutil/mem.h>
// Demuxer list
extern const struct demuxer_desc demuxer_desc_edl;

@ -0,0 +1,17 @@
commit 867334395765ae7d2765e0834f9fd3dd5de53cab
Author: Ilya Tumaykin <itumaykin@gmail.com>
Date: Tue Dec 22 17:10:12 2015 +0300
tests: fix #include
diff --git a/test/gl_video.c b/test/gl_video.c
index 253ab35..97fee94 100644
--- a/test/gl_video.c
+++ b/test/gl_video.c
@@ -1,5 +1,5 @@
#include "test_helpers.h"
-#include "video/out/gl_video.h"
+#include "video/out/opengl/video.h"
static void test_scale_ambient_lux_limits(void **state) {
float x;

@ -19,16 +19,18 @@
<herd>video</herd>
<herd>proxy-maintainers</herd>
<use>
<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
<flag name="cli">Build mpv CLI player</flag>
<flag name="cdio">Enable CDDA support via <pkg>dev-libs/libcdio-paranoia</pkg></flag>
<flag name="doc-pdf">Build documentation in pdf format</flag>
<flag name="drm">Enable Kernel Mode Setting / Direct Rendering Manager based video output</flag>
<flag name="egl">Enable EGL backend for X11 OpenGL video output (experimental)</flag>
<flag name="enca">Enable support for charset discovery and conversion using <pkg>app-i18n/enca</pkg></flag>
<flag name="jpeg">Enable support for saving screenshots to JPEG format</flag>
<flag name="libguess">Enable support for charset discovery and conversion using <pkg>app-i18n/libguess</pkg></flag>
<flag name="egl">Enable support for various EGL-based video outputs</flag>
<flag name="enca">Enable subtitles charset discovery via <pkg>app-i18n/enca</pkg></flag>
<flag name="gbm">Enable Graphics Buffer Manager based EGL video output</flag>
<flag name="jpeg">Enable support for saving screenshots in JPEG format</flag>
<flag name="libguess">Enable subtitles charset discovery via <pkg>app-i18n/libguess</pkg></flag>
<flag name="libmpv">Build mpv shared library</flag>
<flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI and <pkg>net-misc/youtube-dl</pkg> hook-script</flag>
<flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
@ -36,7 +38,8 @@
<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
<flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag>
<flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs</flag>
<flag name="vf-dlopen">Install additional video filters for using with -vf dlopen</flag>
<flag name="uchardet">Enable subtitles charset discovery via <pkg>dev-libs/uchardet</pkg></flag>
<flag name="vf-dlopen">Install additional video filters to be used with -vf dlopen</flag>
</use>
<upstream>
<remote-id type="github">mpv-player/mpv</remote-id>

@ -0,0 +1,284 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='threads(+)'
WAF_PV='1.8.12'
inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 waf-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="https://mpv.io/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
inherit git-r3
fi
SRC_URI+=" https://waf.io/waf-${WAF_PV}"
DOCS+=( README.md etc/example.conf etc/input.conf )
# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
LICENSE="GPL-2+ BSD ISC"
SLOT="0"
# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd egl +enca encode +iconv
jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal
+opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux test
uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
REQUIRED_USE="
|| ( cli libmpv )
egl? ( || ( X wayland ) )
enca? ( iconv )
lcms? ( || ( opengl egl ) )
libguess? ( iconv )
luajit? ( lua )
opengl? ( X )
pvr? ( v4l )
uchardet? ( iconv )
v4l? ( || ( alsa oss ) )
vaapi? ( X )
vdpau? ( X )
wayland? ( egl )
xinerama? ( X )
xscreensaver? ( X )
xv? ( X )
"
COMMON_DEPEND="
!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
sys-libs/zlib
alsa? ( >=media-libs/alsa-lib-1.0.18 )
archive? ( >=app-arch/libarchive-3.0.0:= )
bluray? ( >=media-libs/libbluray-0.3.0 )
cdda? ( dev-libs/libcdio-paranoia )
drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
>=media-libs/libdvdnav-4.2.0
>=media-libs/libdvdread-4.1.0
)
egl? ( media-libs/mesa[egl,wayland(-)?] )
iconv? (
virtual/libiconv
enca? ( app-i18n/enca )
libguess? ( >=app-i18n/libguess-1.0 )
uchardet? ( dev-libs/uchardet )
)
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
lcms? ( >=media-libs/lcms-2.6:2 )
libass? (
>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
lua? (
!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
luajit? ( dev-lang/luajit:2 )
)
openal? ( >=media-libs/openal-1.13 )
pulseaudio? ( media-sound/pulseaudio )
rubberband? ( >=media-libs/rubberband-1.8.0 )
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
v4l? ( media-libs/libv4l )
wayland? (
>=dev-libs/wayland-1.6.0
>=x11-libs/libxkbcommon-0.3.0
)
X? (
x11-libs/libX11
x11-libs/libXext
>=x11-libs/libXrandr-1.2.0
opengl? (
x11-libs/libXdamage
virtual/opengl
)
vaapi? ( >=x11-libs/libva-1.2.0[X] )
vdpau? ( >=x11-libs/libvdpau-0.2 )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
)
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
>=dev-lang/perl-5.8
dev-python/docutils
virtual/pkgconfig
doc? ( dev-python/rst2pdf )
test? ( >=dev-util/cmocka-1.0.0 )
"
RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
"
pkg_pretend() {
if ! use libass; then
ewarn "You have disabled the libass support."
ewarn "OSD and subtitles won't be available."
fi
if use openal; then
ewarn "You have enabled the openal audio output. Be warned that"
ewarn "this output is considered experimental by upstream."
fi
if use sdl; then
ewarn "You have enabled the sdl video and audio outputs. Note that"
ewarn "upstream provides these outputs for compatibility reasons only."
ewarn "You probably don't need them under the normal circumstances."
fi
if use libav; then
elog "You have enabled media-video/libav instead of media-video/ffmpeg."
elog "Upstream recommends media-video/ffmpeg, as some functionality"
elog "is not provided by media-video/libav."
fi
einfo "mpv optionally supports many different audio and video formats."
einfo "You will need to enable support for the desired formats in your"
einfo "libavcodec/libavformat provider:"
einfo " media-video/ffmpeg or media-video/libav"
}
src_prepare() {
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
chmod +x "${S}"/waf || die
epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
epatch_user
}
src_configure() {
local mywafargs=(
--confdir="${EPREFIX}"/etc/${PN}
--docdir="${EPREFIX}"/usr/share/doc/${PF}
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)
--disable-libmpv-static
--disable-static-build
--disable-build-date # Create reproducible build
--disable-optimize # Do not add '-O2' to CFLAGS
--disable-debug-build # Do not add '-g' to CFLAGS
$(use_enable doc pdf-build)
$(use_enable vf-dlopen vf-dlopen-filters)
$(use_enable cli zsh-comp)
$(use_enable test)
$(use_enable iconv)
$(use_enable samba libsmbclient)
$(use_enable lua)
$(usex luajit '--lua=luajit' '')
$(use_enable libass)
$(use_enable libass libass-osd)
$(use_enable encode encoding)
$(use_enable bluray libbluray)
$(use_enable dvd dvdread)
$(use_enable dvd dvdnav)
$(use_enable cdda)
$(use_enable enca)
$(use_enable libguess)
$(use_enable uchardet)
$(use_enable rubberband)
$(use_enable lcms lcms2)
--disable-vapoursynth # Only available in overlays
--disable-vapoursynth-lazy
$(use_enable archive libarchive)
--enable-libavfilter
--enable-libavdevice
# Audio outputs
$(use_enable sdl sdl2) # Listed under audio, but also includes video
--disable-sdl1
$(use_enable oss oss-audio)
--disable-rsound # Only available in overlays
$(use_enable pulseaudio pulse)
$(use_enable jack)
$(use_enable openal)
$(use_enable alsa)
--disable-coreaudio
--disable-dsound
--disable-wasapi
# Video outputs
--disable-cocoa
$(use_enable wayland)
$(use_enable X x11)
$(use_enable xscreensaver xss)
$(use_enable X xext)
$(use_enable xv)
$(use_enable xinerama)
$(use_enable X xrandr)
$(use_enable opengl gl-x11)
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
$(use_enable wayland gl-wayland)
$(use_enable vdpau)
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
$(use_enable vaapi)
$(use_enable vaapi vaapi-vpp)
$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
$(use_enable libcaca caca)
$(use_enable drm)
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
# HWaccels
$(use_enable vaapi vaapi-hwaccel)
# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
# TV features
$(use_enable v4l tv)
$(use_enable v4l tv-v4l2)
$(use_enable v4l libv4l2)
$(use_enable v4l audio-input)
$(use_enable pvr)
$(use_enable dvb dvbin)
)
waf-utils_src_configure "${mywafargs[@]}"
}
src_install() {
waf-utils_src_install
if use cli && use luajit; then
pax-mark -m "${ED}usr/bin/${PN}"
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
src_test() {
cd "${S}"/build/test || die
for test in *; do
if [[ -x ${test} ]]; then
./"${test}" || die "Test suite failed"
fi
done
}

@ -0,0 +1,299 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='threads(+)'
WAF_PV='1.8.12'
inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="https://mpv.io/"
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
inherit git-r3
fi
SRC_URI+=" https://waf.io/waf-${WAF_PV}"
DOCS+=( README.md etc/example.conf etc/input.conf )
# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
LICENSE="GPL-2+ BSD ISC"
SLOT="0"
# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
xv"
REQUIRED_USE="
|| ( cli libmpv )
egl? ( || ( gbm X wayland ) )
enca? ( iconv )
gbm? ( drm egl )
lcms? ( || ( opengl egl ) )
libguess? ( iconv )
luajit? ( lua )
opengl? ( X )
uchardet? ( iconv )
v4l? ( || ( alsa oss ) )
vaapi? ( || ( X wayland ) )
vdpau? ( X )
wayland? ( egl )
xinerama? ( X )
xscreensaver? ( X )
xv? ( X )
"
COMMON_DEPEND="
!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
sys-libs/zlib
alsa? ( >=media-libs/alsa-lib-1.0.18 )
archive? ( >=app-arch/libarchive-3.0.0:= )
bluray? ( >=media-libs/libbluray-0.3.0 )
cdda? ( dev-libs/libcdio-paranoia )
drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
>=media-libs/libdvdnav-4.2.0
>=media-libs/libdvdread-4.1.0
)
egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
iconv? (
virtual/libiconv
enca? ( app-i18n/enca )
libguess? ( >=app-i18n/libguess-1.0 )
uchardet? ( dev-libs/uchardet )
)
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
lcms? ( >=media-libs/lcms-2.6:2 )
libass? (
>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
lua? (
!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
luajit? ( dev-lang/luajit:2 )
)
openal? ( >=media-libs/openal-1.13 )
pulseaudio? ( media-sound/pulseaudio )
rubberband? ( >=media-libs/rubberband-1.8.0 )
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
v4l? ( media-libs/libv4l )
vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
wayland? (
>=dev-libs/wayland-1.6.0
>=x11-libs/libxkbcommon-0.3.0
)
X? (
x11-libs/libX11
x11-libs/libXext
>=x11-libs/libXrandr-1.2.0
opengl? (
x11-libs/libXdamage
virtual/opengl
)
vdpau? ( >=x11-libs/libvdpau-0.2 )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
)
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
>=dev-lang/perl-5.8
dev-python/docutils
virtual/pkgconfig
doc? ( dev-python/rst2pdf )
test? ( >=dev-util/cmocka-1.0.0 )
"
RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
"
pkg_pretend() {
if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
fi
if ! use libass; then
ewarn "You have disabled the libass support."
ewarn "OSD and subtitles won't be available."
fi
if use openal; then
ewarn "You have enabled the openal audio output. Be warned that"
ewarn "this output is considered experimental by upstream."
fi
if use sdl; then
ewarn "You have enabled the sdl video and audio outputs. Note that"
ewarn "upstream provides these outputs for compatibility reasons only."
ewarn "You probably don't need them under the normal circumstances."
fi
if use libav; then
elog "You have enabled media-video/libav instead of media-video/ffmpeg."
elog "Upstream recommends media-video/ffmpeg, as some functionality"
elog "is not provided by media-video/libav."
fi
einfo "mpv optionally supports many different audio and video formats."
einfo "You will need to enable support for the desired formats in your"
einfo "libavcodec/libavformat provider:"
einfo " media-video/ffmpeg or media-video/libav"
}
src_prepare() {
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
chmod +x "${S}"/waf || die
epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
epatch "${FILESDIR}/${P}-support-GNU-__thread.patch"
epatch_user
}
src_configure() {
local mywafargs=(
--confdir="${EPREFIX}"/etc/${PN}
--docdir="${EPREFIX}"/usr/share/doc/${PF}
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)
--disable-libmpv-static
--disable-static-build
--disable-build-date # Create reproducible build
--disable-optimize # Do not add '-O2' to CFLAGS
--disable-debug-build # Do not add '-g' to CFLAGS
$(use_enable doc pdf-build)
$(use_enable vf-dlopen vf-dlopen-filters)
$(use_enable cli zsh-comp)
$(use_enable test)
$(use_enable iconv)
$(use_enable samba libsmbclient)
$(use_enable lua)
$(usex luajit '--lua=luajit' '')
$(use_enable libass)
$(use_enable libass libass-osd)
$(use_enable encode encoding)
$(use_enable bluray libbluray)
$(use_enable dvd dvdread)
$(use_enable dvd dvdnav)
$(use_enable cdda)
$(use_enable enca)
$(use_enable libguess)
$(use_enable uchardet)
$(use_enable rubberband)
$(use_enable lcms lcms2)
--disable-vapoursynth # Only available in overlays
--disable-vapoursynth-lazy
$(use_enable archive libarchive)
--enable-libavfilter
--enable-libavdevice
# Audio outputs
$(use_enable sdl sdl2) # Listed under audio, but also includes video
--disable-sdl1
$(use_enable oss oss-audio)
--disable-rsound # Only available in overlays
$(use_enable pulseaudio pulse)
$(use_enable jack)
$(use_enable openal)
$(use_enable alsa)
--disable-coreaudio
--disable-dsound
--disable-wasapi
# Video outputs
--disable-cocoa
$(use_enable drm)
$(use_enable gbm)
$(use_enable wayland)
$(use_enable X x11)
$(use_enable xscreensaver xss)
$(use_enable X xext)
$(use_enable xv)
$(use_enable xinerama)
$(use_enable X xrandr)
$(use_enable opengl gl-x11)
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
$(use_enable wayland gl-wayland)
$(use_enable vdpau)
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
$(use_enable vaapi) # See below for vaapi-x-egl
$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
$(use_enable libcaca caca)
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
# HWaccels
$(use_enable vaapi vaapi-hwaccel)
# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
# TV features
$(use_enable v4l tv)
$(use_enable v4l tv-v4l2)
$(use_enable v4l libv4l2)
$(use_enable v4l audio-input)
$(use_enable dvb dvbin)
)
if use vaapi && use X && use egl; then
mywafargs+=(--enable-vaapi-x-egl)
else
mywafargs+=(--disable-vaapi-x-egl)
fi
waf-utils_src_configure "${mywafargs[@]}"
}
src_install() {
waf-utils_src_install
if use cli && use luajit; then
pax-mark -m "${ED}usr/bin/${PN}"
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
src_test() {
cd "${S}"/build/test || die
for test in *; do
if [[ -x ${test} ]]; then
./"${test}" || die "Test suite failed"
fi
done
}

@ -3,92 +3,86 @@
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE='threads(+)'
inherit eutils python-any-r1 waf-utils pax-utils fdo-mime gnome2-utils
WAF_V="1.8.12"
WAF_PV='1.8.12'
inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="http://mpv.io/"
SRC_URI="http://ftp.waf.io/pub/release/waf-${WAF_V}"
DOCS=( README.md etc/example.conf etc/input.conf )
HOMEPAGE="https://mpv.io/"
if [[ ${PV} == *9999* ]]; then
if [[ ${PV} != *9999* ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
inherit git-r3
else
SRC_URI+=" https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
DOCS+=( RELEASE_NOTES )
fi
SRC_URI+=" https://waf.io/waf-${WAF_PV}"
DOCS+=( README.md etc/example.conf etc/input.conf )
# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
LICENSE="GPL-2+ BSD ISC"
SLOT="0"
IUSE="+alsa bluray cdio +cli doc-pdf drm dvb +dvd egl +enca encode +iconv
jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal
+opengl oss pulseaudio pvr raspberry-pi rubberband samba sdl selinux v4l vaapi
vdpau vf-dlopen wayland +X xinerama +xscreensaver xv"
# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
xv"
REQUIRED_USE="
|| ( cli libmpv )
egl? ( opengl X )
egl? ( || ( gbm X wayland ) )
enca? ( iconv )
lcms? ( opengl )
gbm? ( drm egl )
lcms? ( || ( opengl egl ) )
libguess? ( iconv )
luajit? ( lua )
opengl? ( || ( wayland X ) )
pvr? ( v4l )
vaapi? ( X )
opengl? ( X )
uchardet? ( iconv )
v4l? ( || ( alsa oss ) )
vaapi? ( || ( X wayland ) )
vdpau? ( X )
wayland? ( opengl )
wayland? ( egl )
xinerama? ( X )
xscreensaver? ( X )
xv? ( X )
"
RDEPEND="
libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
COMMON_DEPEND="
!libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
sys-libs/zlib
X? (
x11-libs/libX11
x11-libs/libXext
>=x11-libs/libXrandr-1.2.0
opengl? (
virtual/opengl
egl? ( media-libs/mesa[egl] )
)
lcms? ( >=media-libs/lcms-2.6:2 )
vaapi? ( >=x11-libs/libva-0.34.0[X(+)] )
vdpau? ( >=x11-libs/libvdpau-0.2 )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
)
alsa? ( >=media-libs/alsa-lib-1.0.18 )
archive? ( >=app-arch/libarchive-3.0.0:= )
bluray? ( >=media-libs/libbluray-0.3.0 )
cdio? (
dev-libs/libcdio
dev-libs/libcdio-paranoia
)
cdda? ( dev-libs/libcdio-paranoia )
drm? ( x11-libs/libdrm )
dvb? ( virtual/linuxtv-dvb-headers )
dvd? (
>=media-libs/libdvdread-4.1.3
>=media-libs/libdvdnav-4.2.0
>=media-libs/libdvdread-4.1.0
)
egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
iconv? (
virtual/libiconv
enca? ( app-i18n/enca )
libguess? ( >=app-i18n/libguess-1.0 )
uchardet? ( dev-libs/uchardet )
)
enca? ( app-i18n/enca )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
jpeg? ( virtual/jpeg:0 )
lcms? ( >=media-libs/lcms-2.6:2 )
libass? (
>=media-libs/libass-0.12.1:=[enca(-)?,fontconfig]
>=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
virtual/ttf-fonts
)
libcaca? ( >=media-libs/libcaca-0.99_beta18 )
libguess? ( >=app-i18n/libguess-1.0 )
lua? (
!luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
luajit? ( dev-lang/luajit:2 )
@ -97,61 +91,75 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio )
rubberband? ( >=media-libs/rubberband-1.8.0 )
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl2[threads] )
sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
v4l? ( media-libs/libv4l )
vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
wayland? (
>=dev-libs/wayland-1.6.0
media-libs/mesa[egl,wayland]
>=x11-libs/libxkbcommon-0.3.0
)
X? (
x11-libs/libX11
x11-libs/libXext
>=x11-libs/libXrandr-1.2.0
opengl? (
x11-libs/libXdamage
virtual/opengl
)
vdpau? ( >=x11-libs/libvdpau-0.2 )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
)
"
DEPEND="${RDEPEND}
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
virtual/pkgconfig
>=dev-lang/perl-5.8
dev-python/docutils
doc-pdf? ( dev-python/rst2pdf )
X? (
x11-proto/videoproto
xinerama? ( x11-proto/xineramaproto )
xscreensaver? ( x11-proto/scrnsaverproto )
)
virtual/pkgconfig
doc? ( dev-python/rst2pdf )
test? ( >=dev-util/cmocka-1.0.0 )
"
RDEPEND+="
RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
"
pkg_setup() {
pkg_pretend() {
if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
fi
if ! use libass; then
ewarn "You have disabled the libass flag. No OSD or subtitles will be displayed."
ewarn "You have disabled the libass support."
ewarn "OSD and subtitles won't be available."
fi
if use openal; then
ewarn "You have enabled the openal audio output which is a fallback"
ewarn "and disabled by upstream."
ewarn "You have enabled the openal audio output. Be warned that"
ewarn "this output is considered experimental by upstream."
fi
if use sdl; then
ewarn "You have enabled the sdl video and audio outputs which are fallbacks"
ewarn "and disabled by upstream."
ewarn "You have enabled the sdl video and audio outputs. Note that"
ewarn "upstream provides these outputs for compatibility reasons only."
ewarn "You probably don't need them under the normal circumstances."
fi
if use libav; then
einfo "You have enabled media-video/libav instead of media-video/ffmpeg."
einfo "Upstream recommends media-video/ffmpeg, as some functionality is not"
einfo "provided by media-video/libav."
elog "You have enabled media-video/libav instead of media-video/ffmpeg."
elog "Upstream recommends media-video/ffmpeg, as some functionality"
elog "is not provided by media-video/libav."
fi
einfo "For additional format support you need to enable the support on your"
einfo "mpv optionally supports many different audio and video formats."
einfo "You will need to enable support for the desired formats in your"
einfo "libavcodec/libavformat provider:"
einfo " media-video/ffmpeg or media-video/libav"
python-any-r1_pkg_setup
}
src_prepare() {
cp "${DISTDIR}"/waf-${WAF_V} "${S}"/waf || die
chmod 0755 "${S}"/waf || die
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
chmod +x "${S}"/waf || die
epatch_user
}
@ -159,49 +167,61 @@ src_configure() {
local mywafargs=(
--confdir="${EPREFIX}"/etc/${PN}
--docdir="${EPREFIX}"/usr/share/doc/${PF}
$(usex cli '' '--disable-cplayer')
$(use_enable libmpv libmpv-shared)
--disable-libmpv-static
--disable-build-date # keep build reproducible
--disable-optimize # do not add '-O2' to CFLAGS
--disable-debug-build # do not add '-g' to CFLAGS
--disable-test # avoid dev-util/cmocka automagic
$(use_enable doc-pdf pdf-build)
--disable-static-build
--disable-build-date # Create reproducible build
--disable-optimize # Do not add '-O2' to CFLAGS
--disable-debug-build # Do not add '-g' to CFLAGS
$(use_enable doc pdf-build)
$(use_enable vf-dlopen vf-dlopen-filters)
$(use_enable cli zsh-comp)
$(use_enable test)
# optional features
$(use_enable iconv)
$(use_enable libguess)
$(use_enable samba libsmbclient)
$(use_enable lua)
$(usex luajit '--lua=luajit' '')
$(use_enable libass)
$(use_enable libass libass-osd)
$(use_enable encode encoding)
$(use_enable bluray libbluray)
$(use_enable dvd dvdread)
$(use_enable dvd dvdnav)
$(use_enable cdio cdda)
$(use_enable cdda)
$(use_enable enca)
$(use_enable libguess)
$(use_enable uchardet)
$(use_enable rubberband)
$(use_enable lcms lcms2)
--disable-vapoursynth # vapoursynth is not packaged
--disable-vapoursynth # Only available in overlays
--disable-vapoursynth-lazy
$(use_enable archive libarchive)
--enable-libavfilter
--enable-libavdevice
$(usex luajit '--lua=luajit' '')
# audio outputs
$(use_enable sdl sdl2) # SDL output is fallback for platforms where nothing better is available
# Audio outputs
$(use_enable sdl sdl2) # Listed under audio, but also includes video
--disable-sdl1
$(use_enable oss oss-audio)
--disable-rsound # media-sound/rsound is in pro-audio overlay only
--disable-rsound # Only available in overlays
$(use_enable pulseaudio pulse)
$(use_enable jack)
$(use_enable openal)
$(use_enable alsa)
--disable-coreaudio
--disable-dsound
--disable-wasapi
# video outputs
# Video outputs
--disable-cocoa
$(use_enable drm)
$(use_enable gbm)
$(use_enable wayland)
$(use_enable X x11)
$(use_enable xscreensaver xss)
@ -209,29 +229,38 @@ src_configure() {
$(use_enable xv)
$(use_enable xinerama)
$(use_enable X xrandr)
$(usex X "$(use_enable opengl gl-x11)" '--disable-gl-x11')
$(use_enable egl egl-x11)
$(usex wayland "$(use_enable opengl gl-wayland)" '--disable-gl-wayland')
$(use_enable opengl gl)
$(use_enable opengl gl-x11)
$(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
$(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
$(use_enable wayland gl-wayland)
$(use_enable vdpau)
$(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
$(use_enable vaapi)
$(use_enable vaapi) # See below for vaapi-x-egl
$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
$(use_enable libcaca caca)
$(use_enable drm)
$(use_enable jpeg)
$(use_enable raspberry-pi rpi)
# hwaccels
# HWaccels
$(use_enable vaapi vaapi-hwaccel)
# Automagic VDPAU HW acceleration. See Gentoo bug 558870.
# tv features
# TV features
$(use_enable v4l tv)
$(use_enable v4l tv-v4l2)
$(use_enable v4l libv4l2)
$(use_enable pvr)
$(use_enable v4l audio-input)
$(use_enable dvb dvbin)
)
if use vaapi && use X && use egl; then
mywafargs+=(--enable-vaapi-x-egl)
else
mywafargs+=(--disable-vaapi-x-egl)
fi
waf-utils_src_configure "${mywafargs[@]}"
}
@ -239,7 +268,7 @@ src_install() {
waf-utils_src_install
if use cli && use luajit; then
pax-mark -m "${ED}"usr/bin/mpv
pax-mark -m "${ED}usr/bin/${PN}"
fi
}
@ -256,3 +285,12 @@ pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
src_test() {
cd "${S}"/build/test || die
for test in *; do
if [[ -x ${test} ]]; then
./"${test}" || die "Test suite failed"
fi
done
}

@ -1 +1 @@
Mon, 28 Dec 2015 05:14:10 +0000
Mon, 28 Dec 2015 20:13:52 +0000

@ -1 +1 @@
Mon, 28 Dec 2015 05:14:11 +0000
Mon, 28 Dec 2015 20:13:52 +0000

@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=|| ( >=sys-apps/portage-2.1.6 sys-apps/pkgcore sys-apps/paludis )
SLOT=0
SRC_URI=mirror://hackage/packages/archive/haskell-updater/1.2.1/haskell-updater-1.2.1.tar.gz
_eclasses_=eutils d9bd2ddd85a58e470b49ca997e255a4c ghc-package 6165faf4ae46df43d5a9b0dd28ec8654 haskell-cabal 2d9bae28d8a91ec04d1bb1ef0071c64f multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_eclasses_=eutils d9bd2ddd85a58e470b49ca997e255a4c ghc-package 892c6c35a9ac0993e65049c039438508 haskell-cabal 2d9bae28d8a91ec04d1bb1ef0071c64f multilib 3972ca401cf7dbb430df9995f5d8d580 multiprocessing e32940a7b2a9992ad217eccddb84d548 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=88baf031cbb93baa6d493741813da243

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save