diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
similarity index 94%
rename from app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild
rename to app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
index 2143895237e4..1ff21245107c 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.1.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.1-r1.ebuild
@@ -28,7 +28,7 @@ src_install() {
exeinto /usr/share/easy-rsa
doexe easyrsa
insinto /usr/share/easy-rsa
- doins vars.example openssl-1.0.cnf x509-types
+ doins -r vars.example openssl-1.0.cnf x509-types
dodoc README.quickstart.md ChangeLog
dodoc -r doc
doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
diff --git a/app-eselect/eselect-python/eselect-python-99999999.ebuild b/app-eselect/eselect-python/eselect-python-99999999.ebuild
index 52eb0ceceb52..dbfcd6cf0118 100644
--- a/app-eselect/eselect-python/eselect-python-99999999.ebuild
+++ b/app-eselect/eselect-python/eselect-python-99999999.ebuild
@@ -19,8 +19,9 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
+# python-exec-2.4.2 for working -l option
RDEPEND=">=app-admin/eselect-1.2.3
- >=dev-lang/python-exec-2.3"
+ >=dev-lang/python-exec-2.4.2"
src_prepare() {
[[ ${PV} == "99999999" ]] && eautoreconf
diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest
new file mode 100644
index 000000000000..e1f1e8154335
--- /dev/null
+++ b/app-i18n/translate-shell/Manifest
@@ -0,0 +1 @@
+DIST translate-shell-0.9.3.tar.gz 66134 SHA256 cb0da68cc984cb275e3c8fddfb1b56a846cef41dad729890ad9b3d7ef35dc807 SHA512 8656be0cdacfe5c26cf26c748479def1603d633545f4770ed1da2cf36c0ec72e99f5d34b38eb9b90327b563c0fbf68281ea13d6b22ee73d426030e8c2e35dc1b WHIRLPOOL 8c48da9e6b4c79cae63cd17bed045ba0ae741d157960f2c6f5ea0ca352c09735a5b2caa9e288cc8ec22c6c6768f0c68d9f4ed98bb886f872562020208c526333
diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml
new file mode 100644
index 000000000000..71fec8427a74
--- /dev/null
+++ b/app-i18n/translate-shell/metadata.xml
@@ -0,0 +1,22 @@
+
+
+
+ Translate Shell (formerly Google Translate CLI) is a command-line translator powered by Google Translate (default), Bing Translator, and Yandex.Translate.
+
+ proxy-maint@gentoo.org
+ Gentoo Proxy Maintainers Project
+
+
+ patrick@gentoo.org
+ Patrick Lauer
+
+
+ erkiferenc@gmail.com
+ Ferenc Erki
+ Proxied maintainer; set to assignee in all bugs
+
+
+
diff --git a/app-i18n/translate-shell/translate-shell-0.9.3.ebuild b/app-i18n/translate-shell/translate-shell-0.9.3.ebuild
new file mode 100644
index 000000000000..339331f5151d
--- /dev/null
+++ b/app-i18n/translate-shell/translate-shell-0.9.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Online command-line translator"
+HOMEPAGE="https://www.soimort.org/translate-shell/"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+curl fribidi test tts"
+
+RDEPEND="
+ app-misc/rlwrap
+ >=sys-apps/gawk-4.0.2
+ curl? ( net-misc/curl[ssl] )
+ fribidi? ( dev-libs/fribidi )
+ tts? ( || (
+ media-sound/mpg123
+ app-accessibility/espeak
+ media-video/mpv
+ media-video/mplayer
+ )
+ )"
+DEPEND="${RDEPEND}
+ test? ( app-editors/emacs )
+ "
+
+src_install() {
+ emake PREFIX="${D}/usr" install
+}
diff --git a/app-shells/zsh-completions/Manifest b/app-shells/zsh-completions/Manifest
index 036503c4e42f..f14f84c10a42 100644
--- a/app-shells/zsh-completions/Manifest
+++ b/app-shells/zsh-completions/Manifest
@@ -1,2 +1,2 @@
-DIST zsh-completions-0.12.0.tar.gz 193410 SHA256 770d92749b11b22192595b207208508f8bfa319d5d03210a71bc44c8b9cfa0d5 SHA512 3c6b19f10d9598f40cf37ca5c5828e5652b0cad144d48ca681f5a16c1921c308f8cd3d9b8a2dd1c50ddbf167d4bb2e2e5299d1e30591971f4c7d9b28c2250feb WHIRLPOOL 7c5a1cb45d2e045fb0f8eb64deb8d87cab506f11b94996b9ff6cb169fd20672040bdc624de78a58ab5908d2222130de93a179a8e00d5aa75365af0ab0566852a
DIST zsh-completions-0.14.0.tar.gz 199317 SHA256 54e4f5aad66acd729c46f589dc0b9f2a518b453892e4c21e495f33bb959c7eef SHA512 fd2fa683c5990fba9dfa12e839d70c24b7821b487175f5c51d603d21a494f7e9e921628fdd8fff1c02f8c2f52ac1fba1f48638da6a356240e0b7806c1b747ec2 WHIRLPOOL 28df4d93c0bf80bd5c3bb2c189897042e0cfd99fef77492adfe410dca96e140a8e654c0a896b45991f3605822a209d6561f7b196344b704ccd718f0a284f3e28
+DIST zsh-completions-0.15.0.tar.gz 217047 SHA256 358c576a44247959966d65f673d2861f232dbef04457954d9ac06e1f5315ca51 SHA512 d4670eb960bf620d627e57ec8dfd92bfba004ccffbbbc3f5e1209fe1569f99477cdd7105837fc6052c7b017c8d0216a44505f60c69abf00031927e6f457c931d WHIRLPOOL b0ceed917498dd3ef843fcca73b6fc730055df3996e0dd19317c0591817662e9b4cf7a69d87dacddf3efd5e484e2d807b65bb4beec84fadc57b5f1b2864fc54c
diff --git a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild b/app-shells/zsh-completions/zsh-completions-0.15.0.ebuild
similarity index 80%
rename from app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
rename to app-shells/zsh-completions/zsh-completions-0.15.0.ebuild
index 3c772cbf82da..e5b1d5f40bc0 100644
--- a/app-shells/zsh-completions/zsh-completions-0.12.0-r2.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,13 +20,6 @@ SLOT="0"
RDEPEND="app-shells/zsh"
-src_prepare() {
- # File collision with dev-python/pip
- rm src/_pip || die
- # File collision with app-emulation/docker
- rm src/_docker || die
-}
-
src_install() {
insinto /usr/share/zsh/site-functions
doins src/_*
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index d290cb6eb5ed..60d6f4616d96 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,3 +1,4 @@
DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
DIST highlight-3.25.tar.bz2 626492 SHA256 d8a9b8989c8b4108de0a76ceb585a5777ab308a339a667a9b05ee3d059dade26 SHA512 c0249283e7c26b565170c4686fb28ddd0565716ddcd38a52cbfde03051558f4c1baf7b2605e33e1799afb7dfb79b053fffa70827d5d8dcaf42a344076d26fb11 WHIRLPOOL d2f8ae06a9b48dd88432d9550d6e456f3a3177194af72ee26023ea110046a55ea9031104e9a397bfd316d3b4c0a1f557cefaa73165bc54308725f71a7e89f1e6
DIST highlight-3.27.tar.bz2 620054 SHA256 9d0aa72d434fa22acde50ceafb165efcd03799335396b24b134a5632387cf7b0 SHA512 171bf90c07fccfc00c8fac6328c84703642a43e7291d6e32fabd3f6d99793b8cbbe9bbdcbcf3054868725f01fac0ed30902bd30f231bc31a98d56b29f9acefb3 WHIRLPOOL 6d3c93756c78109ffee69080bf4f5e414e1808ad06854f84816352206314df8212c89f5b71234f8f33bf5693ca749c23abad88630e0eda4b63bc25466fc70583
+DIST highlight-3.28.tar.bz2 622161 SHA256 36364b6d906148dac04426a0c892fe2343e5e2c752316666589f8dff741ce7cd SHA512 f0d5d9b4635da5fcf75ba5fd11cbb308c0e8c00b8bdaff5769b7e0c2756d8e0b34b46299eaf4396b99bba69562bec96757342e0187abcf7a52277e37dff9b1fd WHIRLPOOL eb7ed0ff8f29b1fb23b14f1cb5745d562c7778a1bcd69a30e70b9e7c5f2572549d10119d128378107fb12a29803c04c1691b8c690d4ca931817b276125a7b934
diff --git a/app-text/highlight/highlight-3.28.ebuild b/app-text/highlight/highlight-3.28.ebuild
new file mode 100644
index 000000000000..df1763b6c626
--- /dev/null
+++ b/app-text/highlight/highlight-3.28.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qtcore:4
+ )"
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ virtual/pkgconfig"
+
+src_prepare() {
+ sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+ src/core/datadir.cpp || die
+
+ if has_version '=dev-games/openscenegraph-3.2.0
+ media-libs/openal
+ sys-libs/zlib
+ virtual/opengl
+ curl? ( net-misc/curl )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+"
+RDEPEND="${COMMON_DEPEND}
+ subversion? ( dev-vcs/subversion )
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_CURL=$(usex curl)
+ -DENABLE_PKGUTIL=ON
+ -DENABLE_RTI=OFF
+ -DENABLE_SOUND=ON
+ -DENABLE_TESTS=$(usex test)
+ -DSIMGEAR_HEADLESS=OFF
+ -DSIMGEAR_SHARED=ON
+ -DSYSTEM_EXPAT=ON
+ )
+ cmake-utils_src_configure
+}
diff --git a/dev-java/bsh/Manifest b/dev-java/bsh/Manifest
index d0f694b078b5..721210cfd89c 100644
--- a/dev-java/bsh/Manifest
+++ b/dev-java/bsh/Manifest
@@ -1,2 +1,3 @@
DIST beanshell-icon.png 29784 SHA256 a3df458c6e892ec328e8865f081da8c3f3d9ff4c979ecb701a57fc7cedacdef9 SHA512 731cc0e39e69ef84230e2cea8f9eaf00f80b607c70d83f767d600d8f76fae024516e9b97a988bfcb1ad963da279a6b97ad2559bb8213dc9aaa23c65aa5946d45 WHIRLPOOL 018f8915426bb77bcb62e9f811a51436c6467e01b4d24fc4e2ddb92a3635c18ab1ba7f3154e74fdaccd1621a81b7fc735e53b7cb09caffcd8c103f5462e71e77
DIST bsh-2.0b4-src.jar 1636723 SHA256 beaa29a8bcbd00db2563a5a9f0fdcfa8ae268e959880baef0a59167ff1729f8e SHA512 867e960420f8ad0f49ffa1c7cb291ddc64e75dc20f91bd33b91151e9ba96033250b94efbf8e3d4b8d4f8c7193017efcb88840536080809ecb45e2ee0fb8e9040 WHIRLPOOL 1dc8f6d3600ca22fbf993ccb6aafa3954b1d2127f0940cbe84468aa8f323ad69b02c2a3619435ee0e6e1024e1784e57e138f781314ac735f01b909629e074109
+DIST bsh-2.0b6.zip 1994608 SHA256 25e4ca61c198c3268a52d318736ecab9e2d8868c15ba121547df0c39f452bafd SHA512 ce461cc74bc48580c636c2f2e55e4e734a2b2075547cc5663722866e5c978a680051131c13240afb586a777ab93165119d1f96f9623bd9747f8e7d8293dd3bcf WHIRLPOOL 35251126719af7ab6e3aae3a0dc3680221578198ed4b38ee9717a83bd9ef06b11b99d033a47a65feeb00ab1bdeebfe97832e4ec35026f644470114506d6ef177
diff --git a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
index 0952aaef5c98..d299c6041876 100644
--- a/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
+++ b/dev-java/bsh/bsh-2.0_beta4-r4.ebuild
@@ -54,7 +54,7 @@ src_test() {
}
src_install() {
- java-pkg_newjar dist/${P/_beta/b}.jar
+ java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
java-pkg_dolauncher bsh-console --main bsh.Console
java-pkg_dolauncher bsh-interpreter --main bsh.Interpreter
diff --git a/dev-java/bsh/bsh-2.0_beta6.ebuild b/dev-java/bsh/bsh-2.0_beta6.ebuild
new file mode 100644
index 000000000000..ec71d7ad3b89
--- /dev/null
+++ b/dev-java/bsh/bsh-2.0_beta6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+MY_PN="beanshell"
+MY_BETA="b6"
+MY_PV="${PV%%_*}"
+MY_P="${PN}-${MY_PV}${MY_BETA}"
+
+DESCRIPTION="A small embeddable Java source interpreter"
+HOMEPAGE="https://github.com/beanshell/beanshell"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/${MY_PV}${MY_BETA}.zip -> ${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+CDEPEND="
+ dev-java/bsf:2.3
+ java-virtuals/servlet-api:3.0
+"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-java/ant-junit:0
+ )
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}${MY_BETA}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_BUILD_TARGET="jarall"
+EANT_DOC_TARGET="javadoc"
+EANT_GENTOO_CLASSPATH="
+ bsf-2.3
+ servlet-api-3.0
+"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+EANT_TEST_TARGET="test"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "dist/${MY_P}.jar" "${PN}.jar"
+
+ java-pkg_dolauncher "${PN}-console" --main bsh.Console
+ java-pkg_dolauncher "${PN}-interpreter" --main bsh.Interpreter
+
+ use doc && java-pkg_dohtml -r javadoc
+ use source && java-pkg_dosrc src/bsh
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild
new file mode 100644
index 000000000000..bf5ae693af44
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.0.2-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.0"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-src.zip"
+SRC_URI="${SOURCE_URL}
+ http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.0.2-build.xml.patch.bz2
+ http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+ http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+ http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+ http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+ http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+ http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+ http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+ http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+ http://hg.netbeans.org/binaries/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip
+ http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+ http://hg.netbeans.org/binaries/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar
+ http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+ http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+ http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+ http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+ http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+ http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+ http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+ http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+ http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+ http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+ http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+ http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+ http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+ http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+ http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+ http://hg.netbeans.org/binaries/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip
+ http://hg.netbeans.org/binaries/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip
+ http://hg.netbeans.org/binaries/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip
+ http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+ http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+ http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+ http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+ http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+ http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+ http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+ http://hg.netbeans.org/binaries/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar
+ http://hg.netbeans.org/binaries/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar
+ http://hg.netbeans.org/binaries/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar
+ http://hg.netbeans.org/binaries/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar
+ http://hg.netbeans.org/binaries/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar
+ http://hg.netbeans.org/binaries/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar
+ http://hg.netbeans.org/binaries/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar
+ http://hg.netbeans.org/binaries/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar
+ http://hg.netbeans.org/binaries/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar
+ http://hg.netbeans.org/binaries/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar
+ http://hg.netbeans.org/binaries/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar
+ http://hg.netbeans.org/binaries/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar
+ http://hg.netbeans.org/binaries/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar
+ http://hg.netbeans.org/binaries/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar
+ http://hg.netbeans.org/binaries/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar
+ http://hg.netbeans.org/binaries/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar
+ http://hg.netbeans.org/binaries/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar
+ http://hg.netbeans.org/binaries/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar
+ http://hg.netbeans.org/binaries/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar
+ http://hg.netbeans.org/binaries/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar
+ http://hg.netbeans.org/binaries/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar
+ http://hg.netbeans.org/binaries/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar
+ http://hg.netbeans.org/binaries/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar
+ http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+ http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+ http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+ http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+ http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+ http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+ http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+ http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+ http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+ http://hg.netbeans.org/binaries/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar
+ http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+ http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+ http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+ http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+ http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+ http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+ ~dev-java/netbeans-platform-${PV}
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/icu4j:55
+ dev-java/iso-relax:0
+ dev-java/jdbc-mysql:0
+ dev-java/jdbc-postgresql:0
+ >=dev-java/json-simple-1.1:0
+ dev-java/jsr173:0
+ dev-java/jvyamlb:0
+ dev-java/log4j:0
+ dev-java/lucene:3.5
+ dev-java/rhino:1.6
+ dev-java/saxon:9
+ dev-java/smack:2.2
+ dev-java/sun-jaf:0
+ dev-java/tomcat-servlet-api:2.2
+ dev-java/ws-commons-util:0
+ dev-java/xerces:2"
+# dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+# app-text/jing:0 our version is probably too old
+# dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+# dev-java/freemarker:2.3
+# dev-java/ini4j:0 our version is too old
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+# dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.7
+ app-arch/unzip
+ dev-java/commons-codec:0
+ >=dev-java/jsch-0.1.46:0
+ dev-java/jzlib:0
+ ${CDEPEND}
+ dev-java/javacc:0
+ dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+ ${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+ unpack $(basename ${SOURCE_URL})
+
+ einfo "Deleting bundled jars..."
+ find -name "*.jar" -type f -delete
+
+ unpack netbeans-8.0.2-build.xml.patch.bz2
+
+ pushd "${S}" >/dev/null || die
+ ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+ ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+ ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+ ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+ ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+ ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+ ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+ ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+ ln -s "${DISTDIR}"/C40DFDACDF892D1BA14B540B32C11B6F34659931-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+ ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+ ln -s "${DISTDIR}"/75C30C488AD2A18A82C7FE3829F4A33FC7841643-glassfish-tooling-sdk-0.3-b054-246345.jar libs.glassfish.sdk/external/glassfish-tooling-sdk-0.3-b054-246345.jar || die
+ ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+ ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+ ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+ ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+ ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+ ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+ ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+ ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+ ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+ ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+ ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+ ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+ ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+ ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+ ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+ ln -s "${DISTDIR}"/DA6CE3C2EB334DB61EFA99CD66134619867368FA-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+ ln -s "${DISTDIR}"/997BF4A93B8A99E37AB51C9016D1D18CF5FF4B60-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+ ln -s "${DISTDIR}"/A723CD3E76C92CFE563B602035532C1C9D3D7192-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+ ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+ ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+ ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+ ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+ ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.impl/external/libpam4j-1.1.jar || die
+ ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+ ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+ ln -s "${DISTDIR}"/7052E115041D04410A4519A61307502FB7C138E6-org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar || die
+ ln -s "${DISTDIR}"/B19A4D998C76FE7A30830C96B9E3A47682F320FC-org.eclipse.core.jobs-3.5.101.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101.jar || die
+ ln -s "${DISTDIR}"/E64EF6A3FC5DB01AD95632B843706CCE56614C90-org.eclipse.core.net_1.2.100.I20110511-0800.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800.jar || die
+ ln -s "${DISTDIR}"/6658C235056134F7E86295E751129508802D71F2-org.eclipse.core.runtime-3.7.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0.jar || die
+ ln -s "${DISTDIR}"/0CA9B9DF8A8E4C6805C60A5761C470FCE8AE828F-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar || die
+ ln -s "${DISTDIR}"/9C74D245214DB08E7EB9BC07A951B41CFE3E3648-org.eclipse.equinox.app-1.3.100.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100.jar || die
+ ln -s "${DISTDIR}"/78E5D0B8516B042495660DA36CE5114650F8F156-org.eclipse.equinox.common_3.6.0.v20110523.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523.jar || die
+ ln -s "${DISTDIR}"/FD94003A1BCE42008753522BFED68E5A84B92644-org.eclipse.equinox.preferences-3.4.2.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2.jar || die
+ ln -s "${DISTDIR}"/54AE046B40C9095C2637F8D21664C5CD76E34485-org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar || die
+ ln -s "${DISTDIR}"/0FFB9B1D7CD992CE6C8AAEEC2F6F98DFBB1D2F91-org.eclipse.equinox.security-1.1.1.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1.jar || die
+ ln -s "${DISTDIR}"/7FE73A21F4A078ABAAFACE4D2B03B5EB3D306F63-org.eclipse.jgit-3.4.1.201406201815-r.jar o.eclipse.jgit/external/org.eclipse.jgit-3.4.1.201406201815-r.jar || die
+ ln -s "${DISTDIR}"/49F1EFEBC8CECA5D514209BE18A048EB5707C0A7-org.eclipse.jgit.java7-3.4.1.201406201815-r.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.4.1.201406201815-r.jar || die
+ ln -s "${DISTDIR}"/A94F8F805202B28236FFBC03C1CA149129DAEA1C-org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.10.0.20131024-1218.jar || die
+ ln -s "${DISTDIR}"/19D64C17A692D2023E22B16AD515118DF6427790-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710.jar || die
+ ln -s "${DISTDIR}"/A1BF01D1DD09274446738C3F83360314B8881CD5-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210.jar || die
+ ln -s "${DISTDIR}"/136A7EB3BB9B2559C5F9184B438F108C959B3C03-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116.jar || die
+ ln -s "${DISTDIR}"/531746EBE57071AB7F8CCC7ACB0E806F25893916-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116.jar || die
+ ln -s "${DISTDIR}"/D3ED088A49DE9E5163457E9279181DD4185BFBE6-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023.jar || die
+ ln -s "${DISTDIR}"/8D4278A9F47D17A104182E59CF06D682B3DE0B3E-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055.jar || die
+ ln -s "${DISTDIR}"/1FC011B8A350B70950B3F1D722D7F2890C6E76D8-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055.jar || die
+ ln -s "${DISTDIR}"/6E914CA3075C8FDF7652F04A02868CF32F2EDCE3-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055.jar || die
+ ln -s "${DISTDIR}"/8A2F6232978E0330A5D36F19BA0686F96FB980B5-org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.4.r10218_v20140302_1242.jar || die
+ ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+ ln -s "${DISTDIR}"/820FD32B3FB7F885996B15474F220BDCCACD6D27-processtreekiller-1.0.2.jar extexecution.impl/external/processtreekiller-1.0.2.jar || die
+ ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+ ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+ ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+ ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+ ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+ ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+ ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+ ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+ ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+ ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+ ln -s "${DISTDIR}"/CE9A1C96875443F2FDD5127B750DA39CF4CE818B-com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build217_r155_v20130603_1628.jar || die
+ ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+ ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+ ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+ ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+ ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+ ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.impl/external/winp-1.14-patched.jar || die
+ popd >/dev/null || die
+}
+
+src_prepare() {
+ einfo "Deleting bundled class files..."
+ find -name "*.class" -type f | xargs rm -vf
+
+ epatch netbeans-8.0.2-build.xml.patch
+
+ # Support for custom patches
+ if [ -n "${NETBEANS80_PATCHES_DIR}" -a -d "${NETBEANS80_PATCHES_DIR}" ] ; then
+ local files=`find "${NETBEANS80_PATCHES_DIR}" -type f`
+
+ if [ -n "${files}" ] ; then
+ einfo "Applying custom patches:"
+
+ for file in ${files} ; do
+ epatch "${file}"
+ done
+ fi
+ fi
+
+ einfo "Symlinking external libraries..."
+ java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+ java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+ einfo "Linking in other clusters..."
+ mkdir "${S}"/nbbuild/netbeans || die
+ pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+ ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+ cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.platform.built
+
+ ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+ cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.harness.built
+
+ popd >/dev/null || die
+
+ java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.49.jar
+ java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+ java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+ java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+ java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+ java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+ java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+ # java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+ java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+ # java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+ java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+ java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+ java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+ java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+ java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+ java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+ java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+ java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+ java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+ pushd nbbuild/netbeans/ide >/dev/null || die
+
+ insinto ${INSTALL_DIR}
+
+ grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+ doins -r *
+ rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+ rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+ insinto ${INSTALL_DIR}/bin/nativeexecution
+ doins bin/nativeexecution/*
+
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+ for file in *.sh ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+
+ if use x86 ; then
+ doins -r bin/nativeexecution/Linux-x86
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ elif use amd64 ; then
+ doins -r bin/nativeexecution/Linux-x86_64
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ fi
+
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext
+ pushd "${D}"/${instdir} >/dev/null || die
+ # rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+ rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+ rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+ rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+ rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+ rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+ rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+ rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+ rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+ rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+ rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+ rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+ rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+ # rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+ rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+ popd >/dev/null || die
+
+ dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild
new file mode 100644
index 000000000000..cc3491604922
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-8.1-r1.ebuild
@@ -0,0 +1,377 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="8.1"
+SOURCE_URL="http://download.netbeans.org/netbeans/8.1/final/zip/netbeans-8.1-201510222201-src.zip"
+SRC_URI="${SOURCE_URL}
+ http://dev.gentoo.org/~fordfrog/distfiles/netbeans-8.1-build.xml.patch.bz2
+ http://hg.netbeans.org/binaries/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar
+ http://hg.netbeans.org/binaries/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar
+ http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+ http://hg.netbeans.org/binaries/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar
+ http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+ http://hg.netbeans.org/binaries/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar
+ http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+ http://hg.netbeans.org/binaries/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip
+ http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+ http://hg.netbeans.org/binaries/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip
+ http://hg.netbeans.org/binaries/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar
+ http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+ http://hg.netbeans.org/binaries/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar
+ http://hg.netbeans.org/binaries/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip
+ http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+ http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+ http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+ http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+ http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+ http://hg.netbeans.org/binaries/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar
+ http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+ http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+ http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+ http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+ http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+ http://hg.netbeans.org/binaries/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar
+ http://hg.netbeans.org/binaries/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar
+ http://hg.netbeans.org/binaries/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip
+ http://hg.netbeans.org/binaries/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip
+ http://hg.netbeans.org/binaries/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip
+ http://hg.netbeans.org/binaries/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar
+ http://hg.netbeans.org/binaries/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar
+ http://hg.netbeans.org/binaries/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar
+ http://hg.netbeans.org/binaries/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar
+ http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+ http://hg.netbeans.org/binaries/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar
+ http://hg.netbeans.org/binaries/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar
+ http://hg.netbeans.org/binaries/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar
+ http://hg.netbeans.org/binaries/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar
+ http://hg.netbeans.org/binaries/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar
+ http://hg.netbeans.org/binaries/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar
+ http://hg.netbeans.org/binaries/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar
+ http://hg.netbeans.org/binaries/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar
+ http://hg.netbeans.org/binaries/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar
+ http://hg.netbeans.org/binaries/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar
+ http://hg.netbeans.org/binaries/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar
+ http://hg.netbeans.org/binaries/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar
+ http://hg.netbeans.org/binaries/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar
+ http://hg.netbeans.org/binaries/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar
+ http://hg.netbeans.org/binaries/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar
+ http://hg.netbeans.org/binaries/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar
+ http://hg.netbeans.org/binaries/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar
+ http://hg.netbeans.org/binaries/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar
+ http://hg.netbeans.org/binaries/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar
+ http://hg.netbeans.org/binaries/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar
+ http://hg.netbeans.org/binaries/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar
+ http://hg.netbeans.org/binaries/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar
+ http://hg.netbeans.org/binaries/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar
+ http://hg.netbeans.org/binaries/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar
+ http://hg.netbeans.org/binaries/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar
+ http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+ http://hg.netbeans.org/binaries/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar
+ http://hg.netbeans.org/binaries/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar
+ http://hg.netbeans.org/binaries/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar
+ http://hg.netbeans.org/binaries/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar
+ http://hg.netbeans.org/binaries/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar
+ http://hg.netbeans.org/binaries/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar
+ http://hg.netbeans.org/binaries/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar
+ http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+ http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+ http://hg.netbeans.org/binaries/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar
+ http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+ http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+ http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+ http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+ ~dev-java/netbeans-platform-${PV}
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/icu4j:55
+ dev-java/iso-relax:0
+ dev-java/jdbc-mysql:0
+ dev-java/jdbc-postgresql:0
+ >=dev-java/jsch-0.1.46:0
+ >=dev-java/json-simple-1.1:0
+ dev-java/jsr173:0
+ dev-java/jzlib:0
+ dev-java/jvyamlb:0
+ dev-java/log4j:0
+ dev-java/lucene:3.5
+ dev-java/rhino:1.6
+ dev-java/saxon:9
+ dev-java/smack:2.2
+ dev-java/sun-jaf:0
+ dev-java/tomcat-servlet-api:2.2
+ dev-java/ws-commons-util:0
+ dev-java/xerces:2"
+# dev-vcs/subversion>=1.8.4:0[java] missing from the tree
+# app-text/jing:0 our version is probably too old
+# dev-java/commons-io:1 fails with "Missing manifest tag OpenIDE-Module"
+# dev-java/freemarker:2.3
+# dev-java/ini4j:0 our version is too old
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+# dev-java/trilead-ssh2:0 in overlay
+DEPEND=">=virtual/jdk-1.7
+ app-arch/unzip
+ dev-java/commons-codec:0
+ ${CDEPEND}
+ dev-java/javacc:0
+ dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.7
+ ${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true -Dpermit.jdk8.builds=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+JAVA_PKG_WANT_SOURCE="1.7"
+JAVA_PKG_WANT_TARGET="1.7"
+
+src_unpack() {
+ unpack $(basename ${SOURCE_URL})
+
+ einfo "Deleting bundled jars..."
+ find -name "*.jar" -type f -delete
+
+ unpack netbeans-8.1-build.xml.patch.bz2
+
+ pushd "${S}" >/dev/null || die
+ ln -s "${DISTDIR}"/4E74C6BE42FE89871A878C7C4D6158F21A6D8010-antlr-runtime-3.4.jar libs.antlr3.runtime/external/antlr-runtime-3.4.jar || die
+ ln -s "${DISTDIR}"/98308890597ACB64047F7E896638E0D98753AE82-asm-all-4.0.jar libs.nashorn/external/asm-all-4.0.jar || die
+ ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+ ln -s "${DISTDIR}"/ACAB7C860DF78C4A528FD8A64F2C62A0A96639E5-com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build219_t20150519_2322.jar || die
+ ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar || die
+ ln -s "${DISTDIR}"/CD0D5510908225F76C5FE5A3F1DF4FA44866F81E-commons-net-3.3.jar libs.commons_net/external/commons-net-3.3.jar || die
+ ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+ ln -s "${DISTDIR}"/83E794DFF9A39401AC65252C8E10157761584224-css3-spec.zip css.editor/external/css3-spec.zip || die
+ ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+ ln -s "${DISTDIR}"/3502EB7D4A72C2C684D23AFC241CCF50797079D1-exechlp-1.0.zip dlight.nativeexecution/external/exechlp-1.0.zip || die
+ ln -s "${DISTDIR}"/5EEAAC41164FEBCB79C73BEBD678A7B6C10C3E80-freemarker-2.3.19.jar libs.freemarker/external/freemarker-2.3.19.jar || die
+ ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+ ln -s "${DISTDIR}"/F4A1696661E6233F8C27EE323CAEF9CB052666F1-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+ ln -s "${DISTDIR}"/2541D025F428A361110C4D656CDD99B5C5C5DFCE-html5doc.zip html.parser/external/html5doc.zip || die
+ ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+ ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+ ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+ ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+ ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+ ln -s "${DISTDIR}"/ECEAF316A8FAF0E794296EBE158AE110C7D72A5A-JavaEWAH-0.7.9.jar c.googlecode.javaewah.JavaEWAH/external/JavaEWAH-0.7.9.jar || die
+ ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+ ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+ ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+ ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+ ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+ ln -s "${DISTDIR}"/5E40984A55F6FFF704F05D511A119CA5B456DDB1-jfxrt.jar libs.javafx/external/jfxrt.jar || die
+ ln -s "${DISTDIR}"/483A61B688B13C62BB201A683D98A6688B5373B6-jing.jar html.validation/external/jing.jar || die
+ ln -s "${DISTDIR}"/3699DFFE17089F9B9C73857EDA9B8669AAD657D3-js-corestubs.zip javascript2.editor/external/js-corestubs.zip || die
+ ln -s "${DISTDIR}"/2AA13ACCC4059C930C4AD3B6ABD8E1C0FC06235C-js-domstubs.zip javascript2.editor/external/js-domstubs.zip || die
+ ln -s "${DISTDIR}"/7C0C3CFD989EE775198337C11715C1ACD6C84F41-js-reststubs.zip javascript2.editor/external/js-reststubs.zip || die
+ ln -s "${DISTDIR}"/036FA0032B44AD06A1F13504D97B3685B1C88961-jsch.agentproxy.core-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.core-0.0.7.jar || die
+ ln -s "${DISTDIR}"/9F31964104D71855DF6B73F0C761CDEB3FA3C49C-jsch.agentproxy.sshagent-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.sshagent-0.0.7.jar || die
+ ln -s "${DISTDIR}"/3FA59A536F3DC2197826DC7F224C0823C1534203-jsch.agentproxy.pageant-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.pageant-0.0.7.jar || die
+ ln -s "${DISTDIR}"/F759114E5A9F9AE907EADB59DBF65189AA399B45-jsch.agentproxy.usocket-jna-0.0.7.jar libs.jsch.agentproxy/external/jsch.agentproxy.usocket-jna-0.0.7.jar || die
+ ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.process/external/libpam4j-1.1.jar || die
+ ln -s "${DISTDIR}"/76E901A1F432323E7E90FC86FDB2534A28952293-nashorn-02f810c26ff9-patched.jar libs.nashorn/external/nashorn-02f810c26ff9-patched.jar || die
+ ln -s "${DISTDIR}"/010FC8BD229B7F68C8C4D5BDE399475373096601-non-schema.jar html.validation/external/non-schema.jar || die
+ ln -s "${DISTDIR}"/F27BF427BE72709F3094BF76ECA8C5A2B9AC6DA9-org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype_3.4.100.v20110423-0524_nosignature.jar || die
+ ln -s "${DISTDIR}"/9BC512C5BB9A9F5276B9E8672F6B30AD0BD97D88-org.eclipse.core.jobs-3.5.101_nosignature.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.101_nosignature.jar || die
+ ln -s "${DISTDIR}"/105DC9A1A93E6EA9A6CD368AD12897B1F247D6AE-org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar o.eclipse.core.net/external/org.eclipse.core.net_1.2.100.I20110511-0800_nosignature.jar || die
+ ln -s "${DISTDIR}"/E99C3C29A90F8AB29078A38CF8EBC3860249640C-org.eclipse.core.runtime-3.7.0_nosignature.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.7.0_nosignature.jar || die
+ ln -s "${DISTDIR}"/84FC6D443CD0816FA87093B6B7AD6876ADFC4207-org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110_nosignature.jar || die
+ ln -s "${DISTDIR}"/74069BFD03B2C66A9EBB4370C0B8064E3F5B6594-org.eclipse.equinox.app-1.3.100_nosignature.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.100_nosignature.jar || die
+ ln -s "${DISTDIR}"/A7953EEE9D4D7CD896C7D0AD6D21902E6259979B-org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common_3.6.0.v20110523_nosignature.jar || die
+ ln -s "${DISTDIR}"/3FB169C95F095B70F05B96BE9496DA63FAE7F707-org.eclipse.equinox.preferences-3.4.2_nosignature.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.4.2_nosignature.jar || die
+ ln -s "${DISTDIR}"/CD5919A707EB6B5C1FC29964C8EF5E2CF3F5A3D4-org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry_3.5.200.v20120522-1841_nosignature.jar || die
+ ln -s "${DISTDIR}"/A4634373DC60650C49CC98AEA2090889F7ADC68F-org.eclipse.equinox.security-1.1.1_nosignature.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.1.1_nosignature.jar || die
+ ln -s "${DISTDIR}"/278049664FFA5447191BD5FE96B0B62B0CFD15D1-org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit/external/org.eclipse.jgit-3.6.2.201501210735-r_nosignature.jar || die
+ ln -s "${DISTDIR}"/9039A0C1FA0E56CB56A1A192908814478FA747C5-org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar o.eclipse.jgit.java7/external/org.eclipse.jgit.java7-3.6.2.201501210735-r_nosignature.jar || die
+ ln -s "${DISTDIR}"/DAA45A7EE529A7532F5DC08625A5A3E81DB2D4CB-org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core_3.14.2.v20150217-2341.jar || die
+ ln -s "${DISTDIR}"/F5AC8FBA216A8C52F319EC2CB455B44FFD734B38-org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core_3.10.0.20130926-1710_nosignature.jar || die
+ ln -s "${DISTDIR}"/B43E7CE55F0DECA3BE1A6E695A3E3ABC6D62567F-org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net_3.10.0.20131018-1210_nosignature.jar || die
+ ln -s "${DISTDIR}"/1B9CBEC0FCB47C279519E52D360199C24EC99B01-org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.repositories.core/external/org.eclipse.mylyn.commons.repositories.core_1.2.0.20130704-2116_nosignature.jar || die
+ ln -s "${DISTDIR}"/6B0A6E9F9179E314944E4ADB831A9D6FCADED3DC-org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc_3.10.0.20130704-2116_nosignature.jar || die
+ ln -s "${DISTDIR}"/B28B8EE777232102471EA5334FD70E20851845DD-org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core_3.10.0.20131010-2023_nosignature.jar || die
+ ln -s "${DISTDIR}"/24A15BD37950663933CC4975EE6E518BEB2C28A3-org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.confluence.core/external/org.eclipse.mylyn.wikitext.confluence.core_1.9.0.20131007-2055_nosignature.jar || die
+ ln -s "${DISTDIR}"/01CD242F06F6F7E4E61C9E05ABBE07318E501D51-org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.core/external/org.eclipse.mylyn.wikitext.core_1.9.0.20131007-2055_nosignature.jar || die
+ ln -s "${DISTDIR}"/75928E4368CA748131A6767BA1A97D9DA643C306-org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar o.eclipse.mylyn.wikitext.textile.core/external/org.eclipse.mylyn.wikitext.textile.core_1.9.0.20131007-2055_nosignature.jar || die
+ ln -s "${DISTDIR}"/8307A44D3F150F1BB317532097A0C7D125C00F2D-org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.8.10.r10446_v20150526_1454.jar || die
+ ln -s "${DISTDIR}"/E90EF50215FFD23928B3308DC76A17B7DADE5F33-processtreekiller-1.0.5.jar extexecution.process/external/processtreekiller-1.0.5.jar || die
+ ln -s "${DISTDIR}"/4F94E5B4F14B4571A1D8E37885A3037C91F7C02C-svnkit_1.7.8.r9538_v20130107_2001.jar libs.svnClientAdapter.svnkit/external/svnkit_1.7.8.r9538_v20130107_2001.jar || die
+ ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+ ln -s "${DISTDIR}"/EDE7FBABD4C96D34E48FDA0E8FECED24C98CEDCA-sqljet-1.1.10.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.10.jar || die
+ ln -s "${DISTDIR}"/D08E473A4D0510FB329D64E4CC4F2963D000699C-svnClientAdapter-javahl-1.10.3.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.10.3.jar || die
+ ln -s "${DISTDIR}"/2CD487DCDE4C4FC38D1C9EBCD45418A1B5EF188D-svnClientAdapter-main-1.10.3.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.10.3.jar || die
+ ln -s "${DISTDIR}"/5D37A7FE167A1D44731192748C79B2D7905D474F-svnClientAdapter-svnkit-1.10.3.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.10.3.jar || die
+ ln -s "${DISTDIR}"/24CEAE4A9A2AAAA0BD78FF001914BA06B59CEDF2-svnjavahl-1.8.4.jar libs.svnClientAdapter.javahl/external/svnjavahl-1.8.4.jar || die
+ ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+ ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+ ln -s "${DISTDIR}"/C0D8A3265D194CC886BAFD585117B6465FD97DCE-swingx-all-1.6.4.jar libs.swingx/external/swingx-all-1.6.4.jar || die
+ ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+ ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+ ln -s "${DISTDIR}"/6FC6098C230D7CBA5730106D379CBBB42F6EC48A-validator.jar html.validation/external/validator.jar || die
+ ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.process/external/winp-1.14-patched.jar || die
+ ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+ ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+ ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+ popd >/dev/null || die
+}
+
+src_prepare() {
+ einfo "Deleting bundled class files..."
+ find -name "*.class" -type f | xargs rm -vf
+
+ epatch netbeans-8.1-build.xml.patch
+
+ # Support for custom patches
+ if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+ local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+ if [ -n "${files}" ] ; then
+ einfo "Applying custom patches:"
+
+ for file in ${files} ; do
+ epatch "${file}"
+ done
+ fi
+ fi
+
+ einfo "Symlinking external libraries..."
+ java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+ java-pkg_jar-from --into libs.json_simple/external json-simple json-simple.jar json-simple-1.1.1.jar
+
+ einfo "Linking in other clusters..."
+ mkdir "${S}"/nbbuild/netbeans || die
+ pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+ ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+ cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.platform.built
+
+ ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+ cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.harness.built
+
+ popd >/dev/null || die
+
+ java-pkg_jar-from --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.53.jar
+ java-pkg_jar-from --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.23-bin.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.2-1002.jdbc4.jar
+ java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+ java-pkg_jar-from --into html.parser/external icu4j-55 icu4j.jar icu4j-4_4_2.jar
+ java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax.jar
+ java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+ java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+ # java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.19.jar
+ java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.7.jar
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+ # java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.8.4.jar
+ java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+ java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+ java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+ java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+ java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+ java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+ java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+ java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+ java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+ pushd nbbuild/netbeans/ide >/dev/null || die
+
+ insinto ${INSTALL_DIR}
+
+ grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+ doins -r *
+ rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+ rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+ insinto ${INSTALL_DIR}/bin/nativeexecution
+ doins bin/nativeexecution/*
+
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+ for file in *.sh ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+
+ if use x86 ; then
+ doins -r bin/nativeexecution/Linux-x86
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ elif use amd64 ; then
+ doins -r bin/nativeexecution/Linux-x86_64
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ fi
+
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm com-jcraft-jsch.jar && dosym /usr/share/jsch/lib/jsch.jar ${instdir}/com-jcraft-jsch.jar || die
+ rm com-jcraft-jzlib.jar && dosym /usr/share/jzlib/lib/jzlib.jar ${instdir}/com-jcraft-jzlib.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext
+ pushd "${D}"/${instdir} >/dev/null || die
+ # rm freemarker-2.3.19.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.19.jar || die
+ rm icu4j-4_4_2.jar && dosym /usr/share/icu4j-55/lib/icu4j.jar ${instdir}/icu4j-4_4_2.jar || die
+ rm isorelax.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax.jar || die
+ rm json-simple-1.1.1.jar && dosym /usr/share/json-simple/lib/json-simple.jar ${instdir}/json-simple-1.1.1.jar || die
+ rm jvyamlb-0.2.7.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.7.jar || die
+ rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+ rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+ rm mysql-connector-java-5.1.23-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.23-bin.jar || die
+ rm postgresql-9.2-1002.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.2-1002.jdbc4.jar || die
+ rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+ rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+ rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+ rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+ # rm svnjavahl.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl.jar || die
+ rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+ popd >/dev/null || die
+
+ dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 29d12a29d505..f83a7ed80e97 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,3 +1,11 @@
+DIST go-darwin-amd64-bootstrap.tbz 48361403 SHA256 afb6cc976c404933e68ee3125fe8fbf94b57b9d8db8501d2bd1ce692468fbc9b SHA512 aefaad5abd58ed96cf5658bae2e931f162c2699fb248104837a279955dea6fe6cd4d582766379d2689c04bdc009c19a19f17585d8401d49d1fac772dcf385b93 WHIRLPOOL aa1c06103ae72f0b1c62cccd82b1fa88c5310d3baad2d9eddd173322c04ad7a7b7b9fb6ac9407c8002c6eebb8691cd415bca3d50a17548d52a5022001c6b93e2
+DIST go-freebsd-386-bootstrap.tbz 47059629 SHA256 3cb5f0ce9f878682da458f266dc954829dec7cfc4c269c233abceaad4061e671 SHA512 39a48b78542095e1c2115e2d833ac6b4b4c9e03b8974ad3e5d48701f36cc383c9434d075e73b65343055677d2d83c4556e416ac90a71b3e2a4f0789adfa02888 WHIRLPOOL ff39a6ba507b9d200817a09dcfe045fd1a79fad03b824ed6cf3df8fa937d345ccc2d0d1dfad3f5cb38151b9674ab00b10aabe788ce8dd67a74251ab7aeae0209
+DIST go-freebsd-amd64-bootstrap.tbz 48451024 SHA256 c5b16adab514352f49eb9ffef0d499e954d5d6bb6aefc8e98543d24e2a8fd7b7 SHA512 097a48c9b3b7541b6c4aab6fe9304b7df461e31543609b836842294a2acecf14243d0efc80282b2e442f6be92d7e189dddab6ffd4487b115d94113205452352e WHIRLPOOL 691cecccc01383bd874e687c3644ceab06c33d3c9c57da737c2c1f8208dcc6d99bc18968f50c4e466049069f219e39f34ee8a8b6af0f667f31ae011528f4c591
+DIST go-linux-386-bootstrap.tbz 47156176 SHA256 ced390085b26074d805fe64a4bd4da618c5aa086fb5944d6df8df4a96aba05fc SHA512 d4236df8d71afa6afad0d90c1c84a3a27e7e9f4ab6a613a92ac52eeeed3303e097ab3f18a04af66928a6169c78bc73b85836755729695d2a0f65ddf0f6fde9ca WHIRLPOOL 30328edff5a8c4efac8a4f5336f09744d5fe8bc9ab2925eed5a5fc7a17c8e54f35badf6daf75a65e62237e4c2a52fe29a2baacd6c7463aa0c735a64bc5e91c0a
+DIST go-linux-amd64-bootstrap.tbz 48722911 SHA256 0ab0842fb1f6cc6f10a85f225ff1a2b9e5e4b38128a7136d0c1896819421a986 SHA512 ce4dbc979b63a4612f4a8f7e7a6c5247e11bbc3a2d62ab0537a1b405ec8ab22f153012421d2240a7d6a4f91a79bb3f1370454f9e843fac43b99757c17134e5b7 WHIRLPOOL a94d0e0a1c44e3385d23f8973d15e6ef041450a3578c38987f158c4f9f231d315bc5204539d9dc7322cc9ecb96b7618b22d023f906474e1348c5d666792dff58
+DIST go-linux-arm-bootstrap.tbz 46055976 SHA256 a44e33b95046e01fd7125c3cc3c34b13f83bbf692cddfd3e86e267da11de2a44 SHA512 a8cf3225dafd2f08b944e60d0fb6320b5e394646f5df2ca2464c76a2e6e6b72f4840ddcc65dc5f59c94907715780f1e25c73b480a79909d9455faad59ffd38d5 WHIRLPOOL 304bb37f94b8f5d0bd77c0d5faebed1cb627cc3b453c686d7297f6542ee3e0ddabc7139e13a21ee2f5a20caca273c63bcfbcbd4daf670b1dbfe77b599f8111ac
+DIST go-linux-arm64-bootstrap.tbz 45369354 SHA256 810c998e6701580fe0f26d46c5796eefce648e252ff9d6d761304e60556b7fc0 SHA512 3f64869430c03efa77796ed74d07a337e2a205802485605cbdd67778a08e5ce041ce3925b7a5cca0a6b4ad24ab70e07ee54091b010f67ec7370a985022f5a21e WHIRLPOOL f6f470081d5f23c190310280aaf7454a4f58fe4e7545bbd219046711f8d27ce97cc5f5f1c207e777067d1f6332e4b3f2c819b178e899d21c2d5d1d466a42cc37
+DIST go-linux-ppc64-bootstrap.tbz 45266082 SHA256 89902cebaf93b95dea225b7304eedcae101d6fb83bba0fcdfee001361b4868c0 SHA512 d013a1a5953207505a9f7e0c5cfdc7f463d4669fd18b36cf1df10126e9d4c012252bc4d207dd4503c34301e76197d8e89a9ed9d9d0b8a3b54b62e782b4c39d7b WHIRLPOOL 3ec868d94e8452a3cdb49a1292f9f32ebeb813ea297e419849cdee28c8d952887feb70e1095ce109ff6b8bb81dee47b7eb6f275b15bb6f46422095c3b260f968
DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef
DIST go1.5.3.src.tar.gz 12057623 SHA256 754e06dab1c31ab168fc9db9e32596734015ea9e24bc44cae7f237f417ce4efe SHA512 b348832ea7cb095cf793960cf9f4da5e9f6ca8de7b5262bb819de97efea4835643e30a18efd4a82d01ea3854a1905af9e134271716c4b68c9d2a8f6e15f65ff0 WHIRLPOOL aec869ec6af62601f6b83283417eef739141f99be938d419ef4a553028141e05ded7777fdff2a2d1a3e35e4976e4ec96a301b4875c509a370848d0df5dc9e0c8
DIST go1.6.src.tar.gz 12613308 SHA256 a96cce8ce43a9bf9b2a4c7d470bc7ee0cb00410da815980681c8353218dcf146 SHA512 59e9d72a80558fd5e3f176e068897a45333b36e35f6c00393647941a70e741168e65941b6059397378020c3b78ec3471a48809682f7efd97cf33eec6325fc3e8 WHIRLPOOL c6debe1a5039f0ca34c29b4a53f958503a724cae13715ea14f0237b5faacd26e09eb6405462e22abd6806540dd8fb9eb2fa08ff6e8676b0f6dffa267210f5eac
diff --git a/dev-lang/go/go-1.6-r2.ebuild b/dev-lang/go/go-1.6-r2.ebuild
new file mode 100644
index 000000000000..8db9b010aff8
--- /dev/null
+++ b/dev-lang/go/go-1.6-r2.ebuild
@@ -0,0 +1,237 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+BOOTSTRAP_DIST="https://dev.gentoo.org/~williamh/dist"
+SRC_URI="
+kernel_Darwin? (
+ x64-macos? ( ${BOOTSTRAP_DIST}/go-darwin-amd64-bootstrap.tbz )
+)
+kernel_FreeBSD? (
+amd64-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-amd64-bootstrap.tbz )
+x86-fbsd? ( ${BOOTSTRAP_DIST}/go-freebsd-386-bootstrap.tbz )
+)
+kernel_linux? (
+ amd64? ( ${BOOTSTRAP_DIST}/go-linux-amd64-bootstrap.tbz )
+ arm? ( ${BOOTSTRAP_DIST}/go-linux-arm-bootstrap.tbz )
+ arm64? ( ${BOOTSTRAP_DIST}/go-linux-arm64-bootstrap.tbz )
+ ppc64? ( ${BOOTSTRAP_DIST}/go-linux-ppc64-bootstrap.tbz )
+ x86? ( ${BOOTSTRAP_DIST}/go-linux-386-bootstrap.tbz )
+)
+"
+
+if [[ ${PV} = 9999 ]]; then
+ EGIT_REPO_URI="git://github.com/golang/go.git"
+ inherit git-r3
+else
+ SRC_URI+="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz"
+ # go-bootstrap-1.4 only supports go on amd64, arm and x86 architectures.
+ # Allowing other bootstrap options would enable arm64 and ppc64 builds.
+ case ${PV} in
+ *9999*|*_rc*) ;;
+ *)
+ KEYWORDS="-* ~amd64"
+ ;;
+ esac
+fi
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="http://www.golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=""
+RDEPEND="!=dev-lang/go-bootstrap-1.4.1"
+DEPEND=""
RDEPEND="!=dev-libs/nspr-4.8.6 )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- app-arch/zip
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.9.2.13-as-needed.patch"
-
- epatch_user
-
- if [[ ${CHOST} == *-freebsd* ]]; then
- # Don't try to be smart, this does not work in cross-compile anyway
- ln -s "${BUILDDIR}/config/Linux_All.mk" "${S}/config/$(uname -s)$(uname -r).mk"
- fi
-}
-
-src_configure() {
- cd "${BUILDDIR}" || die
-
- local myconf
-
- use threadsafe && myconf="${myconf} \
- --with-system-nspr --enable-threadsafe"
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
- AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
- LD="$(tc-getLD)" econf \
- ${myconf}
-}
-
-src_compile() {
- cd "${BUILDDIR}" || die
- emake -j1
-}
-
-src_install() {
- cd "${BUILDDIR}" || die
- emake install DESTDIR="${D}"
- dobin shell/js
- dodoc ../jsd/README
- dohtml README.html
-
- if [[ ${CHOST} == *-darwin* ]] ; then
- # fixup install_name
- install_name_tool -id "${EPREFIX}"/usr/$(get_libdir)/libmozjs.dylib \
- "${ED}"/usr/$(get_libdir)/libmozjs.dylib || die
- fi
-}
diff --git a/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild b/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild
new file mode 100644
index 000000000000..dc29910d0b3a
--- /dev/null
+++ b/dev-lang/spidermonkey/spidermonkey-1.8.5-r5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+inherit autotools eutils toolchain-funcs multilib python-any-r1 versionator pax-utils
+
+MY_PN="js"
+TARBALL_PV="$(replace_all_version_separators '' $(get_version_component_range 1-3))"
+MY_P="${MY_PN}-${PV}"
+TARBALL_P="${MY_PN}${TARBALL_PV}-1.0.0"
+DESCRIPTION="Stand-alone JavaScript C library"
+HOMEPAGE="http://www.mozilla.org/js/spidermonkey/"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/js/${TARBALL_P}.tar.gz"
+
+LICENSE="NPL-1.1"
+SLOT="0/mozjs185"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+IUSE="debug minimal static-libs test"
+
+S="${WORKDIR}/${MY_P}"
+BUILDDIR="${S}/js/src"
+
+RDEPEND=">=dev-libs/nspr-4.7.0
+ sys-libs/readline:0
+ x64-macos? ( dev-libs/jemalloc )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ app-arch/zip
+ virtual/pkgconfig"
+
+pkg_setup(){
+ if [[ ${MERGE_TYPE} != "binary" ]]; then
+ export LC_ALL="C"
+ fi
+}
+
+src_prepare() {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=628723#c43
+ epatch "${FILESDIR}/${P}-fix-install-symlinks.patch"
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=638056#c9
+ epatch "${FILESDIR}/${P}-fix-ppc64.patch"
+ # https://bugs.gentoo.org/show_bug.cgi?id=400727
+ # https://bugs.gentoo.org/show_bug.cgi?id=420471
+ epatch "${FILESDIR}/${P}-arm_respect_cflags-3.patch"
+ # https://bugs.gentoo.org/show_bug.cgi?id=438746
+ epatch "${FILESDIR}"/${PN}-1.8.7-freebsd-pthreads.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=441928
+ epatch "${FILESDIR}"/${PN}-1.8.5-perf_event-check.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=439260
+ epatch "${FILESDIR}"/${P}-symbol-versions.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=441934
+ epatch "${FILESDIR}"/${PN}-1.8.5-ia64-fix.patch
+ epatch "${FILESDIR}"/${PN}-1.8.5-ia64-static-strings.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=431560
+ epatch "${FILESDIR}"/${PN}-1.8.5-isfinite.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=552786
+ epatch "${FILESDIR}"/${PN}-perl-defined-array-check.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=439558
+ epatch "${FILESDIR}"/${PN}-1.8.7-x32.patch
+
+ epatch_user
+
+ cd "${BUILDDIR}" || die
+ eautoconf
+}
+
+src_configure() {
+ cd "${BUILDDIR}" || die
+
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" \
+ LD="$(tc-getLD)" \
+ econf \
+ ${myopts} \
+ --enable-jemalloc \
+ --enable-readline \
+ --enable-threadsafe \
+ --with-system-nspr \
+ --disable-optimize \
+ --disable-profile-guided-optimization \
+ $(use_enable debug) \
+ $(use_enable static-libs static) \
+ $(use_enable test tests)
+}
+
+cross_make() {
+ emake \
+ CFLAGS="${BUILD_CFLAGS}" \
+ CXXFLAGS="${BUILD_CXXFLAGS}" \
+ AR="${BUILD_AR}" \
+ CC="${BUILD_CC}" \
+ CXX="${BUILD_CXX}" \
+ RANLIB="${BUILD_RANLIB}" \
+ "$@"
+}
+src_compile() {
+ cd "${BUILDDIR}" || die
+ if tc-is-cross-compiler; then
+ tc-export_build_env BUILD_{AR,CC,CXX,RANLIB}
+ cross_make jscpucfg host_jsoplengen host_jskwgen
+ cross_make -C config nsinstall
+ mv {,native-}jscpucfg || die
+ mv {,native-}host_jskwgen || die
+ mv {,native-}host_jsoplengen || die
+ mv config/{,native-}nsinstall || die
+ sed -i \
+ -e 's@./jscpucfg@./native-jscpucfg@' \
+ -e 's@./host_jskwgen@./native-host_jskwgen@' \
+ -e 's@./host_jsoplengen@./native-host_jsoplengen@' \
+ Makefile || die
+ sed -i -e 's@/nsinstall@/native-nsinstall@' config/config.mk || die
+ rm -f config/host_nsinstall.o \
+ config/host_pathsub.o \
+ host_jskwgen.o \
+ host_jsoplengen.o || die
+ fi
+ emake
+}
+
+src_test() {
+ cd "${BUILDDIR}/jsapi-tests" || die
+ # for bug 415791
+ pax-mark mr jsapi-tests
+ emake check
+}
+
+src_install() {
+ cd "${BUILDDIR}" || die
+ emake DESTDIR="${D}" install
+ # bug 437520 , exclude js shell for small systems
+ if ! use minimal ; then
+ dobin shell/js
+ pax-mark m "${ED}/usr/bin/js"
+ fi
+ dodoc ../../README
+ dohtml README.html
+
+ if ! use static-libs; then
+ # We can't actually disable building of static libraries
+ # They're used by the tests and in a few other places
+ find "${D}" -iname '*.a' -delete || die
+ fi
+}
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 0f7d21ebe853..76709ac00d14 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,6 +1,5 @@
DIST libinput-0.9.0.tar.xz 510512 SHA256 309043976f41f5451c2a4b1c25bc2993b18aecb22524d797f21eb6b6c968ff0d SHA512 a6f718215428eda45ac00c25d0b62ada84bf924822cb66e0a9b28f4cfc36e7d1678f2dfb47afae16ce4c277d589adcf97aefe8e2e5a154873b649fe4a84527a1 WHIRLPOOL 23da6dbcd7b17000cea641e0931db8a9b2ad34b0655e4e31b0419ff4799adc59d2646b10316e073ad49695ebd652c150abf05c39d15c735ecb1d97f6f8c1d8de
DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e59c320014a22296847b7ff99e SHA512 17efc6ddd58aadcd30aecb4d1b8b6ad32f6f61c592f29b0a99aac7d49e5cb814038874d9e8996cd6726f15c58bf4239169564c650a3250a87a9ec6fd3110c5bb WHIRLPOOL 0bba6b4a58ca0020ebcbffe5675d75832b4ed67a350ca141d990f9db522a2eee942543f475d76c1f2b816b849074f4a50e30bcb3adc99bd4abdea1a43800a2d5
DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
-DIST libinput-1.1.3.tar.xz 815840 SHA256 b95af39391e2b91957af0addce691a4070b28aff69cd2348823bf6ce8169995e SHA512 ee51b6d005bacca57c4cad5a8b70097990299bf934cb460016176630009cea872e5413e053b09b456d35e085268a9a96ceb667ef0f4cd3b874e89cda2bb1c344 WHIRLPOOL 2934b26ef372f337873eefc5fd0c3464e8d380fc263a6cd0fda759fa5d1efe974dd3a83e076aec0ee2e85259784452c7294b163f8ca657af9c2c803c69540867
-DIST libinput-1.1.4.tar.xz 819536 SHA256 302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6 SHA512 54c1ca1cbb747d62950f5f5bf6a906cdb6b0e79305ba9d7e8408828691eb523be517bb88e739c6ab5465ec95b69c81f096fe8ad4b6bbbd010d431e72d79d0763 WHIRLPOOL 82b9831bce546d4d1329fbf51f64bfea8a1d23bee11cf1664212ba7949e18bff6ae471e2e248f8ec16dc93d8514024a5576fb2a298edea433899c2a69189d6b8
DIST libinput-1.1.5.tar.xz 806960 SHA256 5e08c45dbb8bf32490cc6cd626da098564d646d161a07cba2e3adbd9745c0622 SHA512 031663c46b556048224aab018eb8ea76e34aace77508e52e6ef382a452585fafd4c91b427c0892aab3c624c0cfedc15c388922ae7166248e5da65575ff900c31 WHIRLPOOL 760cc1cf0c6657efbdadadd2f50e188d86465e1aa3f287275323d6fad9156b684de0d3b6dbf6e3fd5213018770726087ee282833f25ba5ef67918c0284b885a1
+DIST libinput-1.2.0.tar.xz 866284 SHA256 1754b917fe675507ea80445b4f2e91d76cb6a6935508fe37234807affb316e2c SHA512 ab5b534ac5db7d4142e41c61e1f8fbc7f4c9cf89567fa27196fa9300f57db7328d61af25c93126905ad06061e1b2def0abe70654ac3710b6476379f84343cce8 WHIRLPOOL 2f74bcd3ae694db9f52c450c6b96d24fd320da2002e900cf69a3ce2d9c33b00213097c0330867f32b175b5fe80d06099c3bdc461a2001f4eee4f2481ab1e32fc
diff --git a/dev-libs/libinput/libinput-1.1.3.ebuild b/dev-libs/libinput/libinput-1.1.3.ebuild
deleted file mode 100644
index 26877357fe85..000000000000
--- a/dev-libs/libinput/libinput-1.1.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
-# Tests require write access to udev rules directory which is a no-no for live system.
-# Other tests are just about logs, exported symbols and autotest of the test library.
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/libevdev-0.4
- >=sys-libs/mtdev-1.1
- virtual/libudev
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-# test? (
-# >=dev-libs/check-0.9.10
-# dev-util/valgrind
-# sys-libs/libunwind )
-
-src_configure() {
- # Doc handling in kinda strange but everything
- # is available in the tarball already.
- sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
- -i Makefile.am Makefile.in || die
-}
-
-src_configure() {
- # gui can be built but will not be installed
- # building documentation silently fails with graphviz syntax errors
- econf \
- --disable-documentation \
- --disable-event-gui \
- $(use_enable test tests) \
- --with-udev-dir="$(get_udevdir)"
-}
-
-src_install() {
- emake install DESTDIR="${D}"
- dodoc -r doc/html
- prune_libtool_files
-}
diff --git a/dev-libs/libinput/libinput-1.1.4.ebuild b/dev-libs/libinput/libinput-1.2.0.ebuild
similarity index 87%
rename from dev-libs/libinput/libinput-1.1.4.ebuild
rename to dev-libs/libinput/libinput-1.2.0.ebuild
index 26877357fe85..4c41c2f7bb41 100644
--- a/dev-libs/libinput/libinput-1.1.4.ebuild
+++ b/dev-libs/libinput/libinput-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,12 +12,13 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="test"
+IUSE="input_devices_wacom test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
RESTRICT="test"
RDEPEND="
+ input_devices_wacom? ( >=dev-libs/libwacom-0.1.2 )
>=dev-libs/libevdev-0.4
>=sys-libs/mtdev-1.1
virtual/libudev
@@ -29,7 +30,7 @@ DEPEND="${RDEPEND}
# dev-util/valgrind
# sys-libs/libunwind )
-src_configure() {
+src_prepare() {
# Doc handling in kinda strange but everything
# is available in the tarball already.
sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
@@ -42,6 +43,7 @@ src_configure() {
econf \
--disable-documentation \
--disable-event-gui \
+ $(use_enable input_devices_wacom libwacom) \
$(use_enable test tests) \
--with-udev-dir="$(get_udevdir)"
}
diff --git a/dev-python/astropy/astropy-1.1.1.ebuild b/dev-python/astropy/astropy-1.1.1.ebuild
index cbe12838cef2..656fb4aaa6a9 100644
--- a/dev-python/astropy/astropy-1.1.1.ebuild
+++ b/dev-python/astropy/astropy-1.1.1.ebuild
@@ -33,8 +33,8 @@ DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
virtual/pkgconfig
doc? (
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/matplotlib[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
media-gfx/graphviz
)
test? (
@@ -45,6 +45,8 @@ DEPEND="${RDEPEND}
sci-libs/scipy[${PYTHON_USEDEP}]
)"
+REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
+
PATCHES=(
"${FILESDIR}/${PN}-1.0.4-system-six.patch"
"${FILESDIR}/${PN}-1.0.4-system-configobj.patch"
@@ -52,6 +54,10 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.1-mark-kown-failures.patch"
)
+pkg_setup() {
+ use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( 'python2*' )
+}
+
python_prepare_all() {
export mydistutilsargs="--offline"
export ASTROPY_USE_SYSTEM_PYTEST=True
@@ -60,17 +66,15 @@ python_prepare_all() {
rm -r cextern/{expat,erfa,cfitsio,wcslib} || die
sed -i -e '/auto_use/s/True/False/' setup.cfg || die
cat >> setup.cfg <<-EOF
-
[build]
use_system_libraries=1
EOF
-
distutils-r1_python_prepare_all
}
python_compile_all() {
if use doc; then
- python_export_best
+ python_setup "python2*"
VARTEXFONTS="${T}"/fonts \
MPLCONFIGDIR="${BUILD_DIR}" \
PYTHONPATH="${BUILD_DIR}"/lib \
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
index b5bb86f49806..ca6928b99b0b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.2.10.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index b5bb86f49806..ca6928b99b0b 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/empy/empy-3.3.2.ebuild b/dev-python/empy/empy-3.3.2.ebuild
index 62e123ea3548..0f8dca33da41 100644
--- a/dev-python/empy/empy-3.3.2.ebuild
+++ b/dev-python/empy/empy-3.3.2.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
inherit distutils-r1
diff --git a/dev-python/pyds9/Manifest b/dev-python/pyds9/Manifest
index 5e55965a090e..f4e02190e2ce 100644
--- a/dev-python/pyds9/Manifest
+++ b/dev-python/pyds9/Manifest
@@ -1 +1,2 @@
DIST pyds9-1.7.tar.gz 879882 SHA256 026a86827fa93f074e2a90b9d831ba79253f312fa331f6a6a508cfa91fa81aac SHA512 8622cf40db65228553abc2f3dea346d9c948706a2681217a9383589d4df0143c42ef859dff12689f699b0fb40806945232c336539f37eb2c78754f9779043bcb WHIRLPOOL abc2d11817519e844f61319b0ba30276a9bb48b6a3beb5e6b7c097717cc86aeeb1960f58d62a21a9ce5d4bc37c05b8cee181abc1cc12e2821a5e878d64f1f175
+DIST pyds9-1.8.1.tar.gz 899377 SHA256 86ebc33b4f493998751a2f4a1c0141c7a4a7aee2ab01b62119bcd75bb3ca7273 SHA512 6924ba2a1c1ccd0b3c068d4923c6a35127da744b91b97ece7d075bfde68ff49e6d24ae55869aa5e0e462f3f488db697dcdb33d217b33b6d63551286d9a95eec9 WHIRLPOOL 68bdbe1b10fc6c2651d20968eb8e419d1649958d4c0f70bff01ca7a9ad69fad7a8c78eaced497b6a5b0627f6de63f7390c3fdf009947faa5d25276174ea97fc7
diff --git a/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch b/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch
new file mode 100644
index 000000000000..b84994f76b08
--- /dev/null
+++ b/dev-python/pyds9/files/pyds9-1.8.1-use-system-xpa.patch
@@ -0,0 +1,36 @@
+Author: Ole Streicher
+Description: Don't install and use the convienience copy provided in the
+ source, but use the one installed by the "libxpa1" package.
+--- a/setup.py
++++ b/setup.py
+@@ -21,7 +21,7 @@
+ xpadir = 'xpa'
+
+
+-def make(which):
++def _disabled_make(which):
+ curdir = os.getcwd()
+ srcDir = os.path.join(os.path.dirname(os.path.abspath(__file__)), xpadir)
+ os.chdir(srcDir)
+@@ -86,10 +86,5 @@
+ author_email='saord@cfa.harvard.edu',
+ url='http://hea-www.harvard.edu/saord/ds9/',
+ py_modules=['pyds9', 'xpa'],
+- data_files=[('', [os.path.join(xpadir, xpalib),
+- os.path.join(xpadir, xpans)])],
+- cmdclass={'build_py': my_build_py,
+- 'install_data': my_install_data,
+- 'clean': my_clean},
+ install_requires=['six']
+ )
+--- a/xpa.py
++++ b/xpa.py
+@@ -28,7 +28,7 @@
+ return _fname
+ return None
+
+-_libpath = _find_shlib('xpa')
++_libpath = 'libxpa.so.1'
+ if _libpath:
+ libxpa = ctypes.cdll.LoadLibrary(_libpath)
+ _ulist = platform.uname()
diff --git a/dev-python/pyds9/pyds9-1.8.1.ebuild b/dev-python/pyds9/pyds9-1.8.1.ebuild
new file mode 100644
index 000000000000..e201c4ceed24
--- /dev/null
+++ b/dev-python/pyds9/pyds9-1.8.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to XPA to communicate with DS9"
+HOMEPAGE="https://github.com/ericmandel/pyds9"
+SRC_URI="https://github.com/ericmandel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="x11-libs/xpa:0
+ dev-python/six[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=(changelog README.md)
+
+PATCHES=( "${FILESDIR}/${P}-use-system-xpa.patch" )
diff --git a/dev-python/pyee/Manifest b/dev-python/pyee/Manifest
index 042d550f7ae4..0b73c8d725d9 100644
--- a/dev-python/pyee/Manifest
+++ b/dev-python/pyee/Manifest
@@ -1,2 +1 @@
-DIST pyee-1.0.1.tar.gz 4056 SHA256 445c9cd811a53eeee3dd5649a02960eef142cbbf8f6fa10e5d31ebc4f8c78f68 SHA512 3072bd60f1ba596a1e65796cab652eab2f84f58e77741329f5c92bab926c3a01ca169eb1c8aea9fcff4d1a547643d709aec0ad13e182832ac52e9c22c91abdc6 WHIRLPOOL bfd350052e5a31099ca252354ba32f99f90403d2c86de79b590c1ba2ad94f1e5d6cfe0080b4648ef48e96745653d07c6872a8b30b19180b8acf18108c963f912
DIST pyee-1.0.2.tar.gz 4263 SHA256 16944f91eb37c0acf7a370feef2c09678220963f24f38134703911f80b33d79c SHA512 73cbb3cc7b06be9d4c92f6bc901fa55e1ca51271177672e8a1636eedc6f82fc940d7dd844d0f4a959e52185c0ef934e9fbe4760b70d62f39b94f5d1c3660ce2c WHIRLPOOL e09230d7e94533aef1b5f00f746e839cfd362eba8ce3a4f4929a323ff15fed4e85c11dc2ff9347c4b9eae7ce211d18e29f9248354394a381a53e45bb06ac0a51
diff --git a/dev-python/pyee/pyee-1.0.1.ebuild b/dev-python/pyee/pyee-1.0.1.ebuild
deleted file mode 100644
index cd07ea57ff1c..000000000000
--- a/dev-python/pyee/pyee-1.0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A port of node.js's EventEmitter to python"
-HOMEPAGE="https://pypi.python.org/pypi/pyee https://github.com/jfhbrook/pyee"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
- nosetests -v || die
-}
diff --git a/dev-python/pyfits/Manifest b/dev-python/pyfits/Manifest
index 520e2b6797c1..38b6273ef58c 100644
--- a/dev-python/pyfits/Manifest
+++ b/dev-python/pyfits/Manifest
@@ -1 +1,2 @@
DIST pyfits-3.3.tar.gz 1646403 SHA256 becb6dcc7e443138b9d239db7a0e8ad939e6e047c2c9ca86e84d0672da425fa1 SHA512 561fe61050e61745054e0e4712c4413e129293b062d2020219b61d648d7093ce6952e1f26da955a1bf570f76ba7eddeb1805c99f679300b072ef6bacc2e4c90a WHIRLPOOL 9b4b5dd236713359a9441e4179486e4b56ec11b7fc25c3abb59d30a6267fe87496601778731ba7ff92c55243621aa58ca493821b83224fde41a79f18c21e485b
+DIST pyfits-3.4.tar.gz 1692414 SHA256 ce0319cf6ef40846c5915202e4c8bd8d293ad85af4b14aa5a60fb285b7538c4b SHA512 b569f871f26dcd9cb2fbe9d823d55c525e8101b0fcf83fff4bc3f3ec4bc7f680953a29634518ea19383f533f5e23b3703fffdb4e0d577b1023b4323254ef3a7e WHIRLPOOL a121ca9b4d7b4457d24e905e8506402043679800eddc5c5813b68612bae1ee80940eb723f03504c9136fc5c2bac1a419aa52f87394689ae1099bb5002e77417e
diff --git a/dev-python/pyfits/pyfits-3.4.ebuild b/dev-python/pyfits/pyfits-3.4.ebuild
new file mode 100644
index 000000000000..dd6036d52f28
--- /dev/null
+++ b/dev-python/pyfits/pyfits-3.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1 eutils multilib
+
+DESCRIPTION="Provides an interface to FITS formatted files under python"
+HOMEPAGE="http://www.stsci.edu/resources/software_hardware/pyfits"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ sci-libs/cfitsio:0="
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/d2to1-0.2.5[${PYTHON_USEDEP}]
+ >=dev-python/stsci-distutils-0.3[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/numpydoc[${PYTHON_USEDEP}]' 'python*')
+ dev-python/sphinxcontrib-programoutput[${PYTHON_USEDEP}]
+ dev-python/stsci-sphinxext[${PYTHON_USEDEP}]
+ )
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.1-unbundle-cfitsio.patch )
+
+python_prepare_all() {
+ sed -i \
+ -e "s/\(hook_package_dir = \)lib/\1$(get_libdir)/g" \
+ "${S}"/setup.cfg || die
+
+ # https://github.com/spacetelescope/PyFITS/issues/95
+ sed -e "s/except UserWarning, w/except UserWarning as w/" \
+ -i pyfits/scripts/fitscheck.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ cd "${BUILD_DIR}"/lib* || die
+ nosetests --verbose || die
+}
+
+python_install() {
+ distutils-r1_python_install
+ local binary
+ for binary in "${ED}"/usr/bin/* "${D}$(python_get_scriptdir)"/*; do
+ einfo "Renaming ${binary} to ${binary}-${PN}"
+ mv ${binary}{,-${PN}} || die "failed renaming"
+ done
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ DOCS=( FAQ.txt CHANGES.txt )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch
new file mode 100644
index 000000000000..8235649eaec9
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/libdir.patch
@@ -0,0 +1,13 @@
+Index: python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- python_orocos_kdl.orig/CMakeLists.txt
++++ python_orocos_kdl/CMakeLists.txt
+@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI
+
+ find_package(PythonInterp REQUIRED)
+ find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED)
+-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
++execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=None))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ find_package(SIP REQUIRED)
+ include(SIPMacros)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
index 5b4808019348..5938f3f0811c 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -32,7 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 0d22bd204aeb..1ddb1dfa7873 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -32,6 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/libdir.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index bb60f199db72..37e89e597f39 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,2 +1 @@
-DIST rosdistro-0.4.2.tar.gz 50857 SHA256 3d5bf062bd0ecbfef272456f1862a6bb7a4100d8f2ac9b4ce7792dbdcfed7a84 SHA512 24dd08a959918fa44faa465acd22bd8d157b792391a2701ee40997028ea90dd13848f72abf1098930cd4e7b8a162cea1ab28ceb0d82df74167c85c0ef014ad65 WHIRLPOOL 8207d60268282d9075655ec3676179b1e6a7d8b1ee571c5df90d4680f54c345175788d7abbf3c2b78504c491a7453193490574f8e68ca2bdba270b5db8983e2b
DIST rosdistro-0.4.4.tar.gz 40001 SHA256 1c7c6886c2e61dd8143d3c08f5690f30e9d4e081d348c78bb0b2e8d32773c57b SHA512 4f6b79d88687f6e6147b95bef484a1555639d65044d01812af60eb072579345b5233bcda8fba251f0685a28b756addff7468c34978b0cc04c871ce4fe30fbe2c WHIRLPOOL 99a29b8c7ef475cd4599d2d9e8e28210af2a9d50b280dc9c315f16b3ae3be8b85e4da55a1c8cb6af55795b98207601307e7e846c0a8cdae6a5b4af356ff7b044
diff --git a/dev-python/rosdistro/rosdistro-0.4.2.ebuild b/dev-python/rosdistro/rosdistro-0.4.2.ebuild
deleted file mode 100644
index e6da9fa05ae1..000000000000
--- a/dev-python/rosdistro/rosdistro-0.4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdistro"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Tools to work with catkinized rosdistro files"
-HOMEPAGE="http://wiki.ros.org/rosdistro"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- http://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/catkin_pkg[${PYTHON_USEDEP}]
- dev-python/rospkg[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-
-python_test() {
- nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.4.4.ebuild b/dev-python/rosdistro/rosdistro-0.4.4.ebuild
index e6da9fa05ae1..7f7898e20477 100644
--- a/dev-python/rosdistro/rosdistro-0.4.4.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.4.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index e6da9fa05ae1..7f7898e20477 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 24e6a92c1d78..10243841fbeb 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,3 +1 @@
-DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3
-DIST rospkg-1.0.37.tar.gz 89332 SHA256 733e9e30d30a1f293f2d2b07060d231746ce88f7cfecb076d466d9aece5a0a8a SHA512 5e8e938831aac0c14b18d0f5063c8c8d50a2f13a4a15ce15955d854a840a8b46bab42d854b6d61d1e4e6bdef95f90e10008838d16b31e7d5b0d963b1c3c246d6 WHIRLPOOL 3d50c070197019b607e23a430affec8950539e0b32dd88f14e85027acea87435abebd8f58c4aeadd11cafee00d2faa26a3d9d88a0afb6efdc42dc0797642ef39
DIST rospkg-1.0.38.tar.gz 89321 SHA256 1a1567d3e33c3910518dbfbb09760c499153b1c0ad6b8ddc5045488c11db43e4 SHA512 21cc9057a445b06db66b454e46c3ecdf8d83e54bbf4c204c63b13278dc93cdad60a80f4cab29eba7bc1811d43b406f91435499f7e58fa97814302dfb786f483e WHIRLPOOL 109e8d5ddc3f432c28959b7e6f15703aa2d67cd3ee524e4964e5388a7982b6aea144e5afcf0d22add230e33beb485ade0656025b77f2b56be75d313aa1e52870
diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
deleted file mode 100644
index 268ff895be4e..000000000000
--- a/dev-python/rospkg/files/py3.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/ros-infrastructure/rospkg/pull/90
-
-commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
-Author: Alexis Ballier
-Date: Tue Oct 13 10:08:42 2015 +0200
-
- src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
-
-diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
-index 14b57c2..554b607 100644
---- a/src/rospkg/os_detect.py
-+++ b/src/rospkg/os_detect.py
-@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
- """
- def __init__(self, fdo_id):
- release_info = read_os_release()
-- if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
-+ if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
- self.release_info = release_info
- else:
- self.release_info = None
diff --git a/dev-python/rospkg/rospkg-1.0.35.ebuild b/dev-python/rospkg/rospkg-1.0.35.ebuild
deleted file mode 100644
index 06dd93b7b5c4..000000000000
--- a/dev-python/rospkg/rospkg-1.0.35.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
- # Needed for tests
- S="${WORKDIR}/${PN}"
- EGIT_CHECKOUT_DIR="${S}"
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- )
-"
-PATCHES=(
- "${FILESDIR}/norecurse.patch"
-)
-
-python_test() {
- nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
- distutils-r1_src_install
-
- # Avoid recursing into /usr/share when looking for packages.
- dodir /usr/share
- touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
deleted file mode 100644
index 526c071695f8..000000000000
--- a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Standalone Python library for the ROS package system"
-HOMEPAGE="http://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
- # Needed for tests
- S="${WORKDIR}/${PN}"
- EGIT_CHECKOUT_DIR="${S}"
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/coverage[${PYTHON_USEDEP}]
- )
-"
-PATCHES=(
- "${FILESDIR}/norecurse.patch"
- "${FILESDIR}/py3.patch"
-)
-
-python_test() {
- nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
-}
-
-src_install() {
- distutils-r1_src_install
-
- # Avoid recursing into /usr/share when looking for packages.
- dodir /usr/share
- touch "${ED}/usr/share/rospack_norecurse"
-}
diff --git a/dev-python/rospkg/rospkg-1.0.38.ebuild b/dev-python/rospkg/rospkg-1.0.38.ebuild
index 06dd93b7b5c4..100d6bc0b260 100644
--- a/dev-python/rospkg/rospkg-1.0.38.ebuild
+++ b/dev-python/rospkg/rospkg-1.0.38.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 06dd93b7b5c4..100d6bc0b260 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 51d033aa1bb4..bad9fdca4b21 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,2 +1 @@
-DIST vcstools-0.1.37.tar.gz 54213 SHA256 8d66379c5e5772a42b9680c9120a718bdc904745be22096d1f2bd5934cd625fc SHA512 c2992fd9977dd5cb0090319b828add26f60769bb7649d873e8edcac45c23a913667cde31f7ab658d5ce7de82930a5eb0ea9083994ea93b6ee9433966e70ee7b2 WHIRLPOOL aea89a863217ad09e2d183aa04f5c5173f6e7330ff2bfa1e713ab910f3ad0017e95fbf69c1cd94c10e20b7baa5974ad40fe9efda546860ef2a35f100808eb09e
DIST vcstools-0.1.38.tar.gz 54671 SHA256 0e3d2b5681c2776453fb5b61ceab61fdb965d5342e46c08a5b62095eb0237117 SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e WHIRLPOOL 86fccbb181849f2b60d8159073bb3de659b7d96173952cb9b68a2869048827c48860fb67859db1341a0defeee0915d41c1d6e77e812f807ca11e91e92e0ed250
diff --git a/dev-python/vcstools/vcstools-0.1.37.ebuild b/dev-python/vcstools/vcstools-0.1.37.ebuild
deleted file mode 100644
index d7a8169479ef..000000000000
--- a/dev-python/vcstools/vcstools-0.1.37.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 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} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/vcstools/vcstools"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Python library for interacting with various VCS systems"
-HOMEPAGE="http://wiki.ros.org/vcstools"
-if [ "${PV#9999}" != "${PV}" ] ; then
- SRC_URI=""
- KEYWORDS=""
-else
- SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
- http://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
- "
- KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-vcs/git
- dev-vcs/bzr
- dev-vcs/mercurial
- dev-vcs/subversion
- )
-"
-
-python_test() {
- # From travis.yml
- # Set git config to silence some stuff in the tests
- git config --global user.email "foo@example.com"
- git config --global user.name "Foo Bar"
- # Set the hg user
- echo -e "[ui]\nusername = Your Name " >> ~/.hgrc
- # Set the bzr user
- bzr whoami "Your Name "
- #git config --global user.email "you@example.com"
- #git config --global user.name "Your Name"
-
- nosetests --with-coverage --cover-package vcstools || die
-}
diff --git a/dev-python/vcstools/vcstools-0.1.38.ebuild b/dev-python/vcstools/vcstools-0.1.38.ebuild
index d7a8169479ef..29cfdfaf9691 100644
--- a/dev-python/vcstools/vcstools-0.1.38.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.38.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/vcstools/vcstools-9999.ebuild b/dev-python/vcstools/vcstools-9999.ebuild
index d7a8169479ef..29cfdfaf9691 100644
--- a/dev-python/vcstools/vcstools-9999.ebuild
+++ b/dev-python/vcstools/vcstools-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
SCM=""
if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/zope-event/Manifest b/dev-python/zope-event/Manifest
index b987a6f9e72d..0e7e9d9fe412 100644
--- a/dev-python/zope-event/Manifest
+++ b/dev-python/zope-event/Manifest
@@ -1,2 +1,3 @@
DIST zope.event-4.0.3.tar.gz 390984 SHA256 f5fdf6ca5716f714023358b212f7f435539dea11771603cd90eebf3ad34405f1 SHA512 bc328bb588beea0cdf55d5f36ff5b269d7b75f399b6d595e1df6565bf1d1fbe2d65b63072db26d096a3fc2dfc0fcec747ea7cf8eabe3c4535084347cb149f1e7 WHIRLPOOL 58ce4490fa86c79b30edc3c96d8d9e912b5d692bffe9664a29d2a7963efb90bb6d03acbe0774eb03ac912acfe44cca1c126cc1a840538bd2abcb1848ec972b53
DIST zope.event-4.1.0.tar.gz 476047 SHA256 dc7a59a2fd91730d3793131a5d261b29e93ec4e2a97f1bc487ce8defee2fe786 SHA512 abb0a2de578546f678eb06160b50e6c301de97d4248baed80cd76cbf666b22962052f82d8a58a3006e72d288866e5d5baec86425ab27a79926b4706ef8d5915e WHIRLPOOL 9f07da6353636371df83e6fbb6d197d14959338ace4565ba1429d8759a26c3894a27e3fdaacecf2760c709a1baecc2128cd4c5430284ac7453dc8898e79d1f68
+DIST zope.event-4.2.0.tar.gz 488532 SHA256 ce11004217863a4827ea1a67a31730bddab9073832bdb3b9be85869259118758 SHA512 e39cbbccf679328db190f0641e3cb0d267fc606afc9cdbd4fb4100bde482f12f594319d885db101dfd98741225604bb49ef77094011bbe7edaa16877038f9989 WHIRLPOOL adcf773453096493ef6740480dd6b9b2f62a48670767896b25dd168fe6406f9b160a1ffd71baa93a29a085805ffffb2baf3158e955850199b90821a782fe39e0
diff --git a/dev-python/zope-event/zope-event-4.2.0.ebuild b/dev-python/zope-event/zope-event-4.2.0.ebuild
new file mode 100644
index 000000000000..6880a605950c
--- /dev/null
+++ b/dev-python/zope-event/zope-event-4.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=(python{2_7,3_4,3_5})
+
+inherit distutils-r1
+MY_PN=zope.event
+
+MY_P=${MY_PN}-${PV}
+DESCRIPTION="Event publishing / dispatch, used by Zope Component Architecture"
+HOMEPAGE="https://github.com/zopefoundation/zope.event http://docs.zope.org/zope.event/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_P}
+
+python_test() {
+ nosetests || die
+}
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild
index ad43060b7470..dd36f2976129 100644
--- a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
index ad43060b7470..dd36f2976129 100644
--- a/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1 +1,2 @@
DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/collada_parser/collada_parser-1.11.9.ebuild b/dev-ros/collada_parser/collada_parser-1.11.9.ebuild
new file mode 100644
index 000000000000..4661ff2a6689
--- /dev/null
+++ b/dev-ros/collada_parser/collada_parser-1.11.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Collada robot description format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/urdf_parser_plugin
+ dev-ros/roscpp
+ dev-ros/class_loader
+ dev-libs/urdfdom_headers
+ dev-libs/collada-dom
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1 +1,2 @@
DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/collada_urdf/collada_urdf-1.11.9.ebuild b/dev-ros/collada_urdf/collada_urdf-1.11.9.ebuild
new file mode 100644
index 000000000000..76180ad14709
--- /dev/null
+++ b/dev-ros/collada_urdf/collada_urdf-1.11.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/angles
+ dev-ros/collada_parser
+ dev-ros/resource_retriever
+ dev-ros/urdf
+ dev-ros/geometric_shapes
+ dev-ros/tf
+ media-libs/assimp
+ dev-libs/tinyxml
+ dev-libs/collada-dom
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gencpp/gencpp-0.5.3.ebuild b/dev-ros/gencpp/gencpp-0.5.3.ebuild
index dcac00dc41c0..bd58a6c856e6 100644
--- a/dev-ros/gencpp/gencpp-0.5.3.ebuild
+++ b/dev-ros/gencpp/gencpp-0.5.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/gencpp"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/gencpp/gencpp-9999.ebuild b/dev-ros/gencpp/gencpp-9999.ebuild
index dcac00dc41c0..bd58a6c856e6 100644
--- a/dev-ros/gencpp/gencpp-9999.ebuild
+++ b/dev-ros/gencpp/gencpp-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/gencpp"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/geneus/Manifest b/dev-ros/geneus/Manifest
index 2ca191b346b0..aa2e42e38799 100644
--- a/dev-ros/geneus/Manifest
+++ b/dev-ros/geneus/Manifest
@@ -1,2 +1 @@
-DIST geneus-2.2.4.tar.gz 13718 SHA256 879d9e328693a217698a8448d146961568fb1f79cee59146dc60cbacd63582f6 SHA512 8ccb23e2a3a1e47b605853edee49cc6d44cdbbf33839c56770ff5b61ca903064983d1580226f1d8f80cb3b62a1c84c210c5d6e25971b24666cc7d5271db7fce4 WHIRLPOOL cb2544c9bb7534ec7f6f76ef02a220d7f1a9e645488a6ce5e3f43b5d66097bd21379e2ce57e12ce4e3d7097b12a6e973ec8b3c62caafb8ccbeb6b4ee5818f956
DIST geneus-2.2.5.tar.gz 14230 SHA256 fc18dcca7185623b7059936e938bd4a93e3c8fd6a5b7f0eb80cf88625e0df49b SHA512 d3fb85e5ef05a8a2815a5eb65772994f1da8aa6455a72a4b68126c6ae0467cb0c79026e3a47983db873d696121a7e1996be2a3028cdc24e55f44baccce2e3f76 WHIRLPOOL 6730786ce548dca6dbc835ec1d611a357fbe027227f693d9dc0b3f705cb7c9464866da4d19ad0336f0432e9b1df0693fd2ab28725356ff73f17d44ce6b4a1a97
diff --git a/dev-ros/geneus/geneus-2.2.5.ebuild b/dev-ros/geneus/geneus-2.2.5.ebuild
index 078897734087..70cb625f3345 100644
--- a/dev-ros/geneus/geneus-2.2.5.ebuild
+++ b/dev-ros/geneus/geneus-2.2.5.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/geneus/geneus-9999.ebuild b/dev-ros/geneus/geneus-9999.ebuild
index 078897734087..70cb625f3345 100644
--- a/dev-ros/geneus/geneus-9999.ebuild
+++ b/dev-ros/geneus/geneus-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/genlisp/genlisp-0.4.15.ebuild b/dev-ros/genlisp/genlisp-0.4.15.ebuild
index 8d813053eac2..5d699ff5e376 100644
--- a/dev-ros/genlisp/genlisp-0.4.15.ebuild
+++ b/dev-ros/genlisp/genlisp-0.4.15.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/genlisp"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/genlisp/genlisp-9999.ebuild b/dev-ros/genlisp/genlisp-9999.ebuild
index 8d813053eac2..5d699ff5e376 100644
--- a/dev-ros/genlisp/genlisp-9999.ebuild
+++ b/dev-ros/genlisp/genlisp-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/genlisp"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/genmsg/genmsg-0.5.6.ebuild b/dev-ros/genmsg/genmsg-0.5.6.ebuild
index d70c53c0941d..c8f8b29bfa24 100644
--- a/dev-ros/genmsg/genmsg-0.5.6.ebuild
+++ b/dev-ros/genmsg/genmsg-0.5.6.ebuild
@@ -5,7 +5,7 @@
EAPI=5
ROS_REPO_URI="https://github.com/ros/genmsg"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/genmsg/genmsg-9999.ebuild b/dev-ros/genmsg/genmsg-9999.ebuild
index d70c53c0941d..c8f8b29bfa24 100644
--- a/dev-ros/genmsg/genmsg-9999.ebuild
+++ b/dev-ros/genmsg/genmsg-9999.ebuild
@@ -5,7 +5,7 @@
EAPI=5
ROS_REPO_URI="https://github.com/ros/genmsg"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/genpy/Manifest b/dev-ros/genpy/Manifest
index 3ead43a6beb7..58cf4df99ef1 100644
--- a/dev-ros/genpy/Manifest
+++ b/dev-ros/genpy/Manifest
@@ -1,3 +1 @@
-DIST genpy-0.5.5.tar.gz 59514 SHA256 4727b5c176e94abd3fa4c2f3ce2b2b6d84ca7cb638a8899202a495a0f416df85 SHA512 f79e7ccf2ff6aba672ccbbf0a3ea9ac3c722d2eff5be5fcb71dcd345b45ad8dfde6db4b866bc2bc63707f377cef8757ebf6de61bf25599752360ae0c35dfada9 WHIRLPOOL 41fd1aa9a530fec161986994c12d240732d66e1014b8e8118b7296a33041e23042b0fd69a13fe580397147a37d7b3cf1e3c2371d2a1edf402f49c8d8403406ab
-DIST genpy-0.5.6.tar.gz 59571 SHA256 bf0c613206340483e054ff49570ba0b254ab285391fadbfecc1c392d642f6e77 SHA512 539bbbc2472ea0303c68318277e3e4301d10aac893266477815ccc3d08773c979b8d8f585115f11af5c364a75338909c144c28703337ddf9874c4afbfb0db12e WHIRLPOOL 701f8f1f20ce5f53ab37deff4365a44ce332239cdc39736d8a883db2af6b9da15812779bccb66a5aedf9154cdf05117d6bac4d9a4f60d4ced49b13034e6e0b14
DIST genpy-0.5.7.tar.gz 59642 SHA256 e45d05206d71a32e8e3e9d4a87e966aec716e54035b298723b5cb51db66bcab9 SHA512 73b909245a3c54703ef04217da60f8e5cbc2849736bb6bfa457b24248abc0dfdd65b7db70e44a0a6069bf1fc006b9fbbf6c93e04664d4452695c8271d54c0758 WHIRLPOOL 0c77675b6fb46cfb463a396e86c63d4d53f586cc796de5d388e90d47c88427e3a7a272d3ddc3ae5ade2b912da922ade357ce970fe5b7132312360d5f886a55f8
diff --git a/dev-ros/genpy/genpy-0.5.5.ebuild b/dev-ros/genpy/genpy-0.5.5.ebuild
deleted file mode 100644
index 6f7df14e557d..000000000000
--- a/dev-ros/genpy/genpy-0.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="test"
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
diff --git a/dev-ros/genpy/genpy-0.5.6.ebuild b/dev-ros/genpy/genpy-0.5.6.ebuild
deleted file mode 100644
index 46b7961a883c..000000000000
--- a/dev-ros/genpy/genpy-0.5.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/genpy"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit ros-catkin
-
-DESCRIPTION="Python ROS message and service generators"
-HOMEPAGE="http://wiki.ros.org/genpy"
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE=""
-
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- test? (
- dev-python/pyyaml[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
diff --git a/dev-ros/genpy/genpy-0.5.7.ebuild b/dev-ros/genpy/genpy-0.5.7.ebuild
index 46b7961a883c..e18cd2aa843c 100644
--- a/dev-ros/genpy/genpy-0.5.7.ebuild
+++ b/dev-ros/genpy/genpy-0.5.7.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/genpy"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/genpy/genpy-9999.ebuild b/dev-ros/genpy/genpy-9999.ebuild
index 46b7961a883c..e18cd2aa843c 100644
--- a/dev-ros/genpy/genpy-9999.ebuild
+++ b/dev-ros/genpy/genpy-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/genpy"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ros-catkin
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild
index 848bcb317921..b7914738d8fb 100644
--- a/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild
+++ b/dev-ros/geometry_msgs/geometry_msgs-1.12.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
index 848bcb317921..b7914738d8fb 100644
--- a/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
+++ b/dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/common_msgs"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
diff --git a/dev-ros/joint_state_publisher/Manifest b/dev-ros/joint_state_publisher/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/joint_state_publisher/Manifest
+++ b/dev-ros/joint_state_publisher/Manifest
@@ -1 +1,2 @@
DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/joint_state_publisher/joint_state_publisher-1.11.9.ebuild b/dev-ros/joint_state_publisher/joint_state_publisher-1.11.9.ebuild
new file mode 100644
index 000000000000..c536693a99c1
--- /dev/null
+++ b/dev-ros/joint_state_publisher/joint_state_publisher-1.11.9.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for setting and publishing joint state values for a given URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/wxpython[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${PYTHON_USEDEP}]
+"
diff --git a/dev-ros/kdl_parser/Manifest b/dev-ros/kdl_parser/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/kdl_parser/Manifest
+++ b/dev-ros/kdl_parser/Manifest
@@ -1 +1,2 @@
DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/kdl_parser/kdl_parser-1.11.9.ebuild b/dev-ros/kdl_parser/kdl_parser-1.11.9.ebuild
new file mode 100644
index 000000000000..7a28042faf3c
--- /dev/null
+++ b/dev-ros/kdl_parser/kdl_parser-1.11.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/roscpp
+ dev-ros/rosconsole
+ dev-ros/urdf
+ sci-libs/orocos_kdl
+ dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-9999.ebuild b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
index f3a2d5c4440c..7a28042faf3c 100644
--- a/dev-ros/kdl_parser/kdl_parser-9999.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/robot_model"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -23,4 +24,4 @@ RDEPEND="
dev-libs/tinyxml
"
DEPEND="${RDEPEND}
- test? ( dev-ros/rostest )"
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -1,4 +1,5 @@
DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
new file mode 100644
index 000000000000..35693d7f2669
--- /dev/null
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 315057b9ab13..1a6ee4a67658 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,4 +1 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
-DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
-DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
-DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
diff --git a/dev-ros/pr2_description/files/pr2_description.patch b/dev-ros/pr2_description/files/pr2_description.patch
deleted file mode 100644
index 5296a670a3ee..000000000000
--- a/dev-ros/pr2_description/files/pr2_description.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/pr2_description/CMakeLists.txt b/pr2_description/CMakeLists.txt
-index 1b75223..6c83182 100644
---- a/pr2_description/CMakeLists.txt
-+++ b/pr2_description/CMakeLists.txt
-@@ -91,8 +91,10 @@ add_custom_target(media_files ALL DEPENDS ${pr2urdf} ${pr2robot_expanded} ${prfr
- ## DEPENDS: system dependencies of this project that dependent projects also need
- catkin_package(CATKIN_DEPENDS xacro)
-
--catkin_add_gtest(test_urdf test/test_urdf.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
--target_link_libraries(test_urdf urdfdom_model)
-+if(CATKIN_ENABLE_TESTING)
-+ catkin_add_gtest(test_urdf test/test_urdf.cpp WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
-+ target_link_libraries(test_urdf urdfdom_model)
-+endif()
-
- foreach(dir meshes gazebo materials robots documents urdf)
- install(DIRECTORY ${dir}/
diff --git a/dev-ros/pr2_description/pr2_description-1.11.10.ebuild b/dev-ros/pr2_description/pr2_description-1.11.10.ebuild
deleted file mode 100644
index 3c99ffb7f2ea..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.11.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/pr2_description.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.11.11.ebuild b/dev-ros/pr2_description/pr2_description-1.11.14.ebuild
similarity index 86%
rename from dev-ros/pr2_description/pr2_description-1.11.11.ebuild
rename to dev-ros/pr2_description/pr2_description-1.11.14.ebuild
index daced8821d1f..c09b7f6640d7 100644
--- a/dev-ros/pr2_description/pr2_description-1.11.11.ebuild
+++ b/dev-ros/pr2_description/pr2_description-1.11.14.ebuild
@@ -6,6 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/pr2/pr2_common"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -14,7 +15,7 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="dev-ros/xacro"
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-ros/convex_decomposition
dev-ros/ivcon
diff --git a/dev-ros/pr2_description/pr2_description-1.11.9.ebuild b/dev-ros/pr2_description/pr2_description-1.11.9.ebuild
deleted file mode 100644
index 3c99ffb7f2ea..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.11.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual, etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro"
-DEPEND="${RDEPEND}
- dev-ros/convex_decomposition
- dev-ros/ivcon
- test? ( dev-libs/urdfdom dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/pr2_description.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
index daced8821d1f..c09b7f6640d7 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/pr2/pr2_common"
KEYWORDS="~amd64"
ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -14,7 +15,7 @@ LICENSE="BSD"
SLOT="0"
IUSE=""
-RDEPEND="dev-ros/xacro"
+RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-ros/convex_decomposition
dev-ros/ivcon
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -1,4 +1,5 @@
DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
new file mode 100644
index 000000000000..100efdd56436
--- /dev/null
+++ b/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 315057b9ab13..9e8fbda709dd 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,4 +1,5 @@
DIST pr2_common-1.11.10.tar.gz 33338874 SHA256 e9c50d2b40171b6501752c340d27610657741b6e35680f1cc0a21e45d820a678 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748 WHIRLPOOL f9529982ee38fc38f1cc965c62a131e9d73ee7e484acc13b6961240759dc5f336b9a5431e06d083787ee8db0c76a1f411b4628d2eb6776f318109b27476b1078
DIST pr2_common-1.11.11.tar.gz 33597551 SHA256 dd9303e02aa0633fc662bc0bb5521b7264fd7004265b0aeef4a6a6a01160f307 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b WHIRLPOOL 0abeddc87b8b9fc9f6f0aeb8db6c735ce508e59c71ccf95e002d7aeac1d6080324abeb36361508242b18fda6550c7c8ede822fafe2869fb46f71636ca577a5d6
DIST pr2_common-1.11.13.tar.gz 33598596 SHA256 20ece58fa557e61ec00411a8fb227cd23ba726d57e3736686b0e94595576b740 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987 WHIRLPOOL 872c5d1098f06975b047c2a696edbda01a6b1afc690a362dc8c34c7853e032d9ab8c31909358043a9cae74ae330afb28a62ec0a23f88d83d50998dfd95ca601f
+DIST pr2_common-1.11.14.tar.gz 33598683 SHA256 16f620a0b1fcf99f061a7a5fc292b5433f7ed8b96588da4dc85dc652ceb21d54 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf WHIRLPOOL 2fd52d4abd20c28c6c387e32bff80b90c423e6722f2a1410fa5cd429cadaa69cbbe03deedce361a199480553aa856fa87c5252dd3a2d1b784c5135a01e3a8a55
DIST pr2_common-1.11.9.tar.gz 33337556 SHA256 c6134939602c8a81d006bf4a4bfc48bf8746f5eb0c5b12baa1da8c946d1b4ce1 SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213 WHIRLPOOL ad5d6c543b1faca2ed48a66405eb8d6c17b9ef6352fa16b6fc55f9b093a6b1b7da3e0571ade5a6013c84d3695c16e910549ea2673c36a4179043ea4f085c1e05
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.11.14.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.11.14.ebuild
new file mode 100644
index 000000000000..b296b46392f1
--- /dev/null
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.11.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/pr2/pr2_common"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest
index 872de2f98e03..3d52f73f8554 100644
--- a/dev-ros/robot_pose_publisher/Manifest
+++ b/dev-ros/robot_pose_publisher/Manifest
@@ -1 +1 @@
-DIST robot_pose_publisher-0.2.3.tar.gz 4225 SHA256 b8e1f7e8957a89a929e66a3222261431e227639100f21a184e22dbd4226a467f SHA512 393c906754015161643a3047e8ab6690292d4446fc89fb1caa6e1a8fd25e6d880bcd23ea9780eea7c2fe7eb83331455894c93a90fdce01d0f483cae90b653314 WHIRLPOOL 4395b4a4395725eb1ff74768f92f0b39c42163b1c5a237d6776c01ec747e80e4fef3ce51ce632877f586e8219e6a9ea97ebfe3c591d1a807d4989239aa3675a6
+DIST robot_pose_publisher-0.2.4.tar.gz 4269 SHA256 5f6eaaabbe9e77d2830b6fb46e30001bc4f4d4bbd9f23eea69e125c1da318f40 SHA512 1309c0335dc0375802c3a4c7186d6248dca1307319d4ece6b390643d94bd2887cf5b016669d1b44025f04bd509424b7bee0d029c10f992a1207e2090366ae150 WHIRLPOOL 808d8209d19a4fe19f56a8c91ea7e892752684a231648323bfe0d72a4e5f9111911c5e0d0dbcc2d33c59c21885f573a474c444bea41984aae3058f54e492a3c3
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
similarity index 86%
rename from dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild
rename to dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
index ae81a9889c3c..ba8ba98a7fa2 100644
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher"
+ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
KEYWORDS="~amd64 ~arm"
inherit ros-catkin
diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
index ae81a9889c3c..ba8ba98a7fa2 100644
--- a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
+++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher"
+ROS_REPO_URI="https://github.com/GT-RAIL/robot_pose_publisher"
KEYWORDS="~amd64 ~arm"
inherit ros-catkin
diff --git a/dev-ros/std_msgs/std_msgs-0.5.9.ebuild b/dev-ros/std_msgs/std_msgs-0.5.9.ebuild
index def89fe81778..9707b2b18bdf 100644
--- a/dev-ros/std_msgs/std_msgs-0.5.9.ebuild
+++ b/dev-ros/std_msgs/std_msgs-0.5.9.ebuild
@@ -7,7 +7,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/std_msgs"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ${SCM} ros-catkin
diff --git a/dev-ros/std_msgs/std_msgs-9999.ebuild b/dev-ros/std_msgs/std_msgs-9999.ebuild
index def89fe81778..9707b2b18bdf 100644
--- a/dev-ros/std_msgs/std_msgs-9999.ebuild
+++ b/dev-ros/std_msgs/std_msgs-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/std_msgs"
CATKIN_HAS_MESSAGES=yes
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ${SCM} ros-catkin
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild
index b27e93ac6517..2d7b8e6b98c9 100644
--- a/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.5.12.ebuild
@@ -6,7 +6,7 @@ EAPI=5
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry_experimental"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
diff --git a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
index b27e93ac6517..2d7b8e6b98c9 100644
--- a/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
+++ b/dev-ros/tf2_msgs/tf2_msgs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
CATKIN_HAS_MESSAGES=yes
ROS_REPO_URI="https://github.com/ros/geometry_experimental"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
ROS_SUBDIR=${PN}
CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1 +1,2 @@
DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/urdf/urdf-1.11.9.ebuild b/dev-ros/urdf/urdf-1.11.9.ebuild
new file mode 100644
index 000000000000..e406d8de61e2
--- /dev/null
+++ b/dev-ros/urdf/urdf-1.11.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/robot_model"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-libs/urdfdom
+ dev-libs/urdfdom_headers
+ dev-ros/urdf_parser_plugin
+ dev-ros/pluginlib
+ dev-ros/rosconsole_bridge
+ dev-ros/roscpp
+ dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
+ dev-ros/cmake_modules
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
index e0ec2afa5395..e406d8de61e2 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=5
ROS_REPO_URI="https://github.com/ros/robot_model"
KEYWORDS="~amd64 ~arm"
ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
inherit ros-catkin
@@ -26,4 +27,4 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-ros/cmake_modules
- test? ( dev-ros/rostest dev-cpp/gtest )"
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf_parser_plugin/Manifest b/dev-ros/urdf_parser_plugin/Manifest
index 89a3e8cddfae..149c7a237c20 100644
--- a/dev-ros/urdf_parser_plugin/Manifest
+++ b/dev-ros/urdf_parser_plugin/Manifest
@@ -1 +1,2 @@
DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
+DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
diff --git a/dev-ros/geneus/geneus-2.2.4.ebuild b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.11.9.ebuild
similarity index 50%
rename from dev-ros/geneus/geneus-2.2.4.ebuild
rename to dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.11.9.ebuild
index 078897734087..3bfb77facbf7 100644
--- a/dev-ros/geneus/geneus-2.2.4.ebuild
+++ b/dev-ros/urdf_parser_plugin/urdf_parser_plugin-1.11.9.ebuild
@@ -3,17 +3,16 @@
# $Id$
EAPI=5
-
-ROS_REPO_URI="https://github.com/jsk-ros-pkg/geneus"
+ROS_REPO_URI="https://github.com/ros/robot_model"
KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
inherit ros-catkin
-DESCRIPTION="EusLisp ROS message and service generators"
+DESCRIPTION="C++ base class for URDF parsers"
LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="0"
IUSE=""
-RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/urdfdom_headers"
DEPEND="${RDEPEND}"
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 60ac4b08f3eb..1e9c4f77fcb2 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,2 +1,3 @@
DIST puppetdb-termini_3.0.1-1puppetlabs1_all.deb 21662 SHA256 a1930ded1549187b9c6d1bbd267b0ffe353f498cd053364349a99ed34214c614 SHA512 7ddbf0ae264fcf6063ba180e6ba19e1c491ece7f11b761f6fa66ba39c89de6e7b1a14efa04a113e553892bf987f79f3175dd950f55ce05b985ef7ea19e470ab0 WHIRLPOOL 204d8f8889e4725cf515ce23b5f8b3c5c987899751e2c1a43acae3ef92d7c8297921cc60c739d3fa6f77259b1e539a40b70e9cf081ab15509f21ef5a0b892a2e
DIST puppetdb-termini_3.1.0-1puppetlabs1_all.deb 21074 SHA256 58b7f2cd7f374c7d3be69be5d53b8def650b8cddf8848619981451532cfcc4eb SHA512 ac265806f33bbde23825a09f19710ee99e0f12195d921033aa156641e7c092e3ceefa40a855ce39a216ca486bf0d898d27ca3801be01af6f2e47b7582004c0bc WHIRLPOOL add162e4d66474cee3e6291c4305917128c3840fd8abda3ce4ff78337e1ac8c23a616fd5074f098f1036a9be75f21c27aa906c632cc49e5e2031a13b02d423bd
+DIST puppetdb-termini_3.2.3-1puppetlabs1_all.deb 22028 SHA256 b5461dac4bff77530b071dcffe270e896846eefdb83aa65d70cfdfab6eafda1f SHA512 d7f789f73a8e82e7cc291631577574aa75357a8a404f6949127749f26209c6f3017472afedcc1ce73b2d118b946423db059c7e840ad00828b491b1631321879b WHIRLPOOL 78be90206062adf49ace4518aa65d7a88ca18cd34a4b20857c03f7434103e0145f38018f7312b4c3514940c346e643e662bcbaf6974bd6ffe1af102afce5b493
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild
new file mode 100644
index 000000000000..98635dbc191a
--- /dev/null
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-3.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21"
+
+inherit unpacker
+
+DESCRIPTION="Library needed to connect puppet to puppetdb"
+HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
+SRC_URI="http://apt.puppetlabs.com/pool/wheezy/PC1/${PN:0:1}/puppetdb/${PN}_${PV}-1puppetlabs1_all.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+# will need the same keywords as puppet
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=""
+DEPEND+=""
+
+S=${WORKDIR}
+
+src_install() {
+ insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
+ doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
+}
diff --git a/dev-util/catkin/catkin-0.6.16-r2.ebuild b/dev-util/catkin/catkin-0.6.16-r2.ebuild
index 1e114945e04a..f9a32a87c9f0 100644
--- a/dev-util/catkin/catkin-0.6.16-r2.ebuild
+++ b/dev-util/catkin/catkin-0.6.16-r2.ebuild
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="http://github.com/ros/catkin"
fi
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ${SCM} cmake-utils python-r1 python-utils-r1
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 1e114945e04a..f9a32a87c9f0 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -10,7 +10,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="http://github.com/ros/catkin"
fi
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
inherit ${SCM} cmake-utils python-r1 python-utils-r1
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass
index deec3f6eb59b..3e40e3389037 100644
--- a/eclass/cmake-multilib.eclass
+++ b/eclass/cmake-multilib.eclass
@@ -21,7 +21,7 @@
# EAPI=5 is required for meaningful MULTILIB_USEDEP.
case ${EAPI:-0} in
- 5) ;;
+ 5|6) ;;
*) die "EAPI=${EAPI} is not supported" ;;
esac
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
new file mode 100644
index 000000000000..e261f2ed4675
--- /dev/null
+++ b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit git-r3
+
+DESCRIPTION="FlightGear data files"
+HOMEPAGE="http://www.flightgear.org/"
+EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
+ git://mapserver.flightgear.org/fgdata"
+EGIT_BRANCH="next"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+# data files split to separate package since 2.10.0
+RDEPEND="
+ !=dev-games/openscenegraph-3.2.0[png]
+ ~dev-games/simgear-${PV}
+ media-libs/openal
+ media-libs/speex
+ media-sound/gsm
+ sys-libs/zlib
+ x11-libs/libX11
+ dbus? ( >=sys-apps/dbus-1.6.18-r1 )
+ qt5? (
+ >=dev-qt/qtcore-5.4.1:5
+ >=dev-qt/qtgui-5.4.1:5
+ >=dev-qt/qtwidgets-5.4.1:5
+ )
+ udev? ( virtual/udev )
+ utils? (
+ media-libs/freeglut
+ media-libs/libpng:0
+ virtual/opengl
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/boost-1.44
+ >=media-libs/plib-1.8.5
+"
+RDEPEND="${COMMON_DEPEND}
+ ~games-simulation/${PN}-data-${PV}
+"
+
+DOCS=(AUTHORS ChangeLog NEWS README Thanks)
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_FGCOM=$(usex utils)
+ -DENABLE_FGELEV=$(usex utils)
+ -DENABLE_FGJS=$(usex utils)
+ -DENABLE_FGVIEWER=$(usex utils)
+ -DENABLE_FLITE=OFF
+ -DENABLE_GPSSMOOTH=$(usex utils)
+ -DENABLE_JS_DEMO=$(usex utils)
+ -DENABLE_JSBSIM=ON
+ -DENABLE_LARCSIM=ON
+ -DENABLE_LOGGING=$(usex test)
+ -DENABLE_METAR=$(usex utils)
+ -DENABLE_PROFILE=OFF
+ -DENABLE_QT=$(usex qt5)
+ -DENABLE_RTI=OFF
+ -DENABLE_TERRASYNC=$(usex utils)
+ -DENABLE_TESTS=$(usex test)
+ -DENABLE_UIUC_MODEL=ON
+ -DENABLE_YASIM=ON
+ -DEVENT_INPUT=$(usex udev)
+ -DFG_DATA_DIR=/usr/share/${PN}
+ -DJSBSIM_TERRAIN=ON
+ -DSIMGEAR_SHARED=ON
+ -DSP_FDMS=ON
+ -DSYSTEM_FLITE=ON
+ -DSYSTEM_HTS_ENGINE=ON
+ -DSYSTEM_SPEEX=ON
+ -DSYSTEM_GSM=ON
+ -DSYSTEM_SQLITE=ON
+ -DUSE_DBUS=$(usex dbus)
+ -DWITH_FGPANEL=$(usex utils)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Install icons and menu entry
+ local s
+ for s in 16 22 24 32 48 64 128; do
+ doicon -s ${s} icons/${s}x${s}/apps/${PN}.png
+ use utils && doicon -s ${s} icons/${s}x${s}/apps/fgcom.png
+ done
+ doicon -s scalable icons/scalable/${PN}.svg
+ use utils && doicon -s scalable icons/scalable/fgcom.svg
+
+ newmenu package/${PN}.desktop ${PN}.desktop
+
+ # Install bash completion (TODO zsh)
+ # Uncomment below when scripts stops writing files...
+# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
+# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
+# newbashcomp scripts/completion/fg-completion.bash ${PN}
+
+ # Install examples and other misc files
+ if use examples; then
+ insinto /usr/share/doc/"${PF}"/examples
+ doins -r scripts/java scripts/perl scripts/python
+ insinto /usr/share/doc/"${PF}"/examples/c++
+ doins -r scripts/example/*
+ insinto /usr/share/doc/"${PF}"/tools
+ doins -r scripts/atis scripts/tools/*
+ fi
+
+ # Install nasal script syntax
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles/syntax
+ doins scripts/syntax/{ac3d,nasal}.vim
+ insinto /usr/share/vim/vimfiles/ftdetect/
+ doins "${FILESDIR}"/{ac3d,nasal}.vim
+ fi
+}
+
+pkg_postinst() {
+ einfo "Please note that data files location changed to /usr/share/flightgear"
+ if use qt5; then
+ einfo "To use launcher, run fgfs with '--launcher' parameter"
+ fi
+}
diff --git a/games-strategy/warzone2100/warzone2100-3.1.3.ebuild b/games-strategy/warzone2100/warzone2100-3.1.3.ebuild
index f255dddd914b..5eba145c7e48 100644
--- a/games-strategy/warzone2100/warzone2100-3.1.3.ebuild
+++ b/games-strategy/warzone2100/warzone2100-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -42,7 +42,7 @@ RDEPEND=">=dev-games/physfs-2[zip]
dev-qt/qtgui:4
dev-qt/qtopengl:4
)
- !qt4? ( media-libs/libsdl[opengl,video] )"
+ !qt4? ( media-libs/libsdl[opengl,video,X] )"
DEPEND="${RDEPEND}
app-arch/zip
virtual/pkgconfig
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 8c8aede56751..716f71a389b3 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,6 +3,6 @@ DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614
DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
DIST postfix-3.0.4.tar.gz 4240805 SHA256 b81ce81176b9df7183ad99b9c98000135f5e88e659493ab50db5d9fe5b8dba0e SHA512 ca1ad1b7a0c552825d820e1ea017bdd79cf31e6262c9d2b801fa11011be5e10549cfb57745cec4177046a178fab104f3b7f79bf08708bb7772b127970970949d WHIRLPOOL e1a00ba9733522109ebbefa902021abda3bed0316da98cfb98a305122e736f5889b8b5a6426f152d0c68a9f8cb675683fddb80fd12fa6b278f1ae8c024c5fc1c
-DIST postfix-3.1-20160214.tar.gz 4326879 SHA256 342d72db2b2a95dbc84a85bd767874b95d17e1a0428397911ed3b72176c0993a SHA512 383c613f2ecff0115d752a641480412fd8fc706392e52624122254d625906c377136834bc4cf633fc5d840eb638e7667b8ac81d63fc0bdc3ef19f9cb5121a732 WHIRLPOOL 97db84fe14b5970468d22b5601539ac6c48223305c68edc3232047c94c527eaf07dfb3b30e11962b9d448f130d39875d99f3d719d13ba0ccba20a8e086804985
+DIST postfix-3.1.0-RC1.tar.gz 4336847 SHA256 a94c5aeaa9305393467c78bb7a97b454eec8f363d57528ab883d45a694577558 SHA512 f203189885b58aec0f93fb3dffcdd57c262958c2d5035d3d707a50597408c33a3860e08723ac241195446a6df9a2515ed2cf66eef2245ac9cc1ff281f1f75c4f WHIRLPOOL a9a5a5f4f4a5ff189bb4688d4710c92955ab5ee05c1a673b43a7a40a1a09affd16929c82ccf960d5d683bedcc0174a8baca645ab5992dfdcf9ed6a0d09a77eac
DIST postfix-3.2-20160221.tar.gz 4328066 SHA256 f9cd8af9bde5b5b10ce401ef69da5344da1c6d12d34c90e5215972a339de0eb6 SHA512 3be6f1cf53f18c0df129794338e3bef12357290fcbc9bddd04d64425e13f45bb4ad8282d5d8eefacf4d56a444bc09adb22f719935d83181d03bc131b28c67c10 WHIRLPOOL b3b4a8d3bb7a497b084b4c6426208c646f7e291a51977ab0572c396b4c217650d15ffef720b65392658794e1cd9eecd169d40d031589bba8b5be38521c6cd40e
DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.1_pre20160214.ebuild b/mail-mta/postfix/postfix-3.1.0_rc1.ebuild
similarity index 97%
rename from mail-mta/postfix/postfix-3.1_pre20160214.ebuild
rename to mail-mta/postfix/postfix-3.1.0_rc1.ebuild
index 790c62efd05d..febec018b14f 100644
--- a/mail-mta/postfix/postfix-3.1_pre20160214.ebuild
+++ b/mail-mta/postfix/postfix-3.1.0_rc1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
-inherit eutils flag-o-matic multilib pam systemd toolchain-funcs user versionator
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
RC_VER="2.7"
DESCRIPTION="A fast and secure drop-in replacement for sendmail"
@@ -68,13 +68,11 @@ pkg_setup() {
}
src_prepare() {
+ default
sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
src/util/sys_defs.h || die "sed failed"
-
# change default paths to better comply with portage standard paths
sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
}
src_configure() {
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 8697f088cf3c..7bbafc79eef6 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,3 +2,4 @@ DIST harfbuzz-0.9.41.tar.bz2 1188176 SHA256 d81aa53d0c02b437beeaac159d7fc16394d6
DIST harfbuzz-1.0.6.tar.bz2 1240522 SHA256 f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 SHA512 20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 WHIRLPOOL 63eab91311674417b66fa92e0b92a5482321dfa8dc48edcc3ae1ed459483222ab08229438356245cc183234a65388fbb6bdb73222359dea0ec2a35a1bf141c78
DIST harfbuzz-1.1.3.tar.bz2 1294579 SHA256 d93d7cb7979c32672e902fdfa884599e63f07f2fa5b06c66147d20c516d4b8f7 SHA512 e418a1543ec2a1e58e5d8d0ba9a40e8675eda13c94c664ff83ed6303c724f078cf1744883b454c46ec40157db8dc05e7f2cf5e52200601bb1e13827d8dfbaccf WHIRLPOOL 9d18d985df77ff841b1a87d25f17eb472517e109a051f2ed213b44ec91de3a499853cf7d93e23f5ac4c199ec65f2dd02300e05097cb4983565ebb9227c8d3810
DIST harfbuzz-1.2.0.tar.bz2 1333335 SHA256 79ff5305153d15931fbdda80c9612783b0283dee44f4c2af71aa37353daaa685 SHA512 92a2203ab3491992081c3cbcb7b151e1c632a98c9b2cc27863df377e08d3951387f513c7f5184a05b0523b99517775e083edfccac8386981c242ed02d34052c5 WHIRLPOOL ddcb6b3afb3b56bc326086e01450da978cdfe3832b2f2eb136cec0a6a089f701a0e572b5a3a256a186ef88a2232d336279fd8348223bcbf1eccc42db2338ff07
+DIST harfbuzz-1.2.1.tar.bz2 1335074 SHA256 0c189aa386c5ea8d7c315adf273f56f48f412081a367b3f92abc2d0855fa2226 SHA512 537da15b217096a3acf3ac6077e5fab1c9c7d473a924ba241ccdcf5f375051e9d34be9f309165daae8db05ca1819204e8b95b95a7508216526145b0c2d46d0dc WHIRLPOOL 1b05eb7e511b8405358dfd1d1317cdb793b6931568bc86f6808595a9cc51ec38b5775d33b15a34623fff7ba086a2ec75a34c10920b84d43ee7de8c4dcb9429df
diff --git a/media-libs/harfbuzz/harfbuzz-1.2.1.ebuild b/media-libs/harfbuzz/harfbuzz-1.2.1.ebuild
new file mode 100644
index 000000000000..5c0e26bddf75
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils libtool multilib-minimal python-any-r1
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+[[ ${PV} == 9999 ]] || SRC_URI="http://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+
+IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+ cairo? ( x11-libs/cairo:= )
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+ >=dev-libs/gobject-introspection-common-1.34
+ dev-util/ragel
+"
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+ # on Darwin/Solaris we need to link with g++, like automake defaults
+ # to, but overridden by upstream because on Linux this is not
+ # necessary, bug #449126
+ sed -i \
+ -e 's/\/CXXLINK/' \
+ src/Makefile.am || die
+ sed -i \
+ -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \
+ src/Makefile.in || die
+ sed -i \
+ -e '/AM_V_CCLD/s/\/CXXLINK/' \
+ test/api/Makefile.in || die
+ fi
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+ elibtoolize # for Solaris
+
+ # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+ sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ # harfbuzz-gobject only used for instrospection, bug #535852
+ econf \
+ --without-coretext \
+ --without-uniscribe \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_with cairo) \
+ $(use_with fontconfig) \
+ $(use_with glib) \
+ $(use_with introspection gobject) \
+ $(use_with graphite graphite2) \
+ $(use_with icu) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with truetype freetype)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index 4685eff553aa..a79e471cac53 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -2,3 +2,4 @@ DIST libass-0.11.2.tar.xz 297172 SHA256 499dbaf14d7743e5899c9ca918988e81a9894f67
DIST libass-0.12.3.tar.xz 313852 SHA256 a67c54ebaf5ec19ae72e86259ee6ab6adfe2e64ed9f9149db03dc863360ea38c SHA512 84931e89f02487ff01bfe24be3d90b1db8599ab2a5ec2277824b4330cd9219189a54f19d2d83f223d2d6f973b5e7474f2691905091749a776147669b72754be2 WHIRLPOOL 7187d678dfec621d5736ecb4d9dbf6559c74d6c1b4dfcdd7bc4f78313e8f10f73d3cefd33bfa9a1ceed87cb00767e4235b95e144c527e74746e680b6bb12c719
DIST libass-0.13.0.tar.xz 336128 SHA256 e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 SHA512 0253d0cd306603b2721bd128ad6eb050c74f1ee415145f238f3a10c4041b054bf94857f4c0043a6578c4fd0865e809e25fa9f61071631ba647c731c13418627f WHIRLPOOL 7ccf4df975a07e94cdc85b4436b08eae1a6ce60d027d0db21855bbdfd21e4770a5e21cae90ce7646b477094241df3b36c247f043f347f2f1494f3d6a02e91f28
DIST libass-0.13.1.tar.xz 318840 SHA256 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7 SHA512 0558e6bb139d9e3c506fa358b02dbeecf574098defb9a4d4c935dac402fc9cf09725114612d3a987f54dee5a08d55f135a64fd87d35fc25dda1bef72bc23d720 WHIRLPOOL ef128daecc0a4a3a026d8fb90da44088c9451bb1acd91fb3b8c90b0e564b62576e7328bd7c4442b6e6f6efa1b18cb3c9a0ac80e44acbfec45d65d834f712f1c2
+DIST libass-0.13.2.tar.xz 348444 SHA256 d698d0a6adca7c36c5a86b540d67b05bfd36cebc3c351ab7646497c43fe1face SHA512 71d495c02ea478b8632c177cef8605d23377e2da2c56dd3a1fa59f9a2d01cc642d4d9dc383083ef1dee8ccf2a6e6f25a4ad9bb7dff3618e7646161731b7312c7 WHIRLPOOL 0c5517fc0cae9ae775300b9c03eb1f141b607b6e43413e56f2dc5de490f5cbe57fd9acc2caa9b6dc5505d7c7b2aec0ae4426fbe2e75010e0c9ffaf2f7a0f7fed
diff --git a/media-libs/libass/libass-0.13.2.ebuild b/media-libs/libass/libass-0.13.2.ebuild
new file mode 100644
index 000000000000..20df06146ee7
--- /dev/null
+++ b/media-libs/libass/libass-0.13.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib-minimal
+
+DESCRIPTION="Library for SSA/ASS subtitles rendering"
+HOMEPAGE="https://github.com/libass/libass"
+SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0/5" # subslot = libass soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+fontconfig +harfbuzz static-libs"
+
+RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=dev-libs/fribidi-0.19.5-r1[${MULTILIB_USEDEP}]
+ harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+X86_CPU_OPTS="abi_x86_32 abi_x86_64"
+for i in ${X86_CPU_OPTS} ; do
+ DEPEND="${DEPEND}
+ ${i}? ( dev-lang/yasm )"
+done
+
+DOCS="Changelog"
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ $(use_enable fontconfig) \
+ $(use_enable harfbuzz) \
+ $(use_enable static-libs static) \
+ --disable-require-system-font-provider
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index ac91c9937e6f..413b1b6f0fce 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,5 +1,3 @@
-DIST mythplugins-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 45980 SHA256 a3ec6dcde8ee74b0a518c42555947b0a9050f63625df4f6b94a4830768267242 SHA512 490a2bfdfe1011721e17a74f25d6a404d14af855b5790620553467d7efd0a3dc050fa2c716ba88a06924ba1c456b40968f2862557688c0d31999f05549f6d39a WHIRLPOOL db6a1b277e0c0bf122a1c910f446dc6a924c7cdb82bb23996e8f45239185c60d59e0974b62ea281b807eafce2fcb72f2f96d0f8051cc47ea1b8602d49c82e372
-DIST mythplugins-0.26.0.tar.bz2 36673620 SHA256 4e7f0493f37792c084c1b4d0b5863b4201ebce6d62ab7c6cc31ca74087d83c62 SHA512 51c10f46186e14e69c5626f2ae0955692c71aa7459fd018efaab1b99809cad533a84754d53455017102ff6f94cc9905dc303248a29d4095ba8f4f685bb022f49 WHIRLPOOL a2b995f2a94a2eb22fa0740dd840a2fe2d9d4b808af1dc43e9d83c626d93ed95134d64db2049e4b79379838ae16b1de6547b56277531e2752e6779b3cddbf25a
DIST mythplugins-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 58328 SHA256 b8d7b2338236baeb20a26d2c83eb3c92b9a6f0aa96c66542e47018e4c833a213 SHA512 1ed2786f9c1fd0f7d607806b6ca34100ec116191e02573cc5def18c2581bb841e6f7e5b9fe066bfb9f52931b314ead157a64ab84a27bae06610282237d249dfc WHIRLPOOL 56977fab1cb93768164c4e3feb2fe503d22d44e70fd046cdbe3b05de0066a8792afd1097721029713b3f4f30c79e34d8ba617afe4c1241af0f1a741854cc3349
DIST mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 1364 SHA256 8b7abe67562767478f583fe36704570612425f82a05b9288cc82e3015bf2fc16 SHA512 2fe3a317ecdffc06d9e9b554cf8bfb54a324b7f1441038d51e9f77d13b53693ed6d2721282b239967c6d539947e1b119f579e49b42ba62f7dafd0144c0d28622 WHIRLPOOL 5fc5222364fbb11312f92f8adaef3adff46e89251afcdeea48d1466625072d068ebdb66f9426140765da6f4fc02a117b086033a319f148700cc164bad6fbc0f1
DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
diff --git a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild b/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild
deleted file mode 100644
index e6acfe47c29b..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.26.0_p20130922-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="2:2.6"
-BACKPORTS="9fd7c6102b2cd1a3760337663803b110446c6ea7"
-MY_P=${P%_p*}
-
-inherit eutils python
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
- ${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
-mythmusic mythnetvision mythnews mythweather mythzoneminder"
-
-IUSE="${MYTHPLUGINS} cdda cdr exif fftw raw"
-
-DEPEND="!media-plugins/mytharchive
- !media-plugins/mythbrowser
- !media-plugins/mythgallery
- !media-plugins/mythgame
- !media-plugins/mythmovies
- !media-plugins/mythmusic
- !media-plugins/mythnetvision
- !media-plugins/mythnews
- !media-plugins/mythweather
- =media-tv/mythtv-${PV}*:=[python]
- mytharchive? (
- app-cdr/dvd+rw-tools
- dev-python/pillow:=
- media-video/dvdauthor
- media-video/mjpegtools[png]
- media-video/transcode
- virtual/cdrtools
- )
- mythgallery? (
- media-libs/tiff:=
- virtual/opengl
- exif? ( >media-libs/libexif-0.6.9:= )
- raw? ( media-gfx/dcraw )
- )
- mythmusic? (
- >=media-libs/flac-1.1.2:=
- >=media-libs/libvorbis-1.0:=
- >=media-libs/taglib-1.6:=
- media-sound/lame
- virtual/opengl
- cdda? (
- dev-libs/libcdio:=
- cdr? ( virtual/cdrtools )
- )
- fftw? ( sci-libs/fftw:= )
- )
- mythnetvision? (
- =dev-lang/python-2*:=[xml]
- dev-python/lxml:=
- dev-python/mysql-python:=
- dev-python/oauth:=
- dev-python/pycurl:=
- )
- mythweather? (
- dev-perl/DateManip
- dev-perl/DateTime-Format-ISO8601
- dev-perl/Image-Size
- dev-perl/JSON
- dev-perl/SOAP-Lite
- dev-perl/XML-Simple
- dev-perl/XML-Parser
- dev-perl/XML-SAX
- dev-perl/XML-XPath
- )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
- cdda? ( mythmusic )
- cdr? ( mythmusic cdda )
- exif? ( mythgallery )
- fftw? ( mythmusic )
- mythnews? ( mythbrowser )
- raw? ( mythgallery )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- epatch_user
-}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- --python=python2 \
- --enable-opengl \
- $(use_enable mythzoneminder) \
- $(use_enable mytharchive) \
- $(use_enable mythbrowser) \
- $(use_enable mythgallery) \
- $(use_enable mythgame) \
- $(use_enable mythmusic) \
- $(use_enable mythnetvision) \
- $(use_enable mythnews) \
- $(use_enable mythweather) \
- $(use_enable cdda cdio) \
- $(use_enable exif) \
- $(use_enable exif new-exif) \
- $(use_enable raw dcraw) \
- || die "configure failed"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild
deleted file mode 100644
index 8d1ce4201db1..000000000000
--- a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627-r3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-BACKPORTS="9498257571e8158926b60a0eefc74568c4436823"
-MY_P=${P%_p*}
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Official MythTV plugins"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
- ${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
-mythmusic mythnetvision mythnews mythweather mythzoneminder"
-
-IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid"
-
-DEPEND="!media-plugins/mytharchive
- !media-plugins/mythbrowser
- !media-plugins/mythgallery
- !media-plugins/mythgame
- !media-plugins/mythmovies
- !media-plugins/mythmusic
- !media-plugins/mythnetvision
- !media-plugins/mythnews
- !media-plugins/mythweather
- =media-tv/mythtv-${PV}*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
- dev-libs/glib:=
- xml? ( >=dev-libs/libxml2-2.6.0:= )
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- dev-qt/qtsql:4
- dev-libs/openssl:=
- alsa? ( >=media-libs/alsa-lib-1.0.24:= )
- hls? (
- media-libs/faac:=
- media-libs/libvpx:=
- >=media-libs/x264-0.0.20111220:=
- >=media-sound/lame-3.93.1
- )
- media-libs/freetype:=
- libass? ( >=media-libs/libass-0.9.11:= )
- media-libs/libpng:=
- theora? (
- media-libs/libtheora:=
- media-libs/libogg:=
- )
- xvid? ( >=media-libs/xvid-1.1.0:= )
- virtual/libudev:=
- ieee1394? (
- >=sys-libs/libraw1394-1.2.0:=
- >=sys-libs/libavc1394-0.5.3:=
- >=media-libs/libiec61883-1.0.0:=
- )
- x11-libs/libX11:=
- sys-libs/zlib:=
- x11-libs/libXext:=
- x11-libs/libXinerama:=
- x11-libs/libXrandr:=
- x11-libs/libXv:=
- x11-libs/libXxf86vm:=
- fftw? ( sci-libs/fftw:= )
- sys-apps/util-linux:=
- mythzoneminder? ( virtual/mysql )
- mytharchive? (
- app-cdr/dvd+rw-tools
- dev-python/pillow:=
- media-video/dvdauthor
- media-video/mjpegtools[png]
- media-video/transcode
- virtual/cdrtools
- )
- mythgallery? (
- media-libs/tiff:=
- virtual/opengl
- exif? ( >media-libs/libexif-0.6.9:= )
- raw? ( media-gfx/dcraw )
- )
- mythmusic? (
- >=media-libs/flac-1.1.2:=
- >=media-libs/taglib-1.6:=
- >=media-libs/libvorbis-1.0:=
- media-libs/libogg:=
- >=media-sound/lame-3.93.1
- virtual/opengl
- cdda? (
- dev-libs/libcdio:=
- cdr? ( virtual/cdrtools )
- )
-
- )
- mythnetvision? (
- ${PYTHON_DEPS}
- dev-python/lxml:=
- dev-python/mysql-python:=
- dev-python/oauth:=
- dev-python/pycurl:=
- )
- mythweather? (
- dev-perl/DateManip
- dev-perl/DateTime-Format-ISO8601
- >=dev-perl/DateTime-1
- dev-perl/Image-Size
- dev-perl/JSON
- dev-perl/SOAP-Lite
- dev-perl/XML-Simple
- dev-perl/XML-Parser
- dev-perl/XML-SAX
- dev-perl/XML-XPath
- )
- mythbrowser? (
- dev-qt/qtwebkit:4
- )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
- cdda? ( mythmusic )
- cdr? ( mythmusic cdda )
- exif? ( mythgallery )
- fftw? ( mythmusic )
- mythmusic? ( vorbis )
- mythnews? ( mythbrowser )
- raw? ( mythgallery )
- mythnetvision? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/mythtv-0.27.5/mythplugins"
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
- epatch
-
- epatch_user
-}
-
-src_configure() {
- ./configure \
- --prefix=/usr \
- --python=${EPYTHON} \
- --enable-opengl \
- $(use_enable mythzoneminder) \
- $(use_enable mytharchive) \
- $(use_enable mythbrowser) \
- $(use_enable mythgallery) \
- $(use_enable mythgame) \
- $(use_enable mythmusic) \
- $(use_enable mythnetvision) \
- $(use_enable mythnews) \
- $(use_enable mythweather) \
- $(use_enable cdda cdio) \
- $(use_enable exif) \
- $(use_enable exif new-exif) \
- $(use_enable raw dcraw) \
- || die "configure failed"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die "make install failed"
-}
diff --git a/media-sound/dcadec/Manifest b/media-sound/dcadec/Manifest
new file mode 100644
index 000000000000..d1c9fddf6b5a
--- /dev/null
+++ b/media-sound/dcadec/Manifest
@@ -0,0 +1 @@
+DIST dcadec-0.2.0.tar.gz 225305 SHA256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 SHA512 94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb WHIRLPOOL 33aa735fed95dcb5cb97fec767971bc151c7925f40589beb9c10fca57e0871da66b800fc9a23613a14e8ffbec2758a5e516debf3bb600e2c2c9f1fcad14b66e4
diff --git a/media-sound/dcadec/dcadec-0.2.0.ebuild b/media-sound/dcadec/dcadec-0.2.0.ebuild
new file mode 100644
index 000000000000..d93dc26aa6d6
--- /dev/null
+++ b/media-sound/dcadec/dcadec-0.2.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://github.com/foo86/dcadec.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/foo86/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+fi
+
+DESCRIPTION="DTS Coherent Acoustics decoder with support for HD extensions"
+HOMEPAGE="https://github.com/foo86/dcadec"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+
+src_configure() {
+ tc-export AR CC
+ sed -i \
+ -e "/^PREFIX /s:=.*:= ${EPREFIX}/usr:" \
+ -e "/^LIBDIR /s:/lib:/$(get_libdir):" \
+ -e '/^CFLAGS/s:-O3::' \
+ Makefile || die
+}
+
+src_install() {
+ default
+ # Rename the executable since it conflicts with libdca.
+ mv "${ED}"/usr/bin/dcadec{,-new} || die
+}
diff --git a/media-sound/dcadec/metadata.xml b/media-sound/dcadec/metadata.xml
new file mode 100644
index 000000000000..7294e2a4987a
--- /dev/null
+++ b/media-sound/dcadec/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ sound@gentoo.org
+
+
+ foo86/dcadec
+
+
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 20c0187489bd..30575a0bf4fa 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,6 @@
DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a
DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506
-DIST kodi-15.1-generated-addons.tar.xz 73988 SHA256 97f0236542044a909d982cbf9a031f76395a59a1d4a79187c1102845579ed8f2 SHA512 559c188471c84503840b8b2010b73f15cf083367a1e1d0d5cfe7c144e36821a07c6fff1ff379ad8e8b254bc0cc2555c0a17ae998003adf86b051febde97bf2f1 WHIRLPOOL 01b76391d6aa7c624ad23329c962416cdf4662b96e99724bb566d7ed20b08b1525acd4f12671eef04ac10e5255d097f7c2452d2bfd87f7dfd3f4c1cd621fe2a6
-DIST kodi-15.1.tar.gz 61477835 SHA256 72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705 SHA512 b597253aa51d3d446ecb85ffe163362b5e55717d6fee16eab81725b9cdf0a5a9e4a2291aa526b9e63fbb34ef206100df30c9368684e2ddedc49e35f140d604f0 WHIRLPOOL 3596c00f9d25193e1e84cdfbf7fe5a6e6bdcce37caa710b8dd2b0b7aaa043164410459009dc793991373886abed8755298ee8803edf7b90227509d0c3578b8b9
DIST kodi-15.2-generated-addons.tar.xz 73912 SHA256 8c604be6188e03569209632dca96a9e333fa898e41651ac81f7fad2a45163610 SHA512 094ac1373a80d08371daad8fb1ee4422b8c16f77430fcd4a2b78ed0dc1883027086081e5788e07333c345121a20fda89b0bd5bcb2c8922b79573aca6e4726b9a WHIRLPOOL 560b8de1fa506ea1a73b5a0c539563649159dbb83b9996dc550e706037c5ff15dc657f382e55b2812797c1eee596b2b3b84a0061b6c74b2a5179a126a1841583
DIST kodi-15.2.tar.gz 61484128 SHA256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 SHA512 870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67 WHIRLPOOL 5d484ff8eb8b48de643bf6dbff0ca824d528143d2f6f78f124bae19a0f67db72271c865786520672ef716cedba4ad4ad11c59fe857c8b34ec9331724f09046c2
+DIST kodi-16.0-generated-addons.tar.xz 76876 SHA256 fb164bf2aaf54d0c4a6da60b768b40f47c61456ac9bfd5c859593e37c56080c4 SHA512 7b06e3dc7c7cad4b4bb43dafadb756e3b6064452d289b81097a5a340f33a0fd6b7da82954578039f980dd6338de4b6e0105ed69678c01548b4e79f072a120800 WHIRLPOOL bcff75cdc21cebff305052d985de9f88a3043d4a0aa81509c8daff3ace28fd18ca625f3394bd1b109ec242c3310a4934b4f4837355f39de47be6ff6031a1d13f
+DIST kodi-16.0.tar.gz 52093964 SHA256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 SHA512 b187f57601dfadc2119622f19558dbaca6ba7c708f5c24d65b876ee32888251940ffa8caadf978ee1afbd7c8da5007771e013d639819b998c345e968149995ac WHIRLPOOL ca19325b52c4c7de72a8d18cc9d68a83203274d3a432bcd83188904a9a2ba4e69372144c40ada3b3cd89ed12d740a1dceec75c5511b706b922374784bf817b3f
diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index f911458c92b8..f28bb68a4463 100644
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -34,7 +34,10 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sdl sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552
REQUIRED_USE="
+ gles? ( !vaapi )
+ !vaapi? ( !gles )
pvr? ( mysql )
rsxs? ( X )
xrandr? ( X )
diff --git a/media-tv/kodi/kodi-15.2.ebuild b/media-tv/kodi/kodi-15.2.ebuild
index bd1626871b46..d895158b48b2 100644
--- a/media-tv/kodi/kodi-15.2.ebuild
+++ b/media-tv/kodi/kodi-15.2.ebuild
@@ -35,7 +35,10 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552
REQUIRED_USE="
+ gles? ( !vaapi )
+ !vaapi? ( !gles )
rsxs? ( X )
udisks? ( dbus )
upower? ( dbus )
diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-16.0.ebuild
similarity index 82%
rename from media-tv/kodi/kodi-15.1.ebuild
rename to media-tv/kodi/kodi-16.0.ebuild
index 198691d55e44..09f3eca4d97c 100644
--- a/media-tv/kodi/kodi-15.1.ebuild
+++ b/media-tv/kodi/kodi-16.0.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
-CODENAME="Isengard"
+CODENAME="Jarvis"
case ${PV} in
9999)
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
@@ -34,9 +33,11 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552
REQUIRED_USE="
- rsxs? ( X )
+ gles? ( !vaapi )
+ !vaapi? ( !gles )
udisks? ( dbus )
upower? ( dbus )
"
@@ -68,25 +69,25 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/jasper
media-libs/jbigkit
>=media-libs/libass-0.9.7
- bluray? ( media-libs/libbluray )
+ bluray? ( >=media-libs/libbluray-0.7.0 )
css? ( media-libs/libdvdcss )
media-libs/libmad
media-libs/libmodplug
media-libs/libmpeg2
media-libs/libogg
- media-libs/libpng
- projectm? ( media-libs/libprojectm )
+ media-libs/libpng:0=
media-libs/libsamplerate
joystick? ( media-libs/libsdl2 )
>=media-libs/taglib-1.8
media-libs/libvorbis
- media-libs/tiff
+ media-libs/tiff:0=
+ media-sound/dcadec
pulseaudio? ( media-sound/pulseaudio )
media-sound/wavpack
>=media-video/ffmpeg-2.6:=[encode]
rtmp? ( media-video/rtmpdump )
avahi? ( net-dns/avahi )
- nfs? ( net-fs/libnfs )
+ nfs? ( net-fs/libnfs:= )
webserver? ( net-libs/libmicrohttpd[messages] )
sftp? ( net-libs/libssh[sftp] )
net-misc/curl
@@ -95,8 +96,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( sys-apps/dbus )
caps? ( sys-libs/libcap )
sys-libs/zlib
- virtual/jpeg
- usb? ( virtual/libusb )
+ virtual/jpeg:0=
+ usb? ( virtual/libusb:1 )
mysql? ( virtual/mysql )
opengl? (
virtual/glu
@@ -108,7 +109,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
)
vaapi? ( x11-libs/libva[opengl] )
vdpau? (
- || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+ || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
media-video/ffmpeg[vdpau]
)
X? (
@@ -125,13 +126,15 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
dev-lang/swig
+ dev-libs/crossguid
dev-util/gperf
texturepacker? ( media-libs/giflib )
X? ( x11-proto/xineramaproto )
dev-util/cmake
x86? ( dev-lang/nasm )
java? ( virtual/jre )
- test? ( dev-cpp/gtest )"
+ test? ( dev-cpp/gtest )
+ virtual/pkgconfig"
# Force java for latest git version to avoid having to hand maintain the
# generated addons package. #488118
[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
@@ -153,8 +156,7 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
- epatch "${FILESDIR}"/${P}-texturepacker.patch
- epatch "${FILESDIR}"/${P}-gcc-5.patch #544760
+ epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch
epatch_user #293109
# some dirs ship generated autotools, some dont
@@ -218,29 +220,23 @@ src_configure() {
$(use_enable css dvdcss) \
$(use_enable dbus) \
$(use_enable debug) \
- $(use_enable fishbmc) \
$(use_enable gles) \
- $(use_enable goom) \
$(use_enable joystick) \
$(use_enable midi mid) \
$(use_enable mysql) \
$(use_enable nfs) \
$(use_enable opengl gl) \
$(use_enable profile profiling) \
- $(use_enable projectm) \
$(use_enable pulseaudio pulse) \
- $(use_enable rsxs) \
$(use_enable rtmp) \
$(use_enable samba) \
$(use_enable sftp ssh) \
- $(use_enable spectrum) \
$(use_enable usb libusb) \
$(use_enable test gtest) \
$(use_enable texturepacker) \
$(use_enable upnp) \
$(use_enable vaapi) \
$(use_enable vdpau) \
- $(use_enable waveform) \
$(use_enable webserver) \
$(use_enable X x11)
}
@@ -251,30 +247,18 @@ src_compile() {
src_install() {
default
- rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+ rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
domenu tools/Linux/kodi.desktop
newicon media/icon48x48.png kodi.png
- # Remove optional addons (platform specific).
- local disabled_addons=(
- repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
- visualization.dxspectrum
- visualization.vortex
- )
- rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
-
# Remove fonconfig settings that are used only on MacOSX.
# Can't be patched upstream because they just find all files and install
# them into same structure like they have in git.
rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
- # Replace bundled fonts with system ones
- # teletext.ttf: unknown
- # bold-caps.ttf: unknown
- # roboto: roboto-bold, roboto-regular
- # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
- rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
+ # Replace bundled fonts with system ones.
+ rm "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die
dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index ae769d2b5c4b..74b96a992b98 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
# Does not work with py3 here
-# It might work with py:2.5 but I didn't test that
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
-CODENAME="Isengard"
+CODENAME="Krypton"
case ${PV} in
9999)
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
@@ -34,9 +33,11 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552
REQUIRED_USE="
- rsxs? ( X )
+ gles? ( !vaapi )
+ !vaapi? ( !gles )
udisks? ( dbus )
upower? ( dbus )
"
@@ -47,7 +48,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
app-arch/zip
app-i18n/enca
airplay? ( app-pda/libplist )
- dev-libs/boost
dev-libs/expat
dev-libs/fribidi
dev-libs/libcdio[-minimal]
@@ -65,22 +65,19 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/flac
media-libs/fontconfig
media-libs/freetype
- media-libs/jasper
media-libs/jbigkit
>=media-libs/libass-0.9.7
bluray? ( >=media-libs/libbluray-0.7.0 )
css? ( media-libs/libdvdcss )
media-libs/libmad
media-libs/libmodplug
- media-libs/libmpeg2
media-libs/libogg
media-libs/libpng:0=
- projectm? ( media-libs/libprojectm )
media-libs/libsamplerate
joystick? ( media-libs/libsdl2 )
>=media-libs/taglib-1.8
media-libs/libvorbis
- media-libs/tiff:0=
+ media-sound/dcadec
pulseaudio? ( media-sound/pulseaudio )
media-sound/wavpack
>=media-video/ffmpeg-2.6:=[encode]
@@ -95,13 +92,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
dbus? ( sys-apps/dbus )
caps? ( sys-libs/libcap )
sys-libs/zlib
- virtual/jpeg:0=
usb? ( virtual/libusb:1 )
mysql? ( virtual/mysql )
opengl? (
virtual/glu
virtual/opengl
- >=media-libs/glew-1.5.6
)
gles? (
media-libs/mesa[gles2]
@@ -132,7 +127,8 @@ DEPEND="${COMMON_DEPEND}
dev-util/cmake
x86? ( dev-lang/nasm )
java? ( virtual/jre )
- test? ( dev-cpp/gtest )"
+ test? ( dev-cpp/gtest )
+ virtual/pkgconfig"
# Force java for latest git version to avoid having to hand maintain the
# generated addons package. #488118
[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
@@ -218,29 +214,23 @@ src_configure() {
$(use_enable css dvdcss) \
$(use_enable dbus) \
$(use_enable debug) \
- $(use_enable fishbmc) \
$(use_enable gles) \
- $(use_enable goom) \
$(use_enable joystick) \
$(use_enable midi mid) \
$(use_enable mysql) \
$(use_enable nfs) \
$(use_enable opengl gl) \
$(use_enable profile profiling) \
- $(use_enable projectm) \
$(use_enable pulseaudio pulse) \
- $(use_enable rsxs) \
$(use_enable rtmp) \
$(use_enable samba) \
$(use_enable sftp ssh) \
- $(use_enable spectrum) \
$(use_enable usb libusb) \
$(use_enable test gtest) \
$(use_enable texturepacker) \
$(use_enable upnp) \
$(use_enable vaapi) \
$(use_enable vdpau) \
- $(use_enable waveform) \
$(use_enable webserver) \
$(use_enable X x11)
}
@@ -251,30 +241,18 @@ src_compile() {
src_install() {
default
- rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
+ rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
domenu tools/Linux/kodi.desktop
newicon media/icon48x48.png kodi.png
- # Remove optional addons (platform specific).
- local disabled_addons=(
- repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
- visualization.dxspectrum
- visualization.vortex
- )
- rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
-
# Remove fonconfig settings that are used only on MacOSX.
# Can't be patched upstream because they just find all files and install
# them into same structure like they have in git.
rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
- # Replace bundled fonts with system ones
- # teletext.ttf: unknown
- # bold-caps.ttf: unknown
- # roboto: roboto-bold, roboto-regular
- # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
- rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
+ # Replace bundled fonts with system ones.
+ rm "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die
dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index a631699ee113..2af75cc8a5a7 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,8 +1,4 @@
-DIST mythtv-0.26.0-9fd7c6102b2cd1a3760337663803b110446c6ea7.tar.xz 179540 SHA256 ae63398f1ea8884950eb4653c42f6bf71e504738112f5ac8f4d13c1988098d95 SHA512 599dab7a51e9e2f5e240e6d80aadf3bc1f89b8f83e0a5c2e6c82695926ef3f1b7694a73d95b0a296544f9642f1e070a809d86563a415498345a3c1049f269aa4 WHIRLPOOL 74c8aa8f2846eb67f88bddacf5d7c5aa0445e0fe2fbd0f6f2f284e51e1f2c024ca8b7ef22639b7e201b8304421859d7bab802a7d2fe9343ec40d36453f0bfa8e
-DIST mythtv-0.26.0.tar.bz2 40887666 SHA256 2f158962ca3009db563dabc32827c47788a688bd67a25abd76f4baa9c3cfe306 SHA512 8c8766542b6a1a877d400fd99343e8149d9c6cc4ab1e425db358bdbdc10b6cb7422bb4bdcf984ce64b2cf02b0ad0725606b266558afcadff9ec9c9bb95bb49c0 WHIRLPOOL c737a1dbdfafe65ae5ee3bde8d0b3a9ad50ebfccec784d6907c78d03f9732637cfbf8b82ecfca80af0b049c65d70c608a81ac3bf27a8070ba3f32d657f5137bb
DIST mythtv-0.27-583395f5a376637efcd408a102fa64d0f188c12f.tar.xz 298048 SHA256 2b18428980fe8951694eb9c8594aa2559df491b029987e1a4b983128fdea4f51 SHA512 1d8c2a61bd91d7116ba3b43251d517bda3c8db3c235e73dde66116dc02d14806db9c80bacf6e19eaf816c4765d8e51fe9b53900efa3112134c564c08cc0ca012 WHIRLPOOL 3d50908d085f844cd210c568b50c55c47e4fe8dd8423ffe18303a7c799a45e24dfceaa5221e6f59596394484162d9992f46d5f66b0ad3c57fbb5a240def68dec
-DIST mythtv-0.27.5-32fd3968acea905d71d9769996487eff280233ea.tar.xz 12292 SHA256 482aadc121a7e770da6d10b5014947ec9ff1350ccc7f672bdc4650ef13e68cca SHA512 8e84cf76541b775143b94da156fdcde1f24d964b58a9423323de730e23142b57c9c44ef01c2202bbb7126058d41153f77f524eebed70f65210c2b9427255ee3a WHIRLPOOL 7375659815ee6170edab81411232bcf73b54575dbb8e69cb5c9c7ff0f13105eddeb01c4026e78ef8c9e7e9d1782880e41a628697c8dd697778cbb4711b3cb820
DIST mythtv-0.27.5-68e51d6fd4fa25e985b21cb3a5b5ca6fce9aca9d.tar.xz 28096 SHA256 f51bd541cccb0f5b5f20441774d9ee5e10c7a44abba5e6b9795d3c5ce21d0bf0 SHA512 585bcfa6c3fc4ecc384665b40e50362ecd083f2fa22ce9adea8167d4e38a7cbfc7519eee3813f76d7327d093c29d5ca97d9026eb5d180ff4cb7d9af91d7bc428 WHIRLPOOL d2ca6b3c7a6ecc94c4a21dee6a7ad38bdd72b880c00df1e8ac529382cd0aa7618ddfa2b5ba9721a2b99f828c9eaa6ca8ce1b1ac5e23bfff85c28327dfb862884
-DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4c541077ffe6ca9eae6027c6d1d5fea1d691722739ff9d0d7af6566d288921444961
DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-tv/mythtv/files/libdir.patch b/media-tv/mythtv/files/libdir.patch
deleted file mode 100644
index 90fc36272532..000000000000
--- a/media-tv/mythtv/files/libdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/Makefile 2012-10-06 14:30:40.453248737 -0400
-+++ external/Makefile 2012-10-06 14:32:43.283277751 -0400
-@@ -25,7 +25,7 @@
- zeromq/Makefile: zeromq/configure
- (cd zeromq ; \
- ./configure --without-documentation --prefix=${PREFIX} \
-- --includedir=${PREFIX}/include/mythtv/zeromq)
-+ --includedir=${PREFIX}/include/mythtv/zeromq --libdir=${LIBDIR})
-
- zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
- ${MAKE} -C zeromq ${@:zeromq-%=%} DESTDIR=${INSTALL_ROOT}
diff --git a/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild b/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
deleted file mode 100644
index 5179d2247b35..000000000000
--- a/media-tv/mythtv/mythtv-0.26.0_p20130922.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.6"
-BACKPORTS="9fd7c6102b2cd1a3760337663803b110446c6ea7"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python user
-
-MYTHTV_VERSION="v0.26.0"
-MYTHTV_BRANCH="fixes/0.26"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/mythtv/${MY_P}.tar.bz2
- ${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
- bluray? ( xml )
- theora? ( vorbis )"
-
-COMMON="
- >=media-libs/freetype-2.0:=
- sys-libs/zlib:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXinerama:=
- x11-libs/libXv:=
- x11-libs/libXrandr:=
- x11-libs/libXxf86vm:=
- >=dev-qt/qtcore-4.7.2:4=
- >=dev-qt/qtdbus-4.7.2:4=
- >=dev-qt/qtgui-4.7.2:4=
- >=dev-qt/qtscript-4.7.2:4=
- >=dev-qt/qtsql-4.7.2:4=[mysql]
- >=dev-qt/qtopengl-4.7.2:4=[egl?]
- >=dev-qt/qtwebkit-4.7.2:4=
- x11-misc/wmctrl:=
- virtual/mysql:=
- virtual/opengl:=
- alsa? ( >=media-libs/alsa-lib-1.0.24:= )
- bluray? (
- dev-libs/libcdio:=
- media-libs/libbluray:=
- )
- cec? ( dev-libs/libcec:= )
- dvb? (
- media-libs/libdvb:=
- virtual/linuxtv-dvb-headers:=
- )
- dvd? ( dev-libs/libcdio:= )
- egl? ( media-libs/mesa:=[egl] )
- fftw? ( sci-libs/fftw:3.0= )
- hls? (
- media-libs/faac:=
- =media-libs/x264-0.0.20111220:=
- >=media-sound/lame-3.93.1
- )
- ieee1394? (
- >=sys-libs/libraw1394-1.2.0:=
- >=sys-libs/libavc1394-0.5.3:=
- >=media-libs/libiec61883-1.0.0:=
- )
- jack? ( media-sound/jack-audio-connection-kit )
- lcd? ( app-misc/lcdproc )
- libass? ( >=media-libs/libass-0.9.11:= )
- lirc? ( app-misc/lirc )
- perl? (
- dev-perl/DBD-mysql
- dev-perl/Net-UPnP
- dev-perl/LWP-Protocol-https
- dev-perl/HTTP-Message
- dev-perl/IO-Socket-INET6
- >=dev-perl/libwww-perl-5
- )
- pulseaudio? ( media-sound/pulseaudio )
- python? (
- dev-python/mysql-python
- dev-python/lxml
- dev-python/urlgrabber
- )
- raop? (
- dev-libs/openssl:=
- net-dns/avahi[mdnsresponder-compat]
- )
- theora? ( media-libs/libtheora:= )
- vaapi? ( x11-libs/libva:= )
- vdpau? ( x11-libs/libvdpau:= )
- vorbis? ( >=media-libs/libvorbis-1.0:= )
- xml? ( >=dev-libs/libxml2-2.6.0:= )
- xvid? ( >=media-libs/xvid-1.1.0:= )
- !media-tv/mythtv-bindings
- !x11-themes/mythtv-themes
- "
-
-RDEPEND="${COMMON}
- media-fonts/corefonts
- media-fonts/dejavu
- media-fonts/liberation-fonts
- x11-apps/xinit
- autostart? (
- net-dialup/mingetty
- x11-wm/evilwm
- x11-apps/xset
- )
- dvd? ( media-libs/libdvdcss:= )
- xmltv? ( >=media-tv/xmltv-0.5.43 )
- "
-
-DEPEND="${COMMON}
- dev-lang/yasm
- x11-proto/xineramaproto
- x11-proto/xf86vidmodeproto
- "
-
-S="${WORKDIR}/${MY_P}"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
- usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
- epatch
-
- # Perl bits need to go into vender_perl and not site_perl
- sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
- -i "${S}"/bindings/perl/Makefile
-
- # Fix up the version info since we are using the fixes/${PV} branch
- echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
-
- echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
- epatch "${FILESDIR}/libdir.patch"
-
- epatch_user
-}
-
-src_configure() {
- local myconf=
-
- # Setup paths
- myconf="${myconf} --prefix=${EPREFIX}/usr"
- myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
- myconf="${myconf} --libdir-name=$(get_libdir)"
- myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
- # Audio
- myconf="${myconf} $(use_enable alsa audio-alsa)"
- myconf="${myconf} $(use_enable jack audio-jack)"
- use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
- use altivec || myconf="${myconf} --disable-altivec"
- myconf="${myconf} $(use_enable dvb)"
- myconf="${myconf} $(use_enable ieee1394 firewire)"
- myconf="${myconf} $(use_enable lirc)"
- myconf="${myconf} $(use_enable xvid libxvid)"
- myconf="${myconf} --dvb-path=/usr/include"
- myconf="${myconf} --enable-xrandr"
- myconf="${myconf} --enable-xv"
- myconf="${myconf} --enable-x11"
- myconf="${myconf} --enable-nonfree"
- use cec || myconf="${myconf} --disable-libcec"
- use raop || myconf="${myconf} --disable-libdns-sd"
- myconf="${myconf} $(use_enable theora libtheora)"
- myconf="${myconf} $(use_enable vorbis libvorbis)"
-
- if use hls; then
- myconf="${myconf} --enable-libmp3lame"
- myconf="${myconf} --enable-libx264"
- myconf="${myconf} --enable-libvpx"
- myconf="${myconf} --enable-libfaac"
- fi
-
- if use perl && use python; then
- myconf="${myconf} --with-bindings=perl,python"
- elif use perl; then
- myconf="${myconf} --without-bindings=python"
- myconf="${myconf} --with-bindings=perl"
- elif use python; then
- myconf="${myconf} --without-bindings=perl"
- myconf="${myconf} --with-bindings=python"
- else
- myconf="${myconf} --without-bindings=perl,python"
- fi
-
- use python && myconf="${myconf} --python=$(PYTHON)"
-
- if use debug; then
- myconf="${myconf} --compile-type=debug"
- else
- myconf="${myconf} --compile-type=profile"
- #myconf="${myconf} --enable-debug" does nothing per sphery
- #myconf="${myconf} --disable-stripping" does nothing per sphery
- fi
-
- # Video
- use vdpau && myconf="${myconf} --enable-vdpau"
- use vaapi && myconf="${myconf} --enable-vaapi"
- use crystalhd && myconf="${myconf} --enable-crystalhd"
-
- # Input
- use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
- # Clean up DSO load times and other compiler bits
- myconf="${myconf} --enable-symbol-visibility"
- myconf="${myconf} --enable-pic"
-
- # CPU settings
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host"
- myconf="${myconf} --cpu=${i}"
- break
- done
-
- if tc-is-cross-compiler ; then
- myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
- myconf="${myconf} --cross-prefix=${CHOST}-"
- fi
-
- # Build boosters
- has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
- has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
- chmod +x ./external/FFmpeg/version.sh
-
- einfo "Running ./configure ${myconf}"
- ./configure \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- --extra-ldflags="${LDFLAGS}" \
- ${myconf} || die "configure died"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die "install failed"
- dodoc AUTHORS UPGRADING README
-
- insinto /usr/share/mythtv/database
- doins database/*
-
- newinitd "${FILESDIR}"/mythbackend.init mythbackend
- newconfd "${FILESDIR}"/mythbackend.conf mythbackend
-
- dodoc keys.txt
-
- keepdir /etc/mythtv
- chown -R mythtv "${ED}"/etc/mythtv
- keepdir /var/log/mythtv
- chown -R mythtv "${ED}"/var/log/mythtv
- dodir /var/log/mythtv/old
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
- insinto /usr/share/mythtv/contrib
- doins -r contrib/*
-
- # Install our mythfrontend wrapper which is similar to Mythbuntu's
- mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
- newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
- newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-
- if use autostart; then
- dodir /etc/env.d/
- echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
- insinto /home/mythtv
- newins "${FILESDIR}"/bash_profile .bash_profile
- newins "${FILESDIR}"/xinitrc-r1 .xinitrc
- fi
-
- # Make Python files executable
- find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
- if [[ ! "${file##*/}" = "__init__.py" ]]; then
- chmod a+x "${file}"
- fi
- done
-
- # Ensure that Python scripts are executed by Python 2
- python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
-
- # Make shell & perl scripts executable
- find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
- while read file; do
- chmod a+x "${file}"
- done
-}
-
-pkg_preinst() {
- export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
- use python && python_mod_optimize MythTV
-
- elog "To have this machine operate as recording host for MythTV, "
- elog "mythbackend must be running. Run the following:"
- elog "rc-update add mythbackend default"
- elog
- elog "Your recordings folder must be owned 'mythtv'. e.g."
- elog "chown -R mythtv /var/lib/mythtv"
-
- elog "Want mythfrontend to start automatically?"
- elog "Set USE=autostart. Details can be found at:"
- elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup MythTV
-}
-
-pkg_info() {
- if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
- "${EROOT}"/usr/bin/mythfrontend --version
- fi
-}
-
-pkg_config() {
- echo "Creating mythtv MySQL user and mythconverg database if it does not"
- echo "already exist. You will be prompted for your MySQL root password."
- "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
deleted file mode 100644
index 0cca4c54f963..000000000000
--- a/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_DEPEND="python? 2:2.7"
-BACKPORTS="9498257571e8158926b60a0eefc74568c4436823"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python user systemd
-
-MYTHTV_VERSION="v0.27.5"
-MYTHTV_BRANCH="fixes/0.27"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
- ${BACKPORTS:+https://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
- bluray? ( xml )
- theora? ( vorbis )"
-
-COMMON="
- >=media-libs/freetype-2.0:=
- sys-libs/zlib:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXinerama:=
- x11-libs/libXv:=
- x11-libs/libXrandr:=
- x11-libs/libXxf86vm:=
- >=dev-qt/qtcore-4.7.2:4=
- >=dev-qt/qtdbus-4.7.2:4=
- >=dev-qt/qtgui-4.7.2:4=
- >=dev-qt/qtscript-4.7.2:4=
- >=dev-qt/qtsql-4.7.2:4=[mysql]
- >=dev-qt/qtopengl-4.7.2:4=[egl?]
- >=dev-qt/qtwebkit-4.7.2:4=
- x11-misc/wmctrl:=
- virtual/mysql
- virtual/opengl:=
- alsa? ( >=media-libs/alsa-lib-1.0.24:= )
- bluray? (
- dev-libs/libcdio:=
- media-libs/libbluray:=
- )
- cec? ( dev-libs/libcec:= )
- dvb? (
- media-libs/libdvb:=
- virtual/linuxtv-dvb-headers:=
- )
- dvd? ( dev-libs/libcdio:= )
- egl? ( media-libs/mesa:=[egl] )
- fftw? ( sci-libs/fftw:3.0= )
- hls? (
- media-libs/faac:=
- =media-libs/x264-0.0.20111220:=
- >=media-sound/lame-3.93.1
- )
- ieee1394? (
- >=sys-libs/libraw1394-1.2.0:=
- >=sys-libs/libavc1394-0.5.3:=
- >=media-libs/libiec61883-1.0.0:=
- )
- jack? ( media-sound/jack-audio-connection-kit )
- lcd? ( app-misc/lcdproc )
- libass? ( >=media-libs/libass-0.9.11:= )
- lirc? ( app-misc/lirc )
- perl? (
- dev-perl/DBD-mysql
- dev-perl/Net-UPnP
- dev-perl/LWP-Protocol-https
- dev-perl/HTTP-Message
- dev-perl/IO-Socket-INET6
- >=dev-perl/libwww-perl-5
- )
- pulseaudio? ( media-sound/pulseaudio )
- python? (
- dev-python/mysql-python
- dev-python/lxml
- dev-python/urlgrabber
- )
- raop? (
- dev-libs/openssl:=
- net-dns/avahi[mdnsresponder-compat]
- )
- theora? ( media-libs/libtheora:= media-libs/libogg:= )
- vaapi? ( x11-libs/libva:= )
- vdpau? ( x11-libs/libvdpau:= )
- vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
- xml? ( >=dev-libs/libxml2-2.6.0:= )
- xvid? ( >=media-libs/xvid-1.1.0:= )
- !media-tv/mythtv-bindings
- !x11-themes/mythtv-themes
- media-libs/taglib:=
- dev-libs/glib:=
- "
-
-RDEPEND="${COMMON}
- media-fonts/corefonts
- media-fonts/dejavu
- media-fonts/liberation-fonts
- x11-apps/xinit
- autostart? (
- net-dialup/mingetty
- x11-wm/evilwm
- x11-apps/xset
- )
- dvd? ( media-libs/libdvdcss:= )
- xmltv? ( >=media-tv/xmltv-0.5.43 )
- "
-
-DEPEND="${COMMON}
- dev-lang/yasm
- x11-proto/xineramaproto
- x11-proto/xf86vidmodeproto
- "
-
-S="${WORKDIR}/${MY_P}/mythtv"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
- usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
- epatch
-
- # Perl bits need to go into vender_perl and not site_perl
- sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
- -i "${S}"/bindings/perl/Makefile
-
- # Fix up the version info since we are using the fixes/${PV} branch
- echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
- echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
-
- echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
- epatch "${FILESDIR}/libdir-27.patch"
-
- epatch_user
-}
-
-src_configure() {
- local myconf=
-
- # Setup paths
- myconf="${myconf} --prefix=${EPREFIX}/usr"
- myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
- myconf="${myconf} --libdir-name=$(get_libdir)"
- myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
- # Audio
- myconf="${myconf} $(use_enable alsa audio-alsa)"
- myconf="${myconf} $(use_enable jack audio-jack)"
- use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
- use altivec || myconf="${myconf} --disable-altivec"
- myconf="${myconf} $(use_enable dvb)"
- myconf="${myconf} $(use_enable ieee1394 firewire)"
- myconf="${myconf} $(use_enable lirc)"
- myconf="${myconf} $(use_enable xvid libxvid)"
- myconf="${myconf} --dvb-path=/usr/include"
- myconf="${myconf} --enable-xrandr"
- myconf="${myconf} --enable-xv"
- myconf="${myconf} --enable-x11"
- myconf="${myconf} --enable-nonfree"
- use cec || myconf="${myconf} --disable-libcec"
- use raop || myconf="${myconf} --disable-libdns-sd"
- myconf="${myconf} $(use_enable theora libtheora)"
- myconf="${myconf} $(use_enable vorbis libvorbis)"
-
- if use hls; then
- myconf="${myconf} --enable-libmp3lame"
- myconf="${myconf} --enable-libx264"
- myconf="${myconf} --enable-libvpx"
- myconf="${myconf} --enable-libfaac"
- fi
-
- myconf="${myconf} $(use_enable libass)"
-
- if use perl && use python; then
- myconf="${myconf} --with-bindings=perl,python"
- elif use perl; then
- myconf="${myconf} --without-bindings=python"
- myconf="${myconf} --with-bindings=perl"
- elif use python; then
- myconf="${myconf} --without-bindings=perl"
- myconf="${myconf} --with-bindings=python"
- else
- myconf="${myconf} --without-bindings=perl,python"
- fi
-
- use python && myconf="${myconf} --python=$(PYTHON)"
-
- if use debug; then
- myconf="${myconf} --compile-type=debug"
- else
- myconf="${myconf} --compile-type=release"
- #myconf="${myconf} --enable-debug" does nothing per sphery
- #myconf="${myconf} --disable-stripping" does nothing per sphery
- fi
-
- # Video
- use vdpau && myconf="${myconf} --enable-vdpau"
- myconf="${myconf} $(use_enable vaapi)"
- use crystalhd && myconf="${myconf} --enable-crystalhd"
-
- # Input
- use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
- # Clean up DSO load times and other compiler bits
- myconf="${myconf} --enable-symbol-visibility"
- myconf="${myconf} --enable-pic"
-
- # CPU settings
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host"
- myconf="${myconf} --cpu=${i}"
- break
- done
-
- if tc-is-cross-compiler ; then
- myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
- myconf="${myconf} --cross-prefix=${CHOST}-"
- fi
-
- # Build boosters
- has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
- has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
- chmod +x ./external/FFmpeg/version.sh
-
- einfo "Running ./configure ${myconf}"
- ./configure \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- --extra-ldflags="${LDFLAGS}" \
- ${myconf} || die "configure died"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die "install failed"
- dodoc AUTHORS UPGRADING README
-
- insinto /usr/share/mythtv/database
- doins database/*
-
- newinitd "${FILESDIR}"/mythbackend.init mythbackend
- newconfd "${FILESDIR}"/mythbackend.conf mythbackend
- systemd_dounit "${FILESDIR}"/mythbackend.service
-
- dodoc keys.txt
-
- keepdir /etc/mythtv
- chown -R mythtv "${ED}"/etc/mythtv
- keepdir /var/log/mythtv
- chown -R mythtv "${ED}"/var/log/mythtv
- dodir /var/log/mythtv/old
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
- insinto /usr/share/mythtv/contrib
- doins -r contrib/*
-
- # Install our mythfrontend wrapper which is similar to Mythbuntu's
- if use wrapper; then
- mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
- newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
- newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
- fi
-
- if use autostart; then
- dodir /etc/env.d/
- echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
- insinto /home/mythtv
- newins "${FILESDIR}"/bash_profile .bash_profile
- newins "${FILESDIR}"/xinitrc-r1 .xinitrc
- fi
-
- # Make Python files executable
- find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
- if [[ ! "${file##*/}" = "__init__.py" ]]; then
- chmod a+x "${file}"
- fi
- done
-
- # Ensure that Python scripts are executed by Python 2
- python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
-
- # Make shell & perl scripts executable
- find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
- while read file; do
- chmod a+x "${file}"
- done
-}
-
-pkg_preinst() {
- export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
- use python && python_mod_optimize MythTV
-
- elog "To have this machine operate as recording host for MythTV, "
- elog "mythbackend must be running. Run the following:"
- elog "rc-update add mythbackend default"
- elog
- elog "Your recordings folder must be owned 'mythtv'. e.g."
- elog "chown -R mythtv /var/lib/mythtv"
-
- elog "Want mythfrontend to start automatically?"
- elog "Set USE=autostart. Details can be found at:"
- elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
- elog
- elog "Note that the systemd unit now restarts by default and logs"
- elog "to journald via the console at the notice verbosity."
-}
-
-pkg_postrm() {
- use python && python_mod_cleanup MythTV
-}
-
-pkg_info() {
- if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
- "${EROOT}"/usr/bin/mythfrontend --version
- fi
-}
-
-pkg_config() {
- echo "Creating mythtv MySQL user and mythconverg database if it does not"
- echo "already exist. You will be prompted for your MySQL root password."
- "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
deleted file mode 100644
index bd36fa04286e..000000000000
--- a/media-tv/mythtv/mythtv-0.27.5_p20150904-r1.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-BACKPORTS="32fd3968acea905d71d9769996487eff280233ea"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python-single-r1 user systemd
-
-MYTHTV_VERSION="v0.27.5"
-MYTHTV_BRANCH="fixes/0.27"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
- ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
- bluray? ( xml )
- python? ( ${PYTHON_REQUIRED_USE} )
- theora? ( vorbis )"
-
-COMMON="
- >=media-libs/freetype-2.0:=
- >=media-sound/lame-3.93.1
- sys-libs/zlib:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXinerama:=
- x11-libs/libXv:=
- x11-libs/libXrandr:=
- x11-libs/libXxf86vm:=
- >=dev-qt/qtcore-4.7.2:4=
- >=dev-qt/qtdbus-4.7.2:4=
- >=dev-qt/qtgui-4.7.2:4=
- >=dev-qt/qtscript-4.7.2:4=
- >=dev-qt/qtsql-4.7.2:4=[mysql]
- >=dev-qt/qtopengl-4.7.2:4=[egl?]
- >=dev-qt/qtwebkit-4.7.2:4=
- x11-misc/wmctrl:=
- virtual/mysql
- virtual/opengl:=
- alsa? ( >=media-libs/alsa-lib-1.0.24:= )
- bluray? (
- dev-libs/libcdio:=
- media-libs/libbluray:=
- sys-fs/udisks:0
- )
- cec? ( dev-libs/libcec:= )
- dvb? (
- media-libs/libdvb:=
- virtual/linuxtv-dvb-headers:=
- )
- dvd? (
- dev-libs/libcdio:=
- sys-fs/udisks:0
- )
- egl? ( media-libs/mesa:=[egl] )
- fftw? ( sci-libs/fftw:3.0= )
- hls? (
- media-libs/faac:=
- =media-libs/x264-0.0.20111220:=
- )
- ieee1394? (
- >=sys-libs/libraw1394-1.2.0:=
- >=sys-libs/libavc1394-0.5.3:=
- >=media-libs/libiec61883-1.0.0:=
- )
- jack? ( media-sound/jack-audio-connection-kit )
- lcd? ( app-misc/lcdproc )
- libass? ( >=media-libs/libass-0.9.11:= )
- lirc? ( app-misc/lirc )
- perl? (
- dev-perl/DBD-mysql
- dev-perl/Net-UPnP
- dev-perl/LWP-Protocol-https
- dev-perl/HTTP-Message
- dev-perl/IO-Socket-INET6
- >=dev-perl/libwww-perl-5
- )
- pulseaudio? ( media-sound/pulseaudio )
- python? (
- ${PYTHON_DEPS}
- dev-python/mysql-python
- dev-python/lxml
- dev-python/urlgrabber
- )
- raop? (
- dev-libs/openssl:=
- net-dns/avahi[mdnsresponder-compat]
- )
- theora? ( media-libs/libtheora:= media-libs/libogg:= )
- vaapi? ( x11-libs/libva:= )
- vdpau? ( x11-libs/libvdpau:= )
- vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
- xml? ( >=dev-libs/libxml2-2.6.0:= )
- xvid? ( >=media-libs/xvid-1.1.0:= )
- !media-tv/mythtv-bindings
- !x11-themes/mythtv-themes
- media-libs/taglib:=
- dev-libs/glib:=
- "
-
-RDEPEND="${COMMON}
- media-fonts/corefonts
- media-fonts/dejavu
- media-fonts/liberation-fonts
- x11-apps/xinit
- autostart? (
- net-dialup/mingetty
- x11-wm/evilwm
- x11-apps/xset
- )
- dvd? ( media-libs/libdvdcss:= )
- xmltv? ( >=media-tv/xmltv-0.5.43 )
- "
-
-DEPEND="${COMMON}
- dev-lang/yasm
- x11-proto/xineramaproto
- x11-proto/xf86vidmodeproto
- "
-
-S="${WORKDIR}/${MY_P}/mythtv"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
- usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
- epatch
-
- # Perl bits need to go into vender_perl and not site_perl
- sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
- -i "${S}"/bindings/perl/Makefile
-
- # Fix up the version info since we are using the fixes/${PV} branch
- echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
- echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
-
- echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
- epatch "${FILESDIR}/libdir-27.patch"
-
- epatch_user
-}
-
-src_configure() {
- local myconf=
-
- # Setup paths
- myconf="${myconf} --prefix=${EPREFIX}/usr"
- myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
- myconf="${myconf} --libdir-name=$(get_libdir)"
- myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
- # Audio
- myconf="${myconf} $(use_enable alsa audio-alsa)"
- myconf="${myconf} $(use_enable jack audio-jack)"
- use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
- use altivec || myconf="${myconf} --disable-altivec"
- myconf="${myconf} $(use_enable dvb)"
- myconf="${myconf} $(use_enable ieee1394 firewire)"
- myconf="${myconf} $(use_enable lirc)"
- myconf="${myconf} $(use_enable xvid libxvid)"
- myconf="${myconf} --dvb-path=/usr/include"
- myconf="${myconf} --enable-xrandr"
- myconf="${myconf} --enable-xv"
- myconf="${myconf} --enable-x11"
- myconf="${myconf} --enable-nonfree"
- myconf="${myconf} --enable-libmp3lame"
- use cec || myconf="${myconf} --disable-libcec"
- use raop || myconf="${myconf} --disable-libdns-sd"
- myconf="${myconf} $(use_enable theora libtheora)"
- myconf="${myconf} $(use_enable vorbis libvorbis)"
-
- if use hls; then
- myconf="${myconf} --enable-libx264"
- myconf="${myconf} --enable-libvpx"
- myconf="${myconf} --enable-libfaac"
- fi
-
- myconf="${myconf} $(use_enable libass)"
-
- if use perl && use python; then
- myconf="${myconf} --with-bindings=perl,python"
- elif use perl; then
- myconf="${myconf} --without-bindings=python"
- myconf="${myconf} --with-bindings=perl"
- elif use python; then
- myconf="${myconf} --without-bindings=perl"
- myconf="${myconf} --with-bindings=python"
- else
- myconf="${myconf} --without-bindings=perl,python"
- fi
-
- use python && myconf="${myconf} --python=${EPYTHON}"
-
- if use debug; then
- myconf="${myconf} --compile-type=debug"
- else
- myconf="${myconf} --compile-type=release"
- #myconf="${myconf} --enable-debug" does nothing per sphery
- #myconf="${myconf} --disable-stripping" does nothing per sphery
- fi
-
- # Video
- myconf="${myconf} $(use_enable vdpau)"
- myconf="${myconf} $(use_enable vaapi)"
- myconf="${myconf} $(use_enable crystalhd)"
-
- # Input
- use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
- # Clean up DSO load times and other compiler bits
- myconf="${myconf} --enable-symbol-visibility"
- myconf="${myconf} --enable-pic"
-
- # CPU settings
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host"
- myconf="${myconf} --cpu=${i}"
- break
- done
-
- if tc-is-cross-compiler ; then
- myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
- myconf="${myconf} --cross-prefix=${CHOST}-"
- fi
-
- # Build boosters
- has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
- has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
- chmod +x ./external/FFmpeg/version.sh
-
- einfo "Running ./configure ${myconf}"
- ./configure \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- --extra-ldflags="${LDFLAGS}" \
- ${myconf} || die "configure died"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die "install failed"
- dodoc AUTHORS UPGRADING README
-
- insinto /usr/share/mythtv/database
- doins database/*
-
- newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
- newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
- systemd_dounit "${FILESDIR}"/mythbackend.service
-
- dodoc keys.txt
-
- keepdir /etc/mythtv
- chown -R mythtv "${ED}"/etc/mythtv
- keepdir /var/log/mythtv
- chown -R mythtv "${ED}"/var/log/mythtv
- dodir /var/log/mythtv/old
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
- insinto /usr/share/mythtv/contrib
- # Ensure we don't install scripts needing the perl bindings (bug #516968)
- use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
- # Ensure we don't install scripts needing the python bindings (bug #516968)
- use python || find contrib/ -name '*.py' -exec rm -f {} \;
- doins -r contrib/*
-
- # Install our mythfrontend wrapper which is similar to Mythbuntu's
- if use wrapper; then
- mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
- newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
- newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
- fi
-
- if use autostart; then
- dodir /etc/env.d/
- echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
- insinto /home/mythtv
- newins "${FILESDIR}"/bash_profile .bash_profile
- newins "${FILESDIR}"/xinitrc-r1 .xinitrc
- fi
-
- # Make Python files executable
- find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
- if [[ ! "${file##*/}" = "__init__.py" ]]; then
- chmod a+x "${file}"
- fi
- done
-
- # Ensure that Python scripts are executed by Python 2
- python_fix_shebang "${ED}/usr/share/mythtv"
-
- # Make shell & perl scripts executable
- find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
- while read file; do
- chmod a+x "${file}"
- done
-}
-
-pkg_preinst() {
- export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
- elog "To have this machine operate as recording host for MythTV, "
- elog "mythbackend must be running. Run the following:"
- elog "rc-update add mythbackend default"
- elog
- elog "Your recordings folder must be owned 'mythtv'. e.g."
- elog "chown -R mythtv /var/lib/mythtv"
-
- elog "Want mythfrontend to start automatically?"
- elog "Set USE=autostart. Details can be found at:"
- elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
- elog
- elog "Note that the systemd unit now restarts by default and logs"
- elog "to journald via the console at the notice verbosity."
-}
-
-pkg_info() {
- if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
- "${EROOT}"/usr/bin/mythfrontend --version
- fi
-}
-
-pkg_config() {
- echo "Creating mythtv MySQL user and mythconverg database if it does not"
- echo "already exist. You will be prompted for your MySQL root password."
- "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
deleted file mode 100644
index 73dd97066bf7..000000000000
--- a/media-tv/mythtv/mythtv-0.27.5_p20150904-r2.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-BACKPORTS="32fd3968acea905d71d9769996487eff280233ea"
-MY_P=${P%_p*}
-
-inherit flag-o-matic multilib eutils python-single-r1 user systemd
-
-MYTHTV_VERSION="v0.27.5"
-MYTHTV_BRANCH="fixes/0.27"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="http://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
- ${BACKPORTS:+https://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
-
-SLOT="0/${PV}"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-
-IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
-egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
-vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
-
-REQUIRED_USE="
- bluray? ( xml )
- python? ( ${PYTHON_REQUIRED_USE} )
- theora? ( vorbis )"
-
-COMMON="
- >=media-libs/freetype-2.0:=
- >=media-sound/lame-3.93.1
- sys-libs/zlib:=
- x11-libs/libX11:=
- x11-libs/libXext:=
- x11-libs/libXinerama:=
- x11-libs/libXv:=
- x11-libs/libXrandr:=
- x11-libs/libXxf86vm:=
- >=dev-qt/qtcore-4.7.2:4=
- >=dev-qt/qtdbus-4.7.2:4=
- >=dev-qt/qtgui-4.7.2:4=
- >=dev-qt/qtscript-4.7.2:4=
- >=dev-qt/qtsql-4.7.2:4=[mysql]
- >=dev-qt/qtopengl-4.7.2:4=[egl?]
- >=dev-qt/qtwebkit-4.7.2:4=
- x11-misc/wmctrl:=
- virtual/mysql
- virtual/opengl:=
- alsa? ( >=media-libs/alsa-lib-1.0.24:= )
- bluray? (
- dev-libs/libcdio:=
- media-libs/libbluray:=
- sys-fs/udisks:0
- )
- cec? ( dev-libs/libcec:= )
- dvb? (
- media-libs/libdvb:=
- virtual/linuxtv-dvb-headers:=
- )
- dvd? (
- dev-libs/libcdio:=
- sys-fs/udisks:0
- )
- egl? ( media-libs/mesa:=[egl] )
- fftw? ( sci-libs/fftw:3.0= )
- hls? (
- media-libs/faac:=
- =media-libs/x264-0.0.20111220:=
- )
- ieee1394? (
- >=sys-libs/libraw1394-1.2.0:=
- >=sys-libs/libavc1394-0.5.3:=
- >=media-libs/libiec61883-1.0.0:=
- )
- jack? ( media-sound/jack-audio-connection-kit )
- lcd? ( app-misc/lcdproc )
- libass? ( >=media-libs/libass-0.9.11:= )
- lirc? ( app-misc/lirc )
- perl? (
- dev-perl/DBD-mysql
- dev-perl/Net-UPnP
- dev-perl/LWP-Protocol-https
- dev-perl/HTTP-Message
- dev-perl/IO-Socket-INET6
- >=dev-perl/libwww-perl-5
- )
- pulseaudio? ( media-sound/pulseaudio )
- python? (
- ${PYTHON_DEPS}
- dev-python/mysql-python
- dev-python/lxml
- dev-python/urlgrabber
- )
- raop? (
- dev-libs/openssl:=
- net-dns/avahi[mdnsresponder-compat]
- )
- theora? ( media-libs/libtheora:= media-libs/libogg:= )
- vaapi? ( x11-libs/libva:= )
- vdpau? ( x11-libs/libvdpau:= )
- vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
- xml? ( >=dev-libs/libxml2-2.6.0:= )
- xvid? ( >=media-libs/xvid-1.1.0:= )
- !media-tv/mythtv-bindings
- !x11-themes/mythtv-themes
- media-libs/taglib:=
- dev-libs/glib:=
- "
-
-RDEPEND="${COMMON}
- media-fonts/corefonts
- media-fonts/dejavu
- media-fonts/liberation-fonts
- x11-apps/xinit
- autostart? (
- net-dialup/mingetty
- x11-wm/evilwm
- x11-apps/xset
- )
- dvd? ( media-libs/libdvdcss:= )
- xmltv? ( >=media-tv/xmltv-0.5.43 )
- "
-
-DEPEND="${COMMON}
- dev-lang/yasm
- x11-proto/xineramaproto
- x11-proto/xf86vidmodeproto
- "
-
-S="${WORKDIR}/${MY_P}/mythtv"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-pkg_setup() {
- python-single-r1_pkg_setup
- enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
- usermod -a -G ${MYTHTV_GROUPS} mythtv
-}
-
-src_prepare() {
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
- epatch
-
- # Perl bits need to go into vender_perl and not site_perl
- sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
- -i "${S}"/bindings/perl/Makefile
-
- # Fix up the version info since we are using the fixes/${PV} branch
- echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
- echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
- echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
-
- echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
-
- epatch "${FILESDIR}/libdir-27.patch"
-
- epatch_user
-}
-
-src_configure() {
- local myconf=
-
- # Setup paths
- myconf="${myconf} --prefix=${EPREFIX}/usr"
- myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
- myconf="${myconf} --libdir-name=$(get_libdir)"
- myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
- # Audio
- myconf="${myconf} $(use_enable alsa audio-alsa)"
- myconf="${myconf} $(use_enable jack audio-jack)"
- use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
- use altivec || myconf="${myconf} --disable-altivec"
- myconf="${myconf} $(use_enable dvb)"
- myconf="${myconf} $(use_enable ieee1394 firewire)"
- myconf="${myconf} $(use_enable lirc)"
- myconf="${myconf} $(use_enable xvid libxvid)"
- myconf="${myconf} --dvb-path=/usr/include"
- myconf="${myconf} --enable-xrandr"
- myconf="${myconf} --enable-xv"
- myconf="${myconf} --enable-x11"
- myconf="${myconf} --enable-nonfree"
- myconf="${myconf} --enable-libmp3lame"
- use cec || myconf="${myconf} --disable-libcec"
- use raop || myconf="${myconf} --disable-libdns-sd"
- myconf="${myconf} $(use_enable theora libtheora)"
- myconf="${myconf} $(use_enable vorbis libvorbis)"
-
- if use hls; then
- myconf="${myconf} --enable-libx264"
- myconf="${myconf} --enable-libvpx"
- myconf="${myconf} --enable-libfaac"
- fi
-
- myconf="${myconf} $(use_enable libass)"
-
- if use perl && use python; then
- myconf="${myconf} --with-bindings=perl,python"
- elif use perl; then
- myconf="${myconf} --without-bindings=python"
- myconf="${myconf} --with-bindings=perl"
- elif use python; then
- myconf="${myconf} --without-bindings=perl"
- myconf="${myconf} --with-bindings=python"
- else
- myconf="${myconf} --without-bindings=perl,python"
- fi
-
- use python && myconf="${myconf} --python=${EPYTHON}"
-
- if use debug; then
- myconf="${myconf} --compile-type=debug"
- else
- myconf="${myconf} --compile-type=release"
- #myconf="${myconf} --enable-debug" does nothing per sphery
- #myconf="${myconf} --disable-stripping" does nothing per sphery
- fi
-
- # Video
- myconf="${myconf} $(use_enable vdpau)"
- myconf="${myconf} $(use_enable vaapi)"
- myconf="${myconf} $(use_enable crystalhd)"
-
- # Input
- use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
- # Clean up DSO load times and other compiler bits
- myconf="${myconf} --enable-symbol-visibility"
- myconf="${myconf} --enable-pic"
-
- # CPU settings
- for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
- [ "${i}" = "native" ] && i="host"
- myconf="${myconf} --cpu=${i}"
- break
- done
-
- if tc-is-cross-compiler ; then
- myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
- myconf="${myconf} --cross-prefix=${CHOST}-"
- fi
-
- # Build boosters
- has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
- has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
- chmod +x ./external/FFmpeg/version.sh
-
- einfo "Running ./configure ${myconf}"
- ./configure \
- --cc="$(tc-getCC)" \
- --cxx="$(tc-getCXX)" \
- --ar="$(tc-getAR)" \
- --extra-cflags="${CFLAGS}" \
- --extra-cxxflags="${CXXFLAGS}" \
- --extra-ldflags="${LDFLAGS}" \
- ${myconf} || die "configure died"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install || die "install failed"
- dodoc AUTHORS UPGRADING README
-
- insinto /usr/share/mythtv/database
- doins database/*
-
- newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
- newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
- systemd_dounit "${FILESDIR}"/mythbackend.service
-
- dodoc keys.txt
-
- keepdir /etc/mythtv
- chown -R mythtv "${ED}"/etc/mythtv
- keepdir /var/log/mythtv
- chown -R mythtv "${ED}"/var/log/mythtv
- dodir /var/log/mythtv/old
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
-
- insinto /usr/share/mythtv/contrib
- # Ensure we don't install scripts needing the perl bindings (bug #516968)
- use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
- # Ensure we don't install scripts needing the python bindings (bug #516968)
- use python || find contrib/ -name '*.py' -exec rm -f {} \;
- doins -r contrib/*
-
- # Install our mythfrontend wrapper which is similar to Mythbuntu's
- if use wrapper; then
- mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
- newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
- newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
- fi
-
- if use autostart; then
- dodir /etc/env.d/
- echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
- insinto /home/mythtv
- newins "${FILESDIR}"/bash_profile .bash_profile
- newins "${FILESDIR}"/xinitrc-r1 .xinitrc
- fi
-
- # Make Python files executable
- find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
- if [[ ! "${file##*/}" = "__init__.py" ]]; then
- chmod a+x "${file}"
- fi
- done
-
- # Ensure that Python scripts are executed by Python 2
- python_fix_shebang "${ED}/usr/share/mythtv"
-
- # Make shell & perl scripts executable
- find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
- while read file; do
- chmod a+x "${file}"
- done
-}
-
-pkg_preinst() {
- export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
- elog "To have this machine operate as recording host for MythTV, "
- elog "mythbackend must be running. Run the following:"
- elog "rc-update add mythbackend default"
- elog
- elog "Your recordings folder must be owned 'mythtv'. e.g."
- elog "chown -R mythtv /var/lib/mythtv"
-
- elog "Want mythfrontend to start automatically?"
- elog "Set USE=autostart. Details can be found at:"
- elog "https://dev.gentoo.org/~cardoe/mythtv/autostart.html"
- elog
- elog "Note that the systemd unit now restarts by default and logs"
- elog "to journald via the console at the notice verbosity."
-}
-
-pkg_info() {
- if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
- "${EROOT}"/usr/bin/mythfrontend --version
- fi
-}
-
-pkg_config() {
- echo "Creating mythtv MySQL user and mythconverg database if it does not"
- echo "already exist. You will be prompted for your MySQL root password."
- "${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
-}
diff --git a/media-tv/xbmc/ChangeLog-2015 b/media-tv/xbmc/ChangeLog-2015
deleted file mode 100644
index c851c701ce07..000000000000
--- a/media-tv/xbmc/ChangeLog-2015
+++ /dev/null
@@ -1,959 +0,0 @@
-# ChangeLog for media-tv/xbmc
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.228 2015/04/08 18:15:30 mgorny Exp $
-
- 08 Apr 2015; Michał Górny xbmc-12.1-r1.ebuild,
- xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild, xbmc-13.0_p2.ebuild, xbmc-13.1.ebuild,
- xbmc-13.2-r1.ebuild, xbmc-13.2.ebuild:
- Drop old Python implementations
-
- 25 Feb 2015; Mikle Kolyada xbmc-13.2.ebuild:
- amd64/x86 stable wrt bug #538904
-
- 16 Feb 2015; Mike Frysinger xbmc-9999.ebuild:
- Migrate people to the new kodi package #526992 by Rafal Kupiec.
-
- 16 Feb 2015; Mike Frysinger xbmc-11.0.ebuild,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-13.1.ebuild, xbmc-13.2-r1.ebuild, xbmc-13.2.ebuild,
- xbmc-9999.ebuild:
- Add blockers against media-tv/kodi #526992 by Rafal Kupiec.
-
- 16 Feb 2015; Mike Frysinger xbmc-9999.ebuild:
- Update xbmc to kodi in various names #526992 by Rafal Kupiec.
-
- 15 Feb 2015; Mike Frysinger xbmc-9999.ebuild:
- Switch to libsdl2 to match upstream #536602 by hal.
-
- 15 Feb 2015; Mike Frysinger xbmc-9999.ebuild:
- Drop lsb-release dep as the code already handles /etc/os-release.
-
- 15 Feb 2015; Mike Frysinger xbmc-9999.ebuild:
- Drop unused cpu flags now that squish is gone #536402#2 by hal.
-
- 15 Feb 2015; Mike Frysinger xbmc-9999.ebuild:
- Drop configure flags upstream has deleted #533088 by hal.
-
- 15 Feb 2015; Mike Frysinger metadata.xml:
- Add upstream details #533096 by Anthony Ryan.
-
-*xbmc-13.2-r1 (01 Feb 2015)
-
- 01 Feb 2015; Michał Górny +xbmc-13.2-r1.ebuild,
- xbmc-9999.ebuild:
- Introduce USE=libav to control the preferred implementation. Fixes subslot &
- implementation switch rebuilds as well.
-
- 29 Jan 2015; Michał Górny xbmc-11.0.ebuild,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-13.1.ebuild, xbmc-13.2.ebuild, xbmc-9999.ebuild:
- Convert to CPU_FLAGS_X86.
-
- 18 Jan 2015; Fabian Groffen xbmc-9999.ebuild:
- Apply some fixes to build Kodi, including #536402
-
- 12 Dec 2014; Sergey Popov metadata.xml:
- USE='vaapi' is now global, removing it's description from metadata
-
-*xbmc-13.2 (21 Aug 2014)
-
- 21 Aug 2014; Mike Frysinger +xbmc-13.2.ebuild:
- Version bump #512700 by Michael Cook.
-
- 12 Aug 2014; Mike Frysinger xbmc-9999.ebuild:
- Add support for running tests #519118 by Anthony Ryan.
-
-*xbmc-13.1 (30 Jul 2014)
-
- 30 Jul 2014; Mike Frysinger +xbmc-13.1.ebuild:
- Version bump #512700 by Michael Cook.
-
- 29 Jul 2014; Mike Frysinger xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-9999.ebuild:
- Require mesa[gles2] when USE=gles is enabled #515104 by A. Person.
-
- 29 Jul 2014; Mike Frysinger xbmc-12.1-r1.ebuild,
- xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild, xbmc-13.0_p2.ebuild, xbmc-9999.ebuild:
- Drop redundant --enable-gl as there is a `use_enable opengl gl` call later on
- #513708 by Gerhard Bräunlich.
-
- 29 Jul 2014; Mike Frysinger xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-9999.ebuild:
- Support newer samba where USE=smbclient is always enabled #510866 by Daniel
- Klaffenbach.
-
- 24 Jul 2014; Samuli Suominen xbmc-11.0.ebuild,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-9999.ebuild:
- Split USE="udev" to USE="udisks" and USE="upower"
-
- 31 May 2014; Samuli Suominen xbmc-11.0.ebuild,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-9999.ebuild:
- Allow falling back to sys-power/upower-pm-utils.
-
- 15 May 2014; Ulrich Müller xbmc-11.0.ebuild,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-12.3.ebuild,
- xbmc-13.0_p2.ebuild, xbmc-9999.ebuild:
- Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
- "sound", bug 357661.
-
-*xbmc-13.0_p2 (11 May 2014)
-
- 11 May 2014; Mike Frysinger +xbmc-13.0_p2.ebuild,
- xbmc-9999.ebuild:
- Version bump #504726.
-
- 09 May 2014; Mike Frysinger xbmc-9999.ebuild:
- Run code generator bootstrap #509592 by Anthony Ryan.
-
- 08 May 2014; Mike Frysinger xbmc-9999.ebuild:
- Update to latest codename.
-
- 08 May 2014; Mike Frysinger xbmc-9999.ebuild:
- Update path to desktop icon #509588 by Anthony Ryan.
-
- 08 May 2014; Mike Frysinger xbmc-9999.ebuild:
- Drop USE=neon now that upstream has dropped it #509590 by Anthony Ryan.
-
- 31 Dec 2013; Mike Frysinger
- +files/xbmc-12.3-no-sse2.patch, xbmc-12.3.ebuild:
- Add patch from upstream for building on cpus w/out sse2 #475266 by Jose
- Quinteiro.
-
-*xbmc-12.3 (31 Dec 2013)
-
- 31 Dec 2013; Mike Frysinger +xbmc-12.3.ebuild:
- Version bump #496496 by Charles Nérot.
-
- 30 Dec 2013; Mike Frysinger xbmc-9999.ebuild:
- Always require java for live git ebuilds now #488118 by hal.
-
- 10 Nov 2013; Fabian Groffen
- +files/xbmc-12.1-nomythtv.patch, files/xbmc-9999-nomythtv.patch,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild:
- Updated nomythtv patch for current git sources, by hal in bug #488494
-
- 05 Sep 2013; Mike Frysinger xbmc-12.1-r1.ebuild,
- xbmc-12.2-r1.ebuild, xbmc-9999.ebuild:
- Require USE=sftp be set in libssh when we pull it in #483144 by Hendrik v.
- Raven.
-
- 11 Aug 2013; Alexis Ballier xbmc-11.0.ebuild,
- xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild, xbmc-9999.ebuild:
- depend on ffmpeg:0
-
- 07 Aug 2013; Alexis Ballier xbmc-9999.ebuild:
- Add working libav support. It requires libav git master or 10. Add a warning
- when building against libav to reflect the state of such support. Add := deps
- on libav and ffmpeg.
-
- 20 Jul 2013; Alexis Ballier xbmc-9999.ebuild:
- Fix vdpau deps again: It requires either ffmpeg-1.2.1 or a post-libav9
- release.
-
- 06 Jul 2013; Tomáš Chvátal
- -files/xbmc-12.0-system-projectm.patch,
- -files/xbmc-13.0-system-projectm.patch, xbmc-12.1-r1.ebuild,
- xbmc-12.2-r1.ebuild, xbmc-9999.ebuild:
- Remove the unbundling of projectM seems like 2.1 again does not work well even
- after fixed underlinking (now it just crashes the xbmc with pretty trace).
-
- 06 Jul 2013; Tomáš Chvátal
- files/xbmc-12.0-system-projectm.patch, files/xbmc-13.0-system-projectm.patch:
- Ensure libprojectM is linked on projectM extension. Still crashes tho with 2.1
- more investigation needed. Force due to unsynced cvs.
-
- 05 Jul 2013; Tomáš Chvátal
- -files/xbmc-11.0-libav-r1.patch, -xbmc-11.0-r1.ebuild, -xbmc-12.0.ebuild,
- -xbmc-12.1.ebuild, -xbmc-12.2.ebuild:
- Reduce versions a bit, no need to have 6 around. Force due non-updated cvs
- tree.
-
- 27 Jun 2013; Agostino Sarubbo xbmc-12.2-r1.ebuild:
- Stable for x86, wrt bug #464552
-
- 27 Jun 2013; Agostino Sarubbo xbmc-12.2-r1.ebuild:
- Stable for amd64, wrt bug #464552
-
- 17 Jun 2013; Tomáš Chvátal xbmc-12.2-r1.ebuild:
- Reduce the postproc || dep to be bit faster.
-
- 14 Jun 2013; Alexis Ballier xbmc-9999.ebuild:
- vdpau requires a recent ffmpeg version so depend on virtual/ffmpeg-9 in that
- case
-
-*xbmc-12.2-r1 (13 Jun 2013)
-
- 13 Jun 2013; Alexis Ballier +xbmc-12.2-r1.ebuild:
- Backport some FFmpeg related fixes from master.
- Fixes bugs #466718, #463588 and should improve libav compatibility.
-
- 24 May 2013; Alexis Ballier xbmc-9999.ebuild:
- Fix ffmpeg deps: upstream recommends ffmpeg so this one shall come first in
- the || dep. xbmc doesnt even compile against libav, meaning the dep is in
- theory wrong but left there in case someone eventually gets upstream to fix
- it. Do not depend on virtual/ffmpeg which is not finegrained enough here (and
- also rather useless because of the libpostproc dep) since ffmpeg releases
- more often than libav these days and virtual/ffmpeg-9 depends on a masked
- ffmpeg version while xbmc only requires ffmpeg-1 which is unmasked.
-
-*xbmc-12.2 (23 May 2013)
-
- 23 May 2013; Mike Frysinger +xbmc-12.2.ebuild,
- xbmc-9999.ebuild:
- Version bump #468518 by Anthony Ryan.
-
- 24 Apr 2013; Mike Frysinger
- files/xbmc-13.0-system-projectm.patch:
- Fix typos in projectm patch #466746 by candrews.
-
- 23 Apr 2013; Mike Frysinger xbmc-12.1-r1.ebuild,
- xbmc-9999.ebuild:
- Have USE=X require USE=sdl #466584 by Tomáš Chvátal.
-
-*xbmc-12.1-r1 (20 Apr 2013)
-
- 20 Apr 2013; Tomáš Chvátal
- +files/xbmc-12.0-system-projectm.patch,
- +files/xbmc-13.0-system-projectm.patch, +xbmc-12.1-r1.ebuild,
- xbmc-9999.ebuild:
- Update to python-single-r1 wrt bug#458682. Apply projectm unbundle patch.
- Apply libav patchset provided by Anton Khirnov to 12.1-r1 ebuild and remove
- keywords as it depends on too new ffmpeg/libav with this. (the patchset still
- needs few touchups before submitting to master/9999 ebuild)
-
- 13 Apr 2013; Mike Frysinger files/generate.sh,
- xbmc-9999.ebuild:
- Refresh generated python interfaces #464048 by Marcel Unbehaun.
-
- 13 Apr 2013; Mike Frysinger xbmc-9999.ebuild:
- Patch by hal to punt unused addons #465108.
-
- 01 Apr 2013; Mike Frysinger metadata.xml,
- xbmc-12.1.ebuild, xbmc-9999.ebuild:
- Add USE="caps gles opengl sdl usb X" flags to control the now (optional)
- dependencies.
-
- 01 Apr 2013; Mike Frysinger xbmc-12.1.ebuild,
- xbmc-9999.ebuild:
- Add USE=neon #463742 by Code_Bleu.
-
- 31 Mar 2013; Tomáš Chvátal xbmc-9999.ebuild:
- Do not remove arial.ttf wrt bug#460514.
-
- 29 Mar 2013; Mike Frysinger xbmc-12.1.ebuild,
- xbmc-9999.ebuild:
- Require newer libcec to match configure #463694 by Fredric Johansson.
-
-*xbmc-12.1 (23 Mar 2013)
-
- 23 Mar 2013; Mike Frysinger +xbmc-12.1.ebuild:
- Version bump #462266 by Anthony Ryan.
-
- 23 Mar 2013; Mike Frysinger metadata.xml,
- xbmc-9999.ebuild:
- Add USE=fishbmc support #461596 by BT.
-
-*xbmc-12.0 (18 Feb 2013)
-
- 18 Feb 2013; Mike Frysinger +xbmc-12.0.ebuild,
- -xbmc-12.0_rc2.ebuild, -xbmc-12.0_rc3.ebuild:
- Version bump #454552 by Elis Axelsson.
-
- 29 Jan 2013; Tomáš Chvátal xbmc-9999.ebuild:
- Silence qa warn as the second arg must be full path not just dir based on PMS.
-
- 26 Jan 2013; Tomáš Chvátal xbmc-9999.ebuild:
- Symlink in-system fonts rather than use bundled ones.
-
- 26 Jan 2013; Tomáš Chvátal xbmc-9999.ebuild:
- Remove fontconfig dirs as they are useless at best.
-
- 21 Jan 2013; Tomáš Chvátal xbmc-9999.ebuild:
- Remove simplejson code as it is not used anyway.
-
-*xbmc-12.0_rc3 (18 Jan 2013)
-
- 18 Jan 2013; Mike Frysinger +files/generate.sh,
- +xbmc-12.0_rc3.ebuild:
- Version bump #452422 by Elis Axelsson.
-
- 17 Jan 2013; Michał Górny xbmc-11.0-r1.ebuild,
- xbmc-11.0.ebuild:
- Fix the python[sqlite] dep on older versions too.
-
- 15 Jan 2013; Michał Górny xbmc-12.0_rc2.ebuild,
- xbmc-9999.ebuild:
- Fix sqlite3 module dependency -- the package supports only built-in Python
- sqlite3, not external pysqlite2.
-
- 29 Dec 2012; Mike Frysinger xbmc-12.0_rc2.ebuild,
- xbmc-9999.ebuild:
- Require libmicrohttpd[messages] #449082 by Ben Kohler.
-
- 29 Dec 2012; Mike Frysinger xbmc-12.0_rc2.ebuild,
- xbmc-9999.ebuild:
- Depend on tinyxml[stl] since xbmc uses those features #448754#3 by Ben Kohler.
-
- 25 Dec 2012; Mike Frysinger xbmc-12.0_rc2.ebuild,
- xbmc-9999.ebuild:
- Fix lookup of dirs to autotool #448488 by Ivan.
-
-*xbmc-12.0_rc2 (25 Dec 2012)
-
- 25 Dec 2012; Mike Frysinger +xbmc-12.0_rc2.ebuild,
- xbmc-9999.ebuild:
- Add USE=java to contain upstream idiocy #434662 by BT. Version bump #443572
- by Tomasz Golinski.
-
- 24 Dec 2012; Mike Frysinger xbmc-9999.ebuild:
- Require libcec-2+ #438376 by Ian Whyman.
-
- 08 Dec 2012; Mike Frysinger
- +files/xbmc-11.0-nfs-limits.patch, xbmc-11.0-r1.ebuild, xbmc-11.0.ebuild:
- Add fix from upstream for building with newer libnfs #445174 by Winfried
- Lorenzen.
-
- 28 Nov 2012; Samuli Suominen xbmc-11.0.ebuild,
- xbmc-11.0-r1.ebuild, xbmc-9999.ebuild:
- Missing virtual/glu dependency (AC_CHECK_LIB for libGLU in configure.in) wrt
- #445075 by Steven Cristian
-
- 26 Nov 2012; Tomáš Chvátal metadata.xml:
- Update to global useflag.
-
- 19 Nov 2012; Mike Frysinger xbmc-9999.ebuild:
- Add swig to DEPEND since upstream requires it #434660 by BT.
-
- 15 Nov 2012; Tomáš Chvátal xbmc-11.0.ebuild:
- Ekeyword does not work here so put back accidentally dropped stable keywords.
-
-*xbmc-11.0-r1 (14 Nov 2012)
-
- 14 Nov 2012; Tomáš Chvátal
- +files/xbmc-11.0-ffmpeg.patch, +files/xbmc-11.0-libav-r1.patch,
- +xbmc-11.0-r1.ebuild, files/xbmc-11.0-libav.patch, xbmc-11.0.ebuild:
- Revision bump the huge patchset chage to testing as it seems broken, wrt
- bug#443006. Keep the stable unaltered as it was supposed to be done from
- start.
-
- 24 Oct 2012; Alexis Ballier xbmc-11.0.ebuild,
- -files/xbmc-11.0-ffmpeg.patch, files/xbmc-11.0-libav.patch:
- Backport a huge patchset from upstream master to be compatible with ffmpeg
- 0.10 up to current git master. Bug #438842. Rebase the libav patches on top
- of these changes, it seems they were sent upstream but not applied. Drop a
- now useless patch with this refactoring. Please CC me on bugs if these
- patches cause problems.
-
- 09 Oct 2012; Mike Frysinger xbmc-9999.ebuild:
- Skip running eautoreconf in libapetag & libid3tag #437368 by BT.
-
- 09 Oct 2012; Mike Frysinger metadata.xml,
- xbmc-9999.ebuild:
- Add USE=sftp to control libssh dependency #437566 by candrews.
-
- 24 Sep 2012; Mike Frysinger metadata.xml,
- xbmc-9999.ebuild:
- Control NFS support via USE=nfs #436034 by oceand.dev.
-
- 16 Sep 2012; Mike Frysinger xbmc-9999.ebuild:
- Depend on taglib-1.8 to match upstream #434658 by BT.
-
- 08 Sep 2012; Mike Frysinger xbmc-9999.ebuild:
- Add USE=upnp support #434270 by BT.
-
- 08 Sep 2012; Mike Frysinger
- files/xbmc-9999-no-arm-flags.patch:
- Update arm flags patch to latest git #434182 by BT.
-
- 05 Sep 2012; Justin Lecher xbmc-11.0.ebuild,
- xbmc-9999.ebuild:
- Use domenu instead insinto + doins to install .desktop files
-
- 04 Aug 2012; Mike Frysinger
- files/xbmc-9999-nomythtv.patch:
- Update mythtv patch to latest git #429588 by BT.
-
- 15 Jul 2012; Mike Frysinger
- +files/xbmc-11.0-nomythtv.patch, files/xbmc-9999-nomythtv.patch,
- xbmc-11.0.ebuild:
- Update mythtv patch to latest git #426376 by BT.
-
- 02 Jul 2012; Mike Frysinger
- files/xbmc-9999-no-arm-flags.patch:
- Update patch to latest git #424485 by tsubus.
-
- 08 Jun 2012; Mike Frysinger xbmc-11.0.ebuild,
- xbmc-9999.ebuild:
- Update path to xbmc icon #419989 by candrews.
-
- 22 May 2012; Jeff Horelick xbmc-11.0.ebuild:
- marked x86 per bug 415907
-
- 22 May 2012; Diego E. Pettenò xbmc-11.0.ebuild,
- xbmc-9999.ebuild:
- Allow using older libav as well, for postproc.
-
- 22 May 2012; Diego E. Pettenò xbmc-11.0.ebuild,
- xbmc-9999.ebuild:
- Add an explicit dependency over libpostproc.
-
- 14 May 2012; Agostino Sarubbo xbmc-11.0.ebuild:
- Stable for amd64, wrt bug #415907
-
- 14 May 2012; Tomáš Chvátal xbmc-9999.ebuild:
- Add dep over tinyxml. Fixes bug#415681.
-
- 29 Apr 2012; Mike Frysinger
- +files/xbmc-11.0-no-arm-flags.patch, xbmc-11.0.ebuild:
- Add dedciated arm flags patch for 11.0 #413715 by Lech Perczak.
-
- 26 Apr 2012; Mike Frysinger
- files/xbmc-9999-no-arm-flags.patch:
- Update arm patch to latest git #413435 by candrews.
-
- 11 Apr 2012; Mike Frysinger xbmc-9999.ebuild:
- Drop lsb_release hack now that upsream is good #411219 by BT.
-
- 05 Apr 2012; Mike Frysinger xbmc-11.0.ebuild,
- xbmc-9999.ebuild, metadata.xml:
- Add USE=cec support #410479 by Ian Whyman.
-
- 31 Mar 2012; Tomáš Chvátal xbmc-11.0.ebuild,
- xbmc-9999.ebuild:
- Require the opengl useflag on libva, fails configure without it. Reported by
- Ian (Thev00d00) retested by me. Non-maintainer commit, trivial change.
-
- 31 Mar 2012; Tomáš Chvátal
- +files/xbmc-11.0-ffmpeg-0.10.2.patch, xbmc-11.0.ebuild, xbmc-9999.ebuild:
- Add also the 3rd patch from libav bug#406215 that fixes the latest api include
- issues.
-
- 30 Mar 2012; Mike Frysinger xbmc-11.0.ebuild,
- +files/xbmc-11.0-ffmpeg.patch, +files/xbmc-11.0-libav.patch:
- Add fixes by Tomáš Chvátal to build with libav #406215 by Ben Kohler.
-
- 29 Mar 2012; Mike Frysinger xbmc-11.0.ebuild,
- -files/xbmc-11.0-libpng-1.5.patch, +files/xbmc-11.0-no-exec-stack.patch:
- Restore exec-stack patch and drop now unused libpng patch.
-
-*xbmc-11.0 (29 Mar 2012)
-
- 29 Mar 2012; Mike Frysinger
- -files/xbmc-10.0-python-2.7.patch, -xbmc-10.1.ebuild,
- -files/xbmc-10.1-gcc-4.6.patch, -files/xbmc-10.1-headers.patch,
- -files/xbmc-10.1-libpng-1.5.patch, -xbmc-11.0_rc2.ebuild, +xbmc-11.0.ebuild,
- xbmc-9999.ebuild:
- Version bump #409651 by Tomáš Chvátal.
-
- 29 Mar 2012; Mike Frysinger xbmc-9999.ebuild:
- Disable internal vdpau/ffmpeg checks since we handle this ourselves
- #408395 by Tomáš Chvátal.
-
- 29 Mar 2012; Mike Frysinger xbmc-9999.ebuild,
- -files/xbmc-9999-no-exec-stack.patch:
- Drop patch merged into upstream git.
-
- 27 Mar 2012; Samuli Suominen xbmc-10.1.ebuild,
- xbmc-11.0_rc2.ebuild, xbmc-9999.ebuild:
- Pin to SLOT="0" of sys-fs/udisks.
-
- 19 Mar 2012; Mike Frysinger xbmc-11.0_rc2.ebuild,
- -files/xbmc-11.0-libav-0.8.patch:
- Drop libav patch that breaks building with ffmpeg #408495 by Piotr Mitas.
-
- 17 Mar 2012; Samuli Suominen xbmc-9999.ebuild:
- Stop applying -libpng-1.5.patch because upstream commit
- http://github.com/xbmc/xbmc/commit/29f93361a12e5de882f4fb88754914b1d6e3862c
- replaced it.
-
- 15 Mar 2012; Tomáš Chvátal
- +files/xbmc-11.0-libav-0.8.patch, xbmc-11.0_rc2.ebuild:
- Make the eden build againts new ffmpeg api in libav. This should be included
- in trunk based on github.
-
-*xbmc-11.0_rc2 (15 Mar 2012)
-
- 15 Mar 2012; Tomáš Chvátal +xbmc-11.0_rc2.ebuild,
- -xbmc-11.0_rc1.ebuild, xbmc-9999.ebuild:
- Non-maintainer commit. Version bump to next rc which fixes serious regression.
- Check for py2 in pkg_setup as py3 is borked. No other factical changes.
-
-*xbmc-11.0_rc1 (01 Mar 2012)
-
- 01 Mar 2012; Mike Frysinger -xbmc-11.0_beta3.ebuild,
- +xbmc-11.0_rc1.ebuild:
- Version bump #406299 by Ben Kohler.
-
- 01 Mar 2012; Mike Frysinger xbmc-9999.ebuild,
- +files/xbmc-9999-no-exec-stack.patch:
- Fix exec stack warnings.
-
- 26 Feb 2012; Mike Frysinger xbmc-11.0_beta3.ebuild,
- xbmc-9999.ebuild:
- Control bluez dep with USE=bluetooth #403561 by BT.
-
- 17 Feb 2012; Christian Ruppert xbmc-11.0_beta3.ebuild:
- Add QA_EXECSTACK
-
- 16 Feb 2012; Mike Frysinger
- files/xbmc-9999-nomythtv.patch:
- Revise mysql patch to work #403869 by Martin Dummer.
-
-*xbmc-11.0_beta3 (14 Feb 2012)
-
- 14 Feb 2012; Mike Frysinger +xbmc-11.0_beta3.ebuild:
- Version bump.
-
- 04 Feb 2012; Mike Frysinger
- +files/xbmc-11.0-libpng-1.5.patch, xbmc-9999.ebuild:
- Add libpng patch to live version.
-
- 04 Feb 2012; Mike Frysinger xbmc-9999.ebuild,
- files/xbmc-9999-nomythtv.patch:
- Split mysql/mythtv support #401653.
-
- 04 Feb 2012; Mike Frysinger xbmc-9999.ebuild:
- Require ffmpeg be built with USE=encode to make things "just work" #402103 by
- Tomasz Golinski.
-
- 27 Jan 2012; Mike Frysinger xbmc-9999.ebuild,
- +files/xbmc-9999-no-arm-flags.patch:
- Disable hardcoding of random ARM compiler flags #400617 by Fabio Erculiani.
-
- 27 Jan 2012; Mike Frysinger
- files/xbmc-9999-nomythtv.patch:
- Update patch to apply to latest git #400781 by Ben Kohler.
-
- 24 Jan 2012; Mike Frysinger xbmc-9999.ebuild:
- Fix typo pointed out by Stéphane Kattoor.
-
- 24 Jan 2012; Mike Frysinger xbmc-9999.ebuild,
- +files/xbmc-9999-nomythtv.patch, metadata.xml:
- Make mysql support optional.
-
- 21 Dec 2011; Mike Frysinger xbmc-9999.ebuild:
- Require simplejson for the weather plugin #395365 by Pertti Kosunen.
-
- 12 Oct 2011; Mike Frysinger xbmc-10.1.ebuild,
- xbmc-9999.ebuild:
- Now that gettext itself takes care of the internal vcs dep, drop the cvs
- workaround #386635 by BT.
-
- 09 Oct 2011; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Add USE=goom to control GOOM support #385447 by BT. Run autotools in new goom
- subdir #386471 by BT.
-
- 09 Oct 2011; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Add USE=projectm to control visualization plugin #385449 by BT.
-
- 01 Oct 2011; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Make plist depend into USE=airplay #384571 by BT.
-
- 29 Sep 2011; Mike Frysinger xbmc-9999.ebuild:
- Make samba support optional now that upstream allows it to be disabled
- #383759 by BT.
-
- 29 Sep 2011; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Make slick screensavers optional #383785 by BT.
-
- 18 Sep 2011; Mike Frysinger xbmc-9999.ebuild:
- Migrate to git-2 eclass.
-
- 18 Sep 2011; Mike Frysinger xbmc-10.1.ebuild,
- +files/xbmc-10.1-headers.patch, +files/xbmc-10.1-libpng-1.5.patch:
- Fix building with libpng-1.5+ #380127#4 by Ian Stakenvicius.
-
- 28 Aug 2011; Mike Frysinger xbmc-9999.ebuild:
- Upstream xbmc now needs libplist #380785 by Michael Kirkland.
-
- 11 Aug 2011; Mike Frysinger xbmc-10.1.ebuild,
- xbmc-9999.ebuild:
- Pull in libpng #378231 by Diego Elio Pettenò.
-
- 09 Jun 2011; Mike Frysinger xbmc-9999.ebuild:
- Add yajl to depend since upstream now needs it #370229 by BT.
-
- 18 May 2011; Mike Frysinger xbmc-10.1.ebuild,
- +files/xbmc-10.1-gcc-4.6.patch:
- Add fix from upstream for building with gcc-4.6 #367261 by Nils Larsson.
-
- 18 May 2011; Mike Frysinger xbmc-9999.ebuild:
- Update autoconf list #367835 by Alexandre B.
-
- 11 Apr 2011; Mike Frysinger xbmc-9999.ebuild:
- Drop python sed now that upstream isnt bundling it #363057 by BT.
-
- 06 Apr 2011; Mike Frysinger xbmc-10.1.ebuild,
- xbmc-9999.ebuild:
- Force more recent versions of random packages #352571 by Frossie.
-
- 06 Apr 2011; Mike Frysinger xbmc-10.1.ebuild,
- xbmc-9999.ebuild:
- Use new virtual/ffmpeg #362117 by Tomáš Chvátal.
-
- 06 Apr 2011; Mike Frysinger xbmc-9999.ebuild:
- Drop libdts autoconf since the dir no longer exists #359103 by BT.
-
- 12 Mar 2011; Mike Frysinger xbmc-10.1.ebuild:
- Drop hal support in release too #349523 by Samuli Suominen.
-
-*xbmc-10.1 (12 Mar 2011)
-
- 12 Mar 2011; Mike Frysinger +xbmc-10.1.ebuild:
- Version bump #358473 by BT.
-
- 01 Mar 2011; Mike Frysinger xbmc-9999.ebuild:
- Dont force a52/dts disabling since the pkg no longer offers the options at
- all #356157 by BT.
-
- 26 Feb 2011; Kevin McCarthy xbmc-9.11-r5.ebuild,
- xbmc-10.0.ebuild, xbmc-9999.ebuild:
- Updated depends from media-libs/jpeg to virtual/jpeg
-
- 26 Feb 2011; Mike Frysinger xbmc-10.0.ebuild:
- Use internal python for release.
-
- 26 Feb 2011; Mike Frysinger xbmc-10.0.ebuild,
- xbmc-9999.ebuild:
- Enable xrandr by default per upstream.
-
- 19 Feb 2011; Mike Frysinger xbmc-9999.ebuild:
- Drop faad2 dep since xbmc no longer uses it #355371 by BT.
-
- 10 Feb 2011; Mike Frysinger xbmc-9999.ebuild:
- Drop libmms dep since xbmc now uses ffmpeg #353919 by BT.
-
- 06 Feb 2011; Mike Frysinger xbmc-9999.ebuild:
- Update paths after filesystem shuffle in git repo #352806 by hal.
-
- 06 Feb 2011; Mike Frysinger xbmc-10.0.ebuild,
- xbmc-9999.ebuild:
- Drop unrar depend since xbmc itself includes an unrar lib #353314 by Marco
- Clocchiatti.
-
- 18 Jan 2011; Mike Frysinger xbmc-9999.ebuild:
- Convert to git #346381 by Mathieu Rochette.
-
- 03 Jan 2011; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Add USE=bluray support #350362 by hal.
-
- 02 Jan 2011; Mike Frysinger xbmc-10.0.ebuild,
- xbmc-9999.ebuild:
- Punt deprecated liba52/libdts usage #350360 by hal.
-
- 01 Jan 2011; Mike Frysinger xbmc-10.0.ebuild,
- +files/xbmc-10.0-python-2.7.patch:
- Add support from upstream for python-2.7 #350098 by Tom Flair.
-
- 31 Dec 2010; Mike Frysinger xbmc-9999.ebuild:
- Patch by Samuli Suominen to drop hal support in favor of upstream
- replacements #349523.
-
- 23 Dec 2010; Mike Frysinger xbmc-10.0.ebuild,
- xbmc-9999.ebuild:
- Require USE=cxx in libpcre #349533 by Oliver Schinagl.
-
-*xbmc-10.0 (22 Dec 2010)
-
- 22 Dec 2010; Mike Frysinger +xbmc-10.0.ebuild:
- Version bump.
-
- 22 Dec 2010; Mike Frysinger xbmc-9999.ebuild:
- Only delay for 3 seconds when dbus services are missing #348580 by James
- Bowlin.
-
- 19 Nov 2010; Mike Frysinger xbmc-9999.ebuild:
- Drop USE=aac like upstream has #345939 by BT.
-
-*xbmc-9.11-r5 (18 Sep 2010)
-
- 18 Sep 2010; Mike Frysinger +xbmc-9.11-r5.ebuild,
- +files/xbmc-9.11-external-python.patch, +files/xbmc-9.11-libdca.patch:
- Force internal python usage #304521 by Domen Kožar. Build against libdca
- rather than libdts #330201 by Füves Zoltán.
-
- 18 Sep 2010; Mike Frysinger xbmc-9.11-r4.ebuild,
- xbmc-9999.ebuild:
- Update postinst URL #337762 by Ewoud Kohl van Wijngaarden.
-
- 28 Aug 2010; Mike Frysinger xbmc-9999.ebuild:
- Add gperf to DEPEND #334845 by Cyril.
-
- 24 Aug 2010; Mike Frysinger xbmc-9999.ebuild:
- Force recent ffmpeg #334059 by Domen Kožar.
-
- 14 Aug 2010; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Add support for USE=webserver #305229 by Jan Vansteenkiste.
-
- 12 Aug 2010; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Update paths to run autotools in #330473 by hal. Add support for USE=rtmp
- #331983 by Daniel Marmander.
-
- 11 Jul 2010; Mike Frysinger xbmc-9999.ebuild:
- Update lsb_release sed to match latest svn #326949 by BT.
-
- 11 Jul 2010; Mike Frysinger xbmc-9.11-r4.ebuild,
- xbmc-9999.ebuild:
- Only require libsdl[alsa] when xbmc is being built with USE=alsa #327727
- by Džen.
-
- 21 Jun 2010; Mike Frysinger xbmc-9.11-r4.ebuild:
- Fix building with ffmpeg-0.6 #324293 by Alexis Ballier.
-
- 19 Jun 2010; Jonathan Callen xbmc-9999.ebuild:
- Moving dev-util/cvs* to dev-vcs/cvs*
-
- 23 May 2010; Mike Frysinger xbmc-9999.ebuild:
- Run autotools in more subdirs, update docdir install, and convert to
- emake+DESTDIR for installing.
-
- 23 May 2010; Mike Frysinger xbmc-9999.ebuild:
- Make hal support optional via USE=hal now that upstream supports it
- #319193 by hal.
-
- 23 May 2010; Mike Frysinger xbmc-9.11-r4.ebuild,
- xbmc-9999.ebuild:
- Sync recent updates between the release/live ebuilds.
-
-*xbmc-9.11-r4 (23 May 2010)
-
- 23 May 2010; Mike Frysinger +xbmc-9.11-r4.ebuild,
- +files/xbmc-9.11-TexturePacker-parallel-build.patch,
- +files/xbmc-9.11-shader-upscalers.patch:
- Force python-2.4 usage #304521 by Domen Kožar. Apply upshader patch from
- upstream #306661 by zehner. Install the xbmc-send helper python script
- #309885 by James Broadhead.
-
- 23 May 2010; Mike Frysinger xbmc-9999.ebuild,
- metadata.xml:
- Stop installing web styles since they no longer exist #305969 by Thomas
- Andersson. Require opengl support in libsdl #311891 by Stijn Tintel, and
- require -minimal support in libcdio #311893 by Stijn Tintel. Update dodoc
- line #316081 by Diego E. Pettenò. Add USE=vaapi support #319701 by hal.
-
- 23 May 2010; Mike Frysinger xbmc-9.11-r3.ebuild:
- Update dodoc line #316081 by Diego E. Pettenò.
-
- 14 May 2010; Samuli Suominen xbmc-9.11-r3.ebuild:
- Don't apply -libpng14.patch with libpng12 wrt #319721 by Martin von
- Gagern.
-
- 10 May 2010; Samuli Suominen xbmc-9.11-r3.ebuild,
- +files/xbmc-9.11-libpng14.patch:
- Fix building with libpng14 wrt #319113 by Manuel Nickschas.
-
- 07 Apr 2010; Patrick Lauer xbmc-9.11.ebuild,
- xbmc-9.11-r3.ebuild, xbmc-9999.ebuild:
- Fixing samba deps
-
- 07 Apr 2010; Tomáš Chvátal xbmc-9.11.ebuild,
- xbmc-9.11-r3.ebuild, xbmc-9999.ebuild:
- Drop unrar-gpl dependencies. Unrar-gpl cant open most rars that are
- around.
-
-*xbmc-9.11-r3 (18 Mar 2010)
-
- 18 Mar 2010; Fabio Erculiani -xbmc-9.11-r2.ebuild,
- +xbmc-9.11-r3.ebuild,
- +files/xbmc-9.11-use-cdio-system-headers-on-non-win32.patch:
- backport libcdio patch from trunk, makes DVD playback working, close
- #303030, upstream reference #8026
-
-*xbmc-9.11-r2 (18 Mar 2010)
-
- 18 Mar 2010; Fabio Erculiani -xbmc-9.11-r1.ebuild,
- +xbmc-9.11-r2.ebuild:
- temp. workaround inability to play DVDs, see bug #303030
-
- 07 Mar 2010; Mike Frysinger xbmc-9999.ebuild:
- Pull in libmodplug #305911 by Michael Lange. Disable the webserver for now
- #305229 by Jan Vansteenkiste.
-
- 25 Jan 2010; Samuli Suominen xbmc-9.11-r1.ebuild,
- xbmc-9999.ebuild:
- Require SLOT="0" of media-libs/jpeg for headers.
-
- 18 Jan 2010; Mike Frysinger xbmc-9.11-r1.ebuild,
- xbmc-9999.ebuild:
- Disable support for USE=-opengl #298529 by Diego E. Pettenò.
-
-*xbmc-9.11-r1 (17 Jan 2010)
-
- 17 Jan 2010; Mike Frysinger +xbmc-9.11-r1.ebuild,
- +files/xbmc-9.11-jpeg-speedup.patch:
- Add fix from upstream for high cpu usage with jpeg images #300909 by
- mikopp.
-
- 17 Jan 2010; Mike Frysinger xbmc-9.11.ebuild,
- xbmc-9999.ebuild:
- Require USE=smbclient with newer versions of samba #301233 by Darren
- Smith.
-
- 05 Jan 2010; Mike Frysinger xbmc-9.11.ebuild,
- xbmc-9999.ebuild:
- Update vdpau dependency #299398 by Fabio Erculiani.
-
-*xbmc-9.11 (26 Dec 2009)
-
- 26 Dec 2009; Mike Frysinger +xbmc-9.11.ebuild,
- +files/xbmc-9.11-wavpack.patch:
- Version bump #298226 by hal.
-
-*xbmc-9.11_rc1 (19 Dec 2009)
-
- 19 Dec 2009; Mike Frysinger +xbmc-9.11_rc1.ebuild,
- +files/xbmc-9.11_rc1-wavpack.patch, xbmc-9999.ebuild:
- Version bump #297520.
-
- 18 Dec 2009; Mike Frysinger -xbmc-9.04.ebuild,
- -xbmc-9.04.1.ebuild, -files/xbmc-9.04-gcc.patch:
- Punt older versions with random build problems.
-
- 15 Dec 2009; Mike Frysinger xbmc-9999.ebuild:
- Regen libbdnav autotools when needed #296792 by Martin Berkemeier.
-
- 04 Dec 2009; Mike Frysinger xbmc-9999.ebuild:
- Install all webui styles #293093 by hal.
-
- 04 Dec 2009; Mike Frysinger xbmc-9999.ebuild:
- Enable epatch_user #293109 by hal.
-
- 22 Nov 2009; Mike Frysinger xbmc-9999.ebuild:
- Drop pmount depend now #293108 by hal. Switch back to external faad2
- #294059 by Michael Lawrence. Add USE="avahi css aac midi xrandr" and add
- missing deps for USE="pulseaudio vdpau" #293968 by Craig Andrews.
-
- 08 Nov 2009; Mike Frysinger xbmc-9999.ebuild:
- Control squish altivec/sse support via USE #290564 by Francisco González.
-
- 08 Nov 2009; Mike Frysinger xbmc-9999.ebuild:
- Pull in jbigkit/tiff #289621 by Michael Lange.
-
- 17 Oct 2009; Mike Frysinger xbmc-9999.ebuild:
- Force libass-0.9.7+ #285328#10.
-
- 17 Oct 2009; Samuli Suominen xbmc-9999.ebuild:
- Remove libmpcdec (SV7) support.
-
- 01 Oct 2009; Mike Frysinger xbmc-9999.ebuild,
- -files/xbmc-9999-libass.patch:
- Drop libass patch as upstream has fixed things.
-
- 26 Sep 2009; Mike Frysinger xbmc-9999.ebuild,
- +files/xbmc-9999-libass.patch:
- Fix by Jan Vansteenkiste for building with newer versions of libass
- #285328 by Dirk Best.
-
- 26 Sep 2009; Mike Frysinger xbmc-9.04.ebuild,
- xbmc-9.04.1.ebuild, xbmc-9999.ebuild:
- Update SVN paths as upstream has moved stuff around.
-
- 05 Sep 2009; Mike Frysinger xbmc-9999.ebuild:
- Generate autotools since upstream no longer includes them in svn #283722
- by Kevin.
-
-*xbmc-9.04.1 (05 Sep 2009)
-
- 05 Sep 2009; Mike Frysinger +xbmc-9.04.1.ebuild:
- Version bump #283608 by zehner.
-
- 27 Aug 2009; Mike Frysinger xbmc-9999.ebuild:
- Force internal faad2 for now #278400. Pull in more deps #279062 #281078.
-
- 27 Aug 2009; Mike Frysinger xbmc-9999.ebuild:
- Drop unzip step since upstream has integrated it #282739 by Jan
- Vansteenkiste.
-
- 27 Jul 2009; Stephanie Lockwood-Childs
- xbmc-9.04.ebuild, xbmc-9999.ebuild:
- Use http instead of https for source download (thanks to Xake, bug #279174)
-
- 20 Jul 2009; Mike Frysinger xbmc-9999.ebuild:
- Add more libraries to DEPEND #278294 by BT and move to external libraries
- #275844 by candrews.
-
- 20 Jul 2009; Mike Frysinger files/xbmc-9.04-gcc.patch:
- Update gcc-4.4 patch #277562 by Diego E. Pettenò.
-
- 29 May 2009; Mike Frysinger xbmc-9.04.ebuild,
- xbmc-9999.ebuild:
- Allow unrar-gpl for unrar needs #270728 by Mathy Vanvoorden.
-
-*xbmc-9.04 (16 May 2009)
-
- 16 May 2009; Mike Frysinger +xbmc-9.04.ebuild,
- +files/xbmc-9.04-gcc.patch:
- Version bump #269400 by Tim Bastiaenssens.
-
- 16 May 2009; Mike Frysinger xbmc-9999.ebuild:
- Add libsamplerate to DEPEND #269673 by Jan Vansteenkiste.
-
- 29 Apr 2009; Mike Frysinger xbmc-9999:
- Dont install session anymore since upstream does it #267631 by BT and Jan
- Vansteenkiste, and stop bothering with the xbmc.sh wrapper since it has
- been updated as well.
-
- 27 Apr 2009; Mike Frysinger xbmc-9999:
- Pull in zip as the build process likes to make zips #266414 by Robert
- Kerr.
-
- 26 Mar 2009; Mike Frysinger xbmc-9999.ebuild:
- Fix readline detection in python subdir #262822 by Scott.
-
- 26 Mar 2009; Mike Frysinger metadata.xml,
- xbmc-9999.ebuild:
- Add USE=vdpau #263435 by Michael Lange.
-
- 23 Mar 2009; Mike Frysinger xbmc-9999.ebuild:
- Require libcdio #263430 by BT.
-
- 23 Mar 2009; Mike Frysinger xbmc-9999.ebuild:
- Require audio/video USE flags in libsdl #263349.
-
- 07 Mar 2009; Mike Frysinger xbmc-9999.ebuild:
- Pull in xdpyinfo #261556 by Michael Lange.
-
- 07 Mar 2009; Mike Frysinger xbmc-9999.ebuild:
- Drop tre from DEPEND #261501 by BT.
-
- 05 Mar 2009; Mike Frysinger xbmc-9999.ebuild:
- Add mesa-progs to the depend list #261226 by Michalis Adamidis.
-
- 24 Feb 2009; Mike Frysinger -files/xbmc-fribidi.patch,
- -files/xbmc-readsector.patch, xbmc-9999.ebuild:
- And now the fribidi/readsector patches have been merged upstream.
-
- 23 Feb 2009; Mike Frysinger xbmc-9999.ebuild:
- Upstream now allows SVN_REV to override svnversion.
-
- 22 Feb 2009; Mike Frysinger xbmc-9999.ebuild:
- MACDll build flags have been merged upstream.
-
- 22 Feb 2009; Mike Frysinger
- -files/xbmc-alsa-params.patch, xbmc-9999.ebuild:
- Upstream has fixed the ALSA bug, so drop our workaround.
-
- 21 Feb 2009; Mike Frysinger -files/xbmc-noexec.patch,
- xbmc-9999.ebuild:
- The noexec patch has been merged upstream.
-
- 21 Feb 2009; Mike Frysinger xbmc-9999.ebuild:
- Generate an Xsession so people can log in with xbmc in full screen.
-
-*xbmc-9999 (21 Feb 2009)
-
- 21 Feb 2009; Mike Frysinger
- +files/xbmc-alsa-params.patch, +files/xbmc-fribidi.patch,
- +files/xbmc-noexec.patch, +files/xbmc-readsector.patch, +metadata.xml,
- +xbmc-9999.ebuild:
- Initial ebuild by many people at #198849 (Peter Fern, Rick Harris, etc...)
- cleaned up by me.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
deleted file mode 100644
index 21fe5e7dd153..000000000000
--- a/media-tv/xbmc/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-DIST xbmc-11.0.tar.gz 63012044 SHA256 1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19 SHA512 ba738129f70dd171b3fae385ab44317f62c9041a116bfe809d6d07c99ea69c663ad5d598552a17be0b942251ce12a68f34d0be21b303b256055849a6dde90043 WHIRLPOOL 4dd068749c86542e39b8fc42b45bbb56e885813b17876d3583cb4d91c902ff075e1f16f1c19720e3430dc149c40e52e7d1ab3323f666263fb353a59e2ef94a8e
-DIST xbmc-12-libav.tar.xz 6080 SHA256 84ba05dc66a476d2cb940c10355a22a04c5ef3b4fd6bd96a87a1fb2ffa7ccc0c SHA512 cde76dd435fb449ec843aaaa41a46f0fb4efeeb753669f9e4d052c06f00fe512be9fe994d5dd56794f47ce2f49146a2782f2da72dd78a1f66e5f54ca15723f13 WHIRLPOOL 07ba9e3fb3a4ba6d2c52055bcbe52009a87363bc8e0b21ebc90965bd3562196eee728103028fe8baaad250def5c6f76616a19731f825955648df9ff01c905e6b
-DIST xbmc-12.1.tar.gz 67430677 SHA256 29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 SHA512 a8b5194766e32e09fa65c0e3656ff180c15761ce2348dc8a1fff0c65247b47e644db4fc91a829e73907b6a52c8e1bdebf624640b9dd06cea2c46bda1d2b3b4a5 WHIRLPOOL 13dbaf040faaaef1b04da892949e9684d7a958cec286b3a5f8cb449ec0fea6b5f96c2a473ece840b86103eb03dd1f39dd66411e5b0526785256d2cc92e1e95e8
-DIST xbmc-12.2.tar.gz 67663000 SHA256 b2330634fc513d27a44b131bbbe4ca6b61d60a1fe6c7ca27a7dc749df0bcea1c SHA512 d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39 WHIRLPOOL c3fc97e5f45a38a259bca06af0b171630ac16832034410e45174d900358b1d16b72940b29475dcad72a2198d8722859a229152379ab7784a7d61f961eb261ddb
-DIST xbmc-12.3-generated-addons.tar.xz 52228 SHA256 477f789dea36969149fe118ecac1c4f3d8c3414772cc6c569be4aefb7e3f221e SHA512 2107271445c0cdcc14b348d011e12ffaaee75bbec506496798f64218256ab9e86cc0ada5edc1e70e509ac1ab366695fae4c15e90bd47fa57ccfe723d7e406b85 WHIRLPOOL 3963577539dee04f33dc4b988944f906688d77864d5e6a6b403e4578c9a91f2b77c256e6b4ed234a9722524c1c3acc626a28ff44c6376c09d93f24008abf54cd
-DIST xbmc-12.3.tar.gz 64615159 SHA256 3e15c960d034efdea5f92a7b74716cb48094842d077b076025fd8640754ede73 SHA512 abe5333f940460a2d40b04a4821f932b44c7605e0d4954e48781317aa25ee04e102b051165842094c5804024c637ca30506773dc3319aba7ab6dbfbe1973ccaa WHIRLPOOL 035cf5792c3c9785eb0a5227406c66298591bafc1251889d4e4a2742ffd715c374c0b6e092f5705db181412de9cae6d1eb3e9c370f3390858b4651f4c135fda1
-DIST xbmc-13.0_r2-generated-addons.tar.xz 312524 SHA256 82e2c219a09a758c5cc7a29c4e719c48255523ee79e2ac9fe72d39b45730e32e SHA512 1399b922711424844756d4f56696ea4be34b3ffbeedfc23bb832cb8e0ee9d6831f1c31ebc41d49f20c262f0cbb52601786e33550d5aca5de4de520fcee0f53ec WHIRLPOOL 67f184b241e90c369cee7ceaf3f714c002093a5b4e82614cd1413af35e7c3aef1adb2460d9286c54a40e5a74de37864eff86d5631e0a0ea33a69e3b29082e477
-DIST xbmc-13.0_r2.tar.gz 65616107 SHA256 663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903 SHA512 c56d11959797f4c6c3b1831afeab03332913fe6cc00f2542c45af725fe932ba3b997c2af997a602665734a6bcc061c40b8e876144894fdeab91b56df98958433 WHIRLPOOL 394b76c9d20dd90a0d04306d301d4bb656fe99afab6e7392d6274bd3eb8c9a3083bfe192f3850f6ea7123ed537baa64f658a48b14eee68b8226b4e620a76d199
-DIST xbmc-13.1-generated-addons.tar.xz 54968 SHA256 fb0c265640e8d468ed094d83be5089274b7effc1ad1946c42ce21d831442d00e SHA512 7081e25621141eaf76d552fe648fcf9ff4697fc76991b2081806ae829af6094012194cfab93b0c836242197ded00ff88458b89ed6008532b38552d3114d2a776 WHIRLPOOL d83a4290af3e9a2a88dccf074d73692e34a9877d2ff7ff6a946a601b0c8e9d01105eb04bf1d28f62bf648d7221df787b42e52b416f2e924bfa5208342b3ef51a
-DIST xbmc-13.1.tar.gz 65758346 SHA256 344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678 SHA512 918126a85a8194dd49d5c82a5a56d2006b811ff5fca535e95bcc5ef4ab135c5907d01595c2ceb4accdc69aef5afc621adae249a1fef85425945560a646e970b0 WHIRLPOOL d429dd9a03974aedd5cd256f0cf1409dcf7434ec1bafeaa0fcdaaa0d8bb08442183143d514d33b1de4934a5e800b03a8f64df5abdd7203d8a0557638e124b53a
-DIST xbmc-13.2-generated-addons.tar.xz 55008 SHA256 26d72e282f0458acb48b283edc27f7b71fc3f285344b8d4df6835a2520ae5650 SHA512 7b77bc22e0c665b74d90276cfa8b827222b22930f4d3bf335191dd5a8123f8bd74367de123199e124b02c7075aa81536058ace38926f4c03d0449ea55fd83254 WHIRLPOOL 449fe73e5ca7f5d973fb1d49e4e84f47955bced804bfea93a5bda67481af096dfa10581435fd84a26d59cb30f4b0eedd7096c905d5b1749286f85b042f90b626
-DIST xbmc-13.2.tar.gz 65900491 SHA256 acbf5dffa3034a3406240ee3cf81e721386cd383d23d056ddde1f769e050e585 SHA512 83a514410748b05da4c626caff34fec7b6b26a8bdea9f158e1c75721d3a47d36eb1f97ed4c162f6c2472a97f658e3b5285c1e0b144bfb4f654932586eee4d1c8 WHIRLPOOL 54e8551fa8393b9fd1076572e87b4d5a7e1b52acaa0443d14cfc8ed08e69a2efb86e3bb2cbe97d8894989ad7f892f512649165089e3d1035307f8cc820772e6f
-DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf81943e85b6ea716768b83c9eba5fa8 SHA512 19b29808f7a3a7b0642f8463bdd229041588d2f42952fe55a17ab69b5b259cde249eb763598893463218d0ab6c747bf3c81e045bdbf5655f9f5f2d2067cb35d2 WHIRLPOOL cc6870dabca8b53a1a6055a4218a8f9bbb2c031ab3b928040325fb121ea75ae6db431542660d28c3bc6900a904e2c0949d69651b2f63faffe8bc7f670d519f06
diff --git a/media-tv/xbmc/files/generate.sh b/media-tv/xbmc/files/generate.sh
deleted file mode 100755
index 68d1082bcae5..000000000000
--- a/media-tv/xbmc/files/generate.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-PV=$1
-PN=xbmc
-P="${PN}-${PV}"
-DISTDIR="/usr/portage/distfiles"
-GITDIR="/usr/local/src/xbmc/git"
-
-if [[ ${PV} != "9999" ]] ; then
- rm -rf ${PN}-*/
- tar xf ${DISTDIR}/${P}.tar.gz
- d=$(echo ${PN}-*/)
-else
- stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u +%Y%m%d)
- P+="-${stamp}"
- cd ${GITDIR}
- d=.
-fi
-make -C ${d} -j -f codegenerator.mk
-tar="${DISTDIR}/${P}-generated-addons.tar.xz"
-tar cf - ${d}/xbmc/interfaces/python/generated/*.cpp | xz > "${tar}"
-if [[ ${PV} != "9999" ]] ; then
- rm -rf ${PN}-*/
-fi
-
-du -b "${tar}"
diff --git a/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch b/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch
deleted file mode 100644
index b6a2d731dc13..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-ffmpeg-0.10.2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4d74bd14c0fa158c5a2bcf18192f418fafc3a053 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal
-Date: Fri, 23 Mar 2012 11:59:02 +0100
-Subject: [PATCH 1/2] Add support for new ffmpeg-10/11 api.
-
----
- configure.in | 3 +++
- lib/DllAvUtil.h | 3 +++
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bca9239..bea66ac 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1225,6 +1225,9 @@ if test "$use_external_ffmpeg" = "yes"; then
- # old FFmpeg have this in libavcodec/opt.h instead:
- AC_CHECK_HEADERS([libavutil/opt.h])
-
-+ # new FFmpeg have math headers
-+ AC_CHECK_HEADERS([libavutil/mathematics.h],,)
-+
- # We'll support the use of rgb2rgb.h if it exists.
- AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
- AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
-diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h
-index e882cac..e3b8a02 100644
---- a/lib/DllAvUtil.h
-+++ b/lib/DllAvUtil.h
-@@ -59,6 +59,9 @@ extern "C" {
- #else
- #include
- #endif
-+ #if (defined HAVE_LIBAVUTIL_MATHEMATICS_H)
-+ #include
-+ #endif
- #else
- #include "libavutil/avutil.h"
- #include "libavutil/crc.h"
---
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch b/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch
deleted file mode 100644
index 51372fdc1db9..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-ffmpeg.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/406215
-
-From 97212837ec81c3869ba60e0690f26c09b9428747 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal
-Date: Fri, 30 Mar 2012 10:00:46 +0200
-Subject: [PATCH] Ensure we include proper header on ffmpeg.
-
----
- configure.in | 3 +++
- lib/DllAvFilter.h | 6 +++++-
- 2 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index bca9239..d209f80 100755
---- a/configure.in
-+++ b/configure.in
-@@ -1229,6 +1229,9 @@ if test "$use_external_ffmpeg" = "yes"; then
- AC_CHECK_HEADERS([libswscale/rgb2rgb.h],,)
- AC_CHECK_HEADERS([ffmpeg/rgb2rgb.h],,)
-
-+ # check for avcodec header as it is not present on libav
-+ AC_CHECK_HEADERS([libavfilter/avcodec.h],,)
-+
- # Check if AVFilterBufferRefVideoProps AVRational member is named
- # 'pixel_aspect' or 'sample_aspect_ratio'.
- AC_CHECK_MEMBER([AVFilterBufferRefVideoProps.sample_aspect_ratio],
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 827746e..d47623b 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -48,7 +48,11 @@ extern "C" {
- #endif
- /* for av_vsrc_buffer_add_frame */
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
-- #include
-+ #if defined(HAVE_LIBAVFILTER_AVCODEC_H)
-+ #include
-+ #else
-+ #include
-+ #endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
- int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
- AVFrame *frame);
---
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-libav.patch b/media-tv/xbmc/files/xbmc-11.0-libav.patch
deleted file mode 100644
index 0aaa1ce41849..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-libav.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-https://bugs.gentoo.org/406215
-
-From c74abc298e2075f431d9fa700fcfc5e1bbbddf22 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal
-Date: Fri, 23 Mar 2012 12:08:53 +0100
-Subject: [PATCH 2/2] Add support for libav api as it sligthly differ.
-
-The libav use micro version as 0
-The ffmpeg use the micro version as 100+
-
-Simply check if the variable is defined then it is not libav.
----
- lib/DllAvFilter.h | 10 +++++++++-
- .../DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp | 4 ++++
- 2 files changed, 13 insertions(+), 1 deletions(-)
-
-diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h
-index 302e35c..827746e 100644
---- a/lib/DllAvFilter.h
-+++ b/lib/DllAvFilter.h
-@@ -48,7 +48,7 @@ extern "C" {
- #endif
- /* for av_vsrc_buffer_add_frame */
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,8,0)
-- #include
-+ #include
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
- int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter,
- AVFrame *frame);
-@@ -83,7 +83,11 @@ public:
- virtual int avfilter_poll_frame(AVFilterLink *link)=0;
- virtual int avfilter_request_frame(AVFilterLink *link)=0;
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags)=0;
-+#else
-+ virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect)=0;
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame)=0;
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-@@ -172,7 +176,11 @@ public:
- virtual int avfilter_poll_frame(AVFilterLink *link) { return ::avfilter_poll_frame(link); }
- virtual int avfilter_request_frame(AVFilterLink *link) { return ::avfilter_request_frame(link); }
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int flags) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, flags); }
-+#else
-+ virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, AVRational pixel_aspect) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame, pts, pixel_aspect); }
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
- virtual int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame) { return ::av_vsrc_buffer_add_frame(buffer_filter, frame); }
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-index b4e1451..4e5eedf 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -814,7 +814,11 @@ int CDVDVideoCodecFFmpeg::FilterProcess(AVFrame* frame)
- if (frame)
- {
- #if LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,13,0)
-+#if LIBAVFILTER_VERSION_MICRO
- result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, 0);
-+#else
-+ result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame, frame->pts, m_pCodecContext->sample_aspect_ratio);
-+#endif
- #elif LIBAVFILTER_VERSION_INT >= AV_VERSION_INT(2,7,0)
- result = m_dllAvFilter.av_vsrc_buffer_add_frame(m_pFilterIn, frame);
- #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53,3,0)
---
-1.7.3.4
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch b/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch
deleted file mode 100644
index ebee2d063181..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-nfs-limits.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/445174
-
-fix from upstream
-
-From 6ffd1cb4e2cba40888c24ff84afd04a5a07a22e9 Mon Sep 17 00:00:00 2001
-From: Torsten Kurbad
-Date: Wed, 28 Nov 2012 21:29:29 +0100
-Subject: [PATCH] NFSDirectory.cpp must include limits.h
-
----
- xbmc/filesystem/NFSDirectory.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
-index 4dc0f31..d306331 100644
---- a/xbmc/filesystem/NFSDirectory.cpp
-+++ b/xbmc/filesystem/NFSDirectory.cpp
-@@ -35,6 +35,7 @@
- #include "threads/SingleLock.h"
- using namespace XFILE;
- using namespace std;
-+#include
- #include
- #include
-
---
-1.8.0
-
diff --git a/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch b/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch
deleted file mode 100644
index 179697a8f5ce..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-no-arm-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/400617
-
-do not force any particular ABI or FPU or SIMD compiler flags for arm
-targets. let the toolchain and user CFLAGS control that.
-
---- a/configure.in
-+++ b/configure.in
-@@ -571,7 +571,7 @@
- LIBS="$LIBS -framework DiskArbitration"
- LIBS="$LIBS -framework ApplicationServices"
- fi
--elif test "$use_arch" = "arm"; then
-+elif false; then
- CFLAGS="$CFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
- CXXFLAGS="$CXXFLAGS -mfloat-abi=softfp -mno-apcs-stack-check"
- FFMPEG_EXTRACFLAGS="-mfloat-abi=softfp"
diff --git a/media-tv/xbmc/files/xbmc-11.0-no-exec-stack.patch b/media-tv/xbmc/files/xbmc-11.0-no-exec-stack.patch
deleted file mode 100644
index 35ff747d4f8b..000000000000
--- a/media-tv/xbmc/files/xbmc-11.0-no-exec-stack.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://trac.xbmc.org/ticket/12735
-
-merged upstream already
-
-From f0e33eefa4b5d46f26811db2f5e943dcd7f2870e Mon Sep 17 00:00:00 2001
-From: Mike Frysinger
-Date: Thu, 1 Mar 2012 00:04:49 -0500
-Subject: [PATCH] mark stack as non-executable
-
-Signed-off-by: Mike Frysinger