diff options
304 files changed, 4922 insertions, 4620 deletions
diff --git a/app-admin/sudo/sudo-1.8.14_p3.ebuild b/app-admin/sudo/sudo-1.8.14_p3.ebuild index ebbbe5ced4dd..c4e80afad003 100644 --- a/app-admin/sudo/sudo-1.8.14_p3.ebuild +++ b/app-admin/sudo/sudo-1.8.14_p3.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz # 3-clause BSD license LICENSE="ISC BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris" IUSE="ldap nls pam offensive selinux skey +sendmail" DEPEND="pam? ( virtual/pam ) diff --git a/app-admin/sudo/sudo-1.8.15.ebuild b/app-admin/sudo/sudo-1.8.15-r1.ebuild index d36ae5e10180..1d919c9a407a 100644 --- a/app-admin/sudo/sudo-1.8.15.ebuild +++ b/app-admin/sudo/sudo-1.8.15-r1.ebuild @@ -128,7 +128,7 @@ src_install() { default if use ldap ; then - dodoc README.LDAP doc/schema.OpenLDAP + dodoc README.LDAP dosbin plugins/sudoers/sudoers2ldif cat <<-EOF > "${T}"/ldap.conf.sudo @@ -137,12 +137,15 @@ src_install() { # supported directives: host, port, ssl, ldap_version # uri, binddn, bindpw, sudoers_base, sudoers_debug - # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key + # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key} EOF insinto /etc doins "${T}"/ldap.conf.sudo fperms 0440 /etc/ldap.conf.sudo + + insinto /etc/openldap/schema + newins doc/schema.OpenLDAP sudo.schema fi pamd_mimic system-auth sudo auth account session diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest index 8392508578e9..d969037d459d 100644 --- a/app-admin/ulogd/Manifest +++ b/app-admin/ulogd/Manifest @@ -1,2 +1 @@ -DIST ulogd-2.0.4.tar.bz2 452234 SHA256 56b30a13a8832e97178f39b7bb173a0b1dfe173dbb60d99a1a386c0962a2effd SHA512 08e88661fcfbcfd327b03b7a883dc239991f47d5a4e4561f3ada5f6acc8f2349f3bd38c1c67f28e42bbccf4cad63b2b7c3b732c23bf24b7c5f05320d27977773 WHIRLPOOL 94ee731cee8b95295d1c675bb3904be1a5b27a1e901d462f248116c865e79d52703b5330882110d7212bda1bb964fc0c97c3e704589071f47fab4475e1c91161 DIST ulogd-2.0.5.tar.bz2 456258 SHA256 a221cb9f77347c0ca00d0937e27c1b90e3291a553cc62a4139b788e2e420e8c0 SHA512 bf00b8adaad7bd04077a83521b0d7accc26e644c8f3386819e7f91476178b6733f1c6554fb82dd0d3913398c83a61d65f61dc973f199f610bfaadc6251504819 WHIRLPOOL fe499ac7b4070581439a05f4f2245f7a42fe5630da5dc32b9b069511ed1faa15fe482eee08d50477d3fb1d0bf0d3855a69fc82fb0f3e8eecdf082fb642519f91 diff --git a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch b/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch deleted file mode 100644 index f8c10622e229..000000000000 --- a/app-admin/ulogd/files/ulogd-2.0.4-linux-headers-3.17-ipt_ulog.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Fri, 7 Nov 2014 18:33:01 +0100 -Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h - -This fixes compilation if you use a Linux kernel >= 3.17. This problem -occurs since ULOG was removed from mainstream: - -http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb - -Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986 -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - -diff --git a/configure.ac b/configure.ac -index 522c345..c5f573c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x) - - AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \ - include/linux/Makefile include/linux/netfilter/Makefile \ -- libipulog/Makefile \ -+ include/linux/netfilter_ipv4/Makefile libipulog/Makefile \ - input/Makefile input/packet/Makefile input/flow/Makefile \ - input/sum/Makefile \ - filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \ -diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am -index ca80d0d..18af1c2 100644 ---- a/include/linux/Makefile.am -+++ b/include/linux/Makefile.am -@@ -1,2 +1,2 @@ -- --SUBDIRS = netfilter -+SUBDIRS = netfilter \ -+ netfilter_ipv4 -diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am -new file mode 100644 -index 0000000..41819a3 ---- /dev/null -+++ b/include/linux/netfilter_ipv4/Makefile.am -@@ -0,0 +1 @@ -+noinst_HEADERS = ipt_ULOG.h -diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h -new file mode 100644 -index 0000000..417aad2 ---- /dev/null -+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h -@@ -0,0 +1,49 @@ -+/* Header file for IP tables userspace logging, Version 1.8 -+ * -+ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org> -+ * -+ * Distributed under the terms of GNU GPL */ -+ -+#ifndef _IPT_ULOG_H -+#define _IPT_ULOG_H -+ -+#ifndef NETLINK_NFLOG -+#define NETLINK_NFLOG 5 -+#endif -+ -+#define ULOG_DEFAULT_NLGROUP 1 -+#define ULOG_DEFAULT_QTHRESHOLD 1 -+ -+#define ULOG_MAC_LEN 80 -+#define ULOG_PREFIX_LEN 32 -+ -+#define ULOG_MAX_QLEN 50 -+/* Why 50? Well... there is a limit imposed by the slab cache 131000 -+ * bytes. So the multipart netlink-message has to be < 131000 bytes. -+ * Assuming a standard ethernet-mtu of 1500, we could define this up -+ * to 80... but even 50 seems to be big enough. */ -+ -+/* private data structure for each rule with a ULOG target */ -+struct ipt_ulog_info { -+ unsigned int nl_group; -+ size_t copy_range; -+ size_t qthreshold; -+ char prefix[ULOG_PREFIX_LEN]; -+}; -+ -+/* Format of the ULOG packets passed through netlink */ -+typedef struct ulog_packet_msg { -+ unsigned long mark; -+ long timestamp_sec; -+ long timestamp_usec; -+ unsigned int hook; -+ char indev_name[IFNAMSIZ]; -+ char outdev_name[IFNAMSIZ]; -+ size_t data_len; -+ char prefix[ULOG_PREFIX_LEN]; -+ unsigned char mac_len; -+ unsigned char mac[ULOG_MAC_LEN]; -+ unsigned char payload[0]; -+} ulog_packet_msg_t; -+ -+#endif /*_IPT_ULOG_H*/ --- -2.0.4 - diff --git a/app-admin/ulogd/files/ulogd.init b/app-admin/ulogd/files/ulogd.init-r2 index ace6e8b51c91..c994507f9935 100644 --- a/app-admin/ulogd/files/ulogd.init +++ b/app-admin/ulogd/files/ulogd.init-r2 @@ -7,17 +7,18 @@ extra_started_commands="reload reopen" : ${ULOGD_BINARY:=/usr/sbin/ulogd} : ${ULOGD_PIDFILE:=/run/${SVCNAME}.pid} +: ${ULOGD_WAIT:=200} : ${ULOGD_OPTS:=--daemon --uid ulogd --pidfile ${ULOGD_PIDFILE}} depend() { - before iptables ip6tables ebtables firewall + before iptables ip6tables ebtables nftables firewall after mysql postgresql } start() { ebegin "Starting ${SVCNAME}" start-stop-daemon --start \ - --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} \ + --exec ${ULOGD_BINARY} --pidfile ${ULOGD_PIDFILE} --wait ${ULOGD_WAIT} \ -- ${ULOGD_OPTS} eend $? } diff --git a/app-admin/ulogd/files/ulogd.service b/app-admin/ulogd/files/ulogd.service deleted file mode 100644 index ec22db0ad663..000000000000 --- a/app-admin/ulogd/files/ulogd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=A userspace logging daemon for netfilter/iptables related logging -Before=iptables.service ip6tables.service -After=mysql.service postgresql.service - -[Service] -Type=forking -PIDFile=/run/ulogd.pid -ExecStart=/usr/sbin/ulogd --daemon --uid ulogd --pidfile /run/ulogd.pid -ExecReload=/bin/kill -USR1 $MAINPID - -[Install] -WantedBy=network.target diff --git a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild index a49fa0235214..71cf91e2eaab 100644 --- a/app-admin/ulogd/ulogd-2.0.4-r1.ebuild +++ b/app-admin/ulogd/ulogd-2.0.5-r3.ebuild @@ -2,11 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 AUTOTOOLS_AUTORECONF=1 AUTOTOOLS_IN_SOURCE_BUILD=1 -inherit autotools-utils eutils linux-info readme.gentoo systemd user + +inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo systemd user DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging" HOMEPAGE="http://netfilter.org/projects/ulogd/index.html" @@ -15,10 +16,11 @@ SRC_URI="ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ia64 ppc x86" -IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite" +KEYWORDS="~amd64 ~ia64 ~ppc ~x86" +IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog" -RDEPEND="net-firewall/iptables +RDEPEND=" + || ( net-firewall/iptables net-firewall/nftables ) >=net-libs/libnfnetlink-1.0.1 dbi? ( dev-db/libdbi ) json? ( dev-libs/jansson ) @@ -31,20 +33,23 @@ RDEPEND="net-firewall/iptables mysql? ( virtual/mysql ) pcap? ( net-libs/libpcap ) postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 )" - + sqlite? ( dev-db/sqlite:3 ) +" DEPEND="${RDEPEND} doc? ( app-text/linuxdoc-tools app-text/texlive-core virtual/latex-base - )" + ) +" -PATCHES=( "${FILESDIR}/${P}-linux-headers-3.17-ipt_ulog.patch" ) +PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" ) DOCS=( AUTHORS README TODO ) -DOC_CONTENTS="You must have at least one logging stack enabled to make ulogd work. -Please edit example configuration located at /etc/ulogd.conf" +DOC_CONTENTS=" + You must have at least one logging stack enabled to make ulogd work. + Please edit example configuration located at /etc/ulogd.conf +" pkg_setup() { enewgroup ulogd @@ -53,21 +58,19 @@ pkg_setup() { linux-info_pkg_setup if kernel_is lt 2 6 14; then - die "ulogd2 requires kernel newer than 2.6.14" + die "ulogd requires kernel newer than 2.6.14" fi if kernel_is lt 2 6 18; then - ewarn ewarn "You are using kernel older than 2.6.18" - ewarn "Some ulogd2 features may be unavailable" - ewarn + ewarn "Some ulogd features may be unavailable" fi if use nfacct && kernel_is lt 3 3 0; then ewarn "NFACCT input plugin requires kernel newer than 3.3.0" fi - if ! use nfacct && ! use nfct && ! use nflog && kernel_is gt 3 17 0; then + if use ulog && kernel_is gt 3 17 0; then ewarn "ULOG target was removed since 3.17.0 kernel release" ewarn "Consider enabling NFACCT, NFCT or NFLOG support" fi @@ -81,6 +84,7 @@ src_prepare() { -e 's:tmp:run:g' \ ulogd.conf.in || die 'sed on ulogd.conf.in failed' + append-lfs-flags autotools-utils_src_prepare } @@ -95,6 +99,7 @@ src_configure() { $(use_with pcap) $(use_with postgres pgsql) $(use_with sqlite) + $(use_enable ulog) ) autotools-utils_src_configure } @@ -103,7 +108,7 @@ src_compile() { autotools-utils_src_compile if use doc; then - # prevent access violations from generation of bitmap font files + # Prevent access violations from bitmap font files generation export VARTEXFONTS="${T}"/fonts emake -C doc fi @@ -129,8 +134,8 @@ src_install() { fowners root:ulogd /etc/ulogd.conf fperms 640 /etc/ulogd.conf - newinitd "${FILESDIR}/${PN}.init" ${PN} - systemd_dounit "${FILESDIR}/${PN}.service" + newinitd "${FILESDIR}/${PN}.init-r2" ${PN} + systemd_newunit "${FILESDIR}/${PN}.service-r1" ${PN}.service insinto /etc/logrotate.d newins "${FILESDIR}/${PN}.logrotate" ${PN} diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest index 86315bfe9b58..4930f6b8399d 100644 --- a/app-arch/unrar/Manifest +++ b/app-arch/unrar/Manifest @@ -2,3 +2,4 @@ DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aa DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379 DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf DIST unrarsrc-5.3.6.tar.gz 223184 SHA256 b917f2c5258ff2012008f9aa46984ad22dce21702eb264623b256bb8c2577c1b SHA512 b596f69a7d1b5f6a1e3dc0f060018589dc415463c2a9f403a365e10f8e362c09de4d295df04939f2a33c8daf88de7fbe32395043b978636ea7eaa1c1d2ad80fc WHIRLPOOL 6016b9ead3c2ef573e28ff05809c56e8037c23c01ee05fca0ef46eccbcc7e673b5fa57a0a6839ac2670cce928234c290e82a21a83471818e9a56eeff7984fb3e +DIST unrarsrc-5.3.7.tar.gz 223455 SHA256 10b49c416df3ef38ad1d289b06d642c76f7cc44902adfc5bbed76096ef70d154 SHA512 ca07935e1febc471d770a992a50bdd2b3fa60f70b4a97a8b76e3eef6038644a2dcfa9726c2d630a35704762a5d69496ac00a700018831779ec1e4fc08b90919e WHIRLPOOL 3aee2f87bb7f09a78cbb45b86fb83565207dd72760ecbea6e2279f42f6b486651bd36bd972b032a75f49ae164ea698703914bd4e6bfb78d07cd1adbe6ac10ef6 diff --git a/app-arch/unrar/unrar-5.3.7.ebuild b/app-arch/unrar/unrar-5.3.7.ebuild new file mode 100644 index 000000000000..71373bb52655 --- /dev/null +++ b/app-arch/unrar/unrar-5.3.7.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic multilib toolchain-funcs + +MY_PN=${PN}src + +DESCRIPTION="Uncompress rar files" +HOMEPAGE="http://www.rarlab.com/rar_add.htm" +SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz" + +LICENSE="unRAR" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="" + +RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" + +S=${WORKDIR}/unrar + +src_prepare() { + epatch "${FILESDIR}"/${PN}-5.0.2-build.patch + epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218 + local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" ) + if [[ ${CHOST} == *-darwin* ]] ; then + sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" ) + else + sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" ) + fi + sed -i "${sed_args[@]}" makefile || die +} + +src_configure() { + mkdir -p build-{lib,bin} + printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die + cp build-{lib,bin}/Makefile || die +} + +src_compile() { + unrar_make() { + emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@" + } + + unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die + ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die + + unrar_make -C build-bin +} + +src_install() { + dobin build-bin/unrar + dodoc readme.txt + + dolib.so build-lib/libunrar* + + insinto /usr/include/libunrar${PV%.*.*} + doins *.hpp + dosym libunrar${PV%.*.*} /usr/include/libunrar +} diff --git a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild index f89fd2fd7140..0cee0eb9e7bb 100644 --- a/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild +++ b/app-emacs/ocaml-mode/ocaml-mode-4.00.1.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://caml.inria.fr/distrib/${MY_P%.*}/${MY_P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" S="${WORKDIR}/${MY_P}/emacs" SITEFILE="50${PN}-gentoo-3.12.1.el" diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest index 7e72ff8d46ef..8f804945e362 100644 --- a/app-text/pdfgrep/Manifest +++ b/app-text/pdfgrep/Manifest @@ -1,3 +1,2 @@ -DIST pdfgrep-1.3.1.tar.gz 111653 SHA256 6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437 SHA512 7a13016a8cf4f8a7387940d7e3862a1fb83f3aa6240084f835e92e958836dff0788db2ae39f35db25d679a2857ddf0b9bcbd7b1aacb10c2a16c3165d56f4efcf WHIRLPOOL 94b69bd0e16d4f0b1b389b09c2330516f25cc772be58e7ad49a2cf1ac0633539bb16a5df595052f468ab89d38ebeeb26b7f2be866555756f423febbf0a600b4b DIST pdfgrep-1.3.2.tar.gz 114754 SHA256 386b167434443dd299d389a0ef292d708123255cbab0e179e11b65ba51d9b386 SHA512 dd5d26999405e1e84f5639ea48e15d2aab951a766f828e8e7b45409a7e027a5312757ac64952da56b8a37cf0cd0bc6f43cd16d78600dcc6c8fcb4deabecf0a5b WHIRLPOOL d2ca79e647a21767e0296d72dcdb511157352adf1f1d60beec9d15eb46554f3ec6d9c11f1dfda8988d4f6dcf4a814c52a8ffc28f72c2f227e01430354a8b99f9 DIST pdfgrep-1.4.1.tar.gz 151926 SHA256 db04a210e6bb7b77cd6c54b17f0f6fed0d123a85f97a541b270736a5d3840f2c SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735 WHIRLPOOL f08308a13b0b577215521b116db7b4c787b34993665031a690308e45333f35e86419928310b303060cda40aaf4ed5d474400bcee0e29106c9f8c8935d779687e diff --git a/app-text/pdfgrep/pdfgrep-1.3.1.ebuild b/app-text/pdfgrep/pdfgrep-1.3.1.ebuild deleted file mode 100644 index a45031e5aaab..000000000000 --- a/app-text/pdfgrep/pdfgrep-1.3.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -DESCRIPTION="A tool similar to grep which searches text in PDFs" -HOMEPAGE="http://pdfgrep.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 x86" -IUSE="unac" - -RDEPEND=" - app-text/poppler:=[cxx] - unac? ( app-text/unac )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf $(use_with unac) -} diff --git a/dev-java/byaccj/byaccj-1.15-r1.ebuild b/dev-java/byaccj/byaccj-1.15-r1.ebuild index d2477b29c143..76cdf988d153 100644 --- a/dev-java/byaccj/byaccj-1.15-r1.ebuild +++ b/dev-java/byaccj/byaccj-1.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="" S="${WORKDIR}/${PN}${PV}" diff --git a/dev-java/javacup/Manifest b/dev-java/javacup/Manifest index 5d18634502db..314e6743e9f4 100644 --- a/dev-java/javacup/Manifest +++ b/dev-java/javacup/Manifest @@ -1,2 +1,3 @@ DIST java-cup-src-11b-20150326.tar.gz 376913 SHA256 3df107f48b9726d1bf6c4061f6a1304b125aa766da211cd17ff85a2d56339825 SHA512 020beda9f019e03b1d35a20b7c10f4d43d5d39e46f3beb0a993fe6471f4c1369440d76b4f88a6161f8169406760720c7811c07396ca0ad7eab5ee9e4b091b733 WHIRLPOOL 54e2b7d53918c0e053c690c0db14e5ab2ddc2454c64f7a531690b9e4fe37e76aee1e9bb3711cc515423cf2d288ca7054a903d331619b1dd0a28f62121555e004 +DIST java-cup-src-11b-20151001.tar.gz 313405 SHA256 959189360a8530c9e06cbf8cb99795bb4fcc25a00d774e961c98611c769b8f33 SHA512 70bb6a0e13fe52694980040205fcf5b3e904c4a07e50c7740c55cc3bb481496c5c071377757b94f59807b936b8c4fdde5423d78cc2d12a7ada1870f71cd9f47e WHIRLPOOL cba8a784f156b21ae2a40afe02112b5bded04176bd54b3190f1d210e5603334553f170b02f91f970ade3f68d8d00715f1237dd43476712f4e24c5d0857bf6304 DIST javacup-0.11a_beta20060608.tar.bz2 285727 SHA256 cb3ad4951d734bd1e5a6ff835018dea26a47564f820ae0a925f9c30f2fb7e1ff SHA512 383172f7d9cb127ad5d1d6de561eaf53b057bf7511f6f8c353fc03860daabb023e11330e0518b9c390e255a643c9c1e609b5fbdfd3c2e92dd68dc2d2354a931f WHIRLPOOL 6480219de3a997eb9a942ce816f9868dc13d06b8c0553521e9cf37fe568265cf752efcd36d9b64ea424d225d4823fce0652c9b0d7e1c853e38cd9f00fb12ce30 diff --git a/dev-java/javacup/javacup-0.11b_p20151001.ebuild b/dev-java/javacup/javacup-0.11b_p20151001.ebuild new file mode 100644 index 000000000000..ad8742f2b4c4 --- /dev/null +++ b/dev-java/javacup/javacup-0.11b_p20151001.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_PV=${PV/_beta/-} +MY_PV=${MY_PV/_p/-} +MY_PV=${MY_PV#0.} +MY_P=java-cup-${MY_PV%-*} + +DESCRIPTION="CUP Parser Generator for Java" +HOMEPAGE="http://www2.cs.tum.edu/projects/cup/" +SRC_URI="http://www2.cs.tum.edu/projects/cup/releases/java-cup-src-${MY_PV}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +DEPEND=">=virtual/jdk-1.7 + >=dev-java/ant-core-1.7.0:0 + >=dev-java/jflex-1.6.1:0" + +RDEPEND=">=virtual/jre-1.7" + +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_CLASSPATH_TAGS+=" taskdef" + +S="${WORKDIR}" + +java_prepare() { + # Bizarrely, you can't build from the tarball without this patch. + epatch "${FILESDIR}"/${PN}-0.11b_beta20150326-build-xml-svn.patch + + # The JFlex package name has changed to lower case. + sed -i "s/JFlex\./jflex./g" build.xml || die + + # Remove the bundled JFlex. + rm -v bin/JFlex.jar || die +} + +src_configure() { + EANT_GENTOO_CLASSPATH_EXTRA=$(java-pkg_getjars --build-only ant-core,jflex) + java-ant-2_src_configure +} + +src_compile() { + einfo "Bootstrapping with bundled javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/bin/${MY_P:0:-1}.jar" eant + + # Clean everything except the new jar. + rm -rv java/ classes/ || die + + einfo "Recompiling with newly built javacup ..." + EANT_GENTOO_CLASSPATH_EXTRA+=":${S}/dist/${MY_P}.jar" eant + + use doc && ejavadoc -sourcepath src/ -d javadoc java_cup +} + +src_install() { + java-pkg_newjar dist/${MY_P}.jar + java-pkg_newjar dist/${MY_P}-runtime.jar ${PN}-runtime.jar + java-pkg_dolauncher ${PN} --jar ${PN}.jar + java-pkg_register-ant-task + + dodoc changelog.txt + docinto html + dodoc manual.html + + use source && java-pkg_dosrc java/* + use doc && java-pkg_dojavadoc javadoc +} diff --git a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild index 90a19b0bfbe7..aadbcad020b5 100644 --- a/dev-java/jaxr/jaxr-1.0.6-r1.ebuild +++ b/dev-java/jaxr/jaxr-1.0.6-r2.ebuild @@ -16,18 +16,23 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="" -CDEPEND="dev-java/jaxb:2 - dev-java/jsr173:0 +CDEPEND=" + dev-java/jaxb:2 dev-java/jsr67:0 dev-java/jsr93:0 - dev-java/sun-jaf:0" -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" + dev-java/jsr173:0" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" S="${WORKDIR}/${PN}-ri" +JAVA_ANT_REWRITE_CLASSPATH="yes" EANT_BUILD_TARGET="compile" EANT_DOC_TARGET="javadoc-build" @@ -36,7 +41,6 @@ EANT_GENTOO_CLASSPATH=" jsr67 jsr173 jsr93 - sun-jaf " java_prepare() { @@ -45,8 +49,7 @@ java_prepare() { java-pkg_jar-from --into lib jaxb-2 java-pkg_jar-from --into lib jsr67 jsr67.jar saaj-api.jar java-pkg_jar-from --into lib jsr173 jsr173.jar jsr173_1.0_api.jar - java-pkg_jar-from --into lib jsr93 jsr93-api.jar jaxr-api.jar - java-pkg_jar-from --into lib sun-jaf + java-pkg_jar-from --into lib jsr93 epatch "${FILESDIR}/${P}-javadoc.patch" diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest index 5a41a586d2dd..b4c0417d84c3 100644 --- a/dev-java/jflex/Manifest +++ b/dev-java/jflex/Manifest @@ -1 +1,2 @@ DIST jflex-1.6.0.tar.gz 3035885 SHA256 0774da0ee2d01fc9274179de4243e0d229c01b5cf0fbb78952fb7fdc4672190c SHA512 16ce4a89f75ce5f3da02433ff66d39ed4db567b4cf7469997dd2617b82e52d589bb17ec3a2f36b4d00a62233e48820bc2e043dcc9ae3c01f1eeca323c0166eba WHIRLPOOL 4d9e7e8c3a0da66d860b895699d5b50e29f781f1cf18cab436f545b1fb007297ca9433694ce3808452c5d9340eddc978c2b32019b5a8d5d8c6cb0558543ea18e +DIST jflex-1.6.1.tar.gz 3027791 SHA256 9879fb4ea7b286af3c3439cf148f5739dfa722edbd978f2f798268b2e016f8c0 SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b WHIRLPOOL 27e2769b1b1dc720cee71718eca024905fd9e200c53771c2db293471b0190d9a3c9d2245fbbc5ab76a1f22e1496053d35d625a34c09819b1e367f78840152666 diff --git a/dev-java/jflex/files/icedtea-arm.patch b/dev-java/jflex/files/icedtea-arm.patch new file mode 100644 index 000000000000..acefd9b553e2 --- /dev/null +++ b/dev-java/jflex/files/icedtea-arm.patch @@ -0,0 +1,18 @@ +http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678 + +diff -Naur jflex-1.6.1.orig/src/main/java/jflex/Emitter.java jflex-1.6.1/src/main/java/jflex/Emitter.java +--- jflex-1.6.1.orig/src/main/java/jflex/Emitter.java 2015-03-16 17:27:31.000000000 +0000 ++++ jflex-1.6.1/src/main/java/jflex/Emitter.java 2015-10-25 23:33:35.784487747 +0000 +@@ -1304,8 +1304,10 @@ + + for (int i = 0; i < dfa.numStates; i++) { + char j = 0; +- while ( !isTransition[i] && j < dfa.numInput ) +- isTransition[i] = dfa.table[i][j++] != DFA.NO_TARGET; ++ while ( !isTransition[i] && j < dfa.numInput ) { ++ isTransition[i] = dfa.table[i][j] != DFA.NO_TARGET; ++ j++; ++ } + } + } + diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild new file mode 100644 index 000000000000..50f314d50813 --- /dev/null +++ b/dev-java/jflex/jflex-1.6.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit eutils java-pkg-2 java-pkg-simple + +DESCRIPTION="JFlex is a lexical analyzer generator for Java" +HOMEPAGE="http://www.jflex.de/" +SRC_URI="http://${PN}.de/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" +IUSE="examples test vim-syntax" + +CDEPEND="dev-java/ant-core:0" + +RDEPEND=">=virtual/jre-1.6 + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.6 + test? ( dev-java/junit:4 ) + ${CDEPEND}" + +PDEPEND=">=dev-java/javacup-0.11b_p20151001:0" + +S="${WORKDIR}/${P}" +JAVA_SRC_DIR="src/main/java" + +java_prepare() { + # See below for details. + epatch "${FILESDIR}/icedtea-arm.patch" + + # We need the bundled jflex.jar. + rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die + + # Remove the bundled java-cup.jar if unneeded. + if has_version ${PDEPEND}; then + rm -v lib/java-cup-*.jar || die + fi +} + +src_configure() { + # javacup is a cyclic dependency. Use the package if we have it, + # otherwise use the bundled version and install the package later. + if has_version ${PDEPEND}; then + # Use PORTAGE_QUIET to suppress a QA warning that is spurious + # thanks to has_version above. This is Portage-specific but + # showing the warning elsewhere isn't the end of the world. + JAVACUP=$(PORTAGE_QUIET=1 java-pkg_getjar --build-only javacup javacup.jar) + else + JAVACUP=$(echo lib/java-cup-*.jar) + fi + + JAVA_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --build-only ant-core):${JAVACUP}" +} + +jflex_compile() { + java "${@}" jflex.Main -d ${JAVA_SRC_DIR}/${PN} --skel src/main/${PN}/skeleton.nested src/main/${PN}/LexScan.flex || die + java-pkg-simple_src_compile + java-pkg_addres ${PN}.jar src/main/resources +} + +src_compile() { + java -jar "${JAVACUP}" -destdir ${JAVA_SRC_DIR}/${PN} -package ${PN} -parser LexParse -interface src/main/cup/LexParse.cup || die + + # The IcedTea ARM HotSpot port (as of 2.6.1) hangs when running + # jflex. We have patched jflex to fix it but we have to run the + # bundled version first. -Xint works around the problem. See + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2678. + use arm && local JFLEX_ARGS="-Xint" + + # First compile (without doc/source) using the bundled jflex. + JAVA_PKG_IUSE= jflex_compile -cp "lib/${P}.jar:${JAVACUP}" ${JFLEX_ARGS} + + # Then recompile using the fresh jflex. + jflex_compile -cp "${PN}.jar:${JAVACUP}" +} + +src_install() { + java-pkg-simple_src_install + java-pkg_dolauncher ${PN} --main ${PN}.Main + + java-pkg_register-dependency javacup javacup-runtime.jar + java-pkg_register-ant-task + + use examples && java-pkg_doexamples examples + dodoc {changelog,README}.md + + if use doc; then + dodoc doc/*.pdf + docinto html + dodoc doc/*.{css,html,png} doc/COPYRIGHT + fi + + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins lib/${PN}.vim + fi +} + +src_test() { + if use arm && java-pkg_current-vm-matches oracle-jdk-bin-1.8; then + # This results in a StackOverflowError as of 1.8.0.65 but works + # fine on icedtea:7. Don't know about icedtea:8 yet. + rm -v src/test/java/jflex/EmitterTest.java || die + fi + + local CP="src/test/java:${PN}.jar:${JAVA_GENTOO_CLASSPATH_EXTRA}:$(java-pkg_getjars junit-4)" + + local TESTS=$(find src/test/java -name "*Test*.java" -printf "%P\n") + TESTS="${TESTS//.java}" + TESTS="${TESTS//\//.}" + + ejavac -classpath "${CP}" $(find src/test/java -name "*.java") + ejunit4 -classpath "${CP}" ${TESTS} +} diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild index e3e6ff3a66dc..242b92132677 100644 --- a/dev-java/jmock/jmock-1.2.0-r1.ebuild +++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://www.jmock.org/" LICENSE="BSD" SLOT="1.0" -KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" CDEPEND="dev-java/junit:0" diff --git a/dev-java/jsr93/Manifest b/dev-java/jsr93/Manifest index d80c1e6d0077..99566e729fc2 100644 --- a/dev-java/jsr93/Manifest +++ b/dev-java/jsr93/Manifest @@ -1,2 +1 @@ -DIST jaxr-1_0-fr-spec.zip 1443243 SHA256 b90e753fa51c6b0ac4cbcffafe73bcdc6a139804fe562916d3604d49e5fe3c58 SHA512 a60f2da27defd5ddecfabf1fb00464c111b4e8264d3bd26f91b9c1195022eecf7e8aeaa904aa8f7cb6f0aa35a713b45d2b7e5fdaa474c2e29341ad64c04ed5e2 WHIRLPOOL 9460536353e73f88298de207e4bba3f13d88a63714ac34be397c60f8973667cd8b68626a987bb35e7594be0ea10d643e438e5aec37bea8624b6e96c340f0fe5a DIST jaxr-api-1.0-sources.jar 45175 SHA256 c3ab05d8218c623746d21d291df8f4dbe5ef6db6ee0c062fb2cfba059d048ccf SHA512 efba6dd09cb9ff796019c6b750f44a5858cbde34b4fb93e74f3bed43178122a8591b1ae75996ed645ecde02862142b3d9f229cdc8059f9e5e95fedbdabae0d44 WHIRLPOOL 66e3185f253dc9a4c2bc86370f06351effd3c6df026845176253f9ffd3fd0ced06cc4c84e05151fd3f18da9cb2ef2a1723279b5af9f147ae2fa24bd2142c54b2 diff --git a/dev-java/jsr93/files/build.xml-1.0 b/dev-java/jsr93/files/build.xml-1.0 deleted file mode 100644 index a0c9ed7a88e6..000000000000 --- a/dev-java/jsr93/files/build.xml-1.0 +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<project name="jsr93-api" default="jar" basedir="."> - <target name="compile"> - <mkdir dir="build"/> - <javac debug="false" srcdir="src" destdir="build" encoding="UTF-8"> - <classpath> - <pathelement path="${classpath}"/> - <fileset dir="lib/" includes="**/*.jar"/> - </classpath> - </javac> - </target> - <target name="jar" depends="compile"> - <jar destfile="jsr93-api.jar"> - <fileset dir="build" includes="**/*.class"/> - </jar> - </target> -</project> diff --git a/dev-java/jsr93/jsr93-1.0-r1.ebuild b/dev-java/jsr93/jsr93-1.0-r1.ebuild deleted file mode 100644 index eb0143a23f64..000000000000 --- a/dev-java/jsr93/jsr93-1.0-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API for XML Registries (JAXR) - API" -HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/" -SRC_URI="jaxr-1_0-fr-spec.zip" - -LICENSE="sun-jsr93" -RESTRICT="fetch" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" - -CDEPEND="dev-java/sun-jaf:0" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${CDEPEND}" - -S="${WORKDIR}" - -JAVA_ANT_ENCODING="ISO-8859-1" - -pkg_nofetch() { - - einfo "Please go to" - einfo " ${HOMEPAGE}" - einfo "and download file:" - einfo ' "Java API for XML Registries Specification 1.0"' - einfo "Place the file ${SRC_URI} in:" - einfo " ${DISTDIR}" - -} - -java_prepare() { - cd "${WORKDIR}" || die "can't cd in ${WORKDIR}" - mkdir src || die - unzip -qq jaxr-apisrc.jar -d src || die "unzip failed" - rm -v *.jar || die - mkdir lib || die - cd lib || die "can't cd in ${WORKDIR}/lib" - - java-pkg_jar-from sun-jaf - - cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die -} - -src_install() { - java-pkg_dojar "jsr93-api.jar" - - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/jsr93/jsr93-1.0-r2.ebuild b/dev-java/jsr93/jsr93-1.0-r2.ebuild index 84d164373a8f..403064445b3e 100644 --- a/dev-java/jsr93/jsr93-1.0-r2.ebuild +++ b/dev-java/jsr93/jsr93-1.0-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://jcp.org/ja/jsr/detail?id=93" SRC_URI="http://repo1.maven.org/maven2/org/apache/ws/scout/${MY_PN}/${PV}/${MY_P}-sources.jar" LICENSE="sun-jsr93" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" RDEPEND=">=virtual/jre-1.6" DEPEND=">=virtual/jdk-1.6" diff --git a/dev-java/jsr93/jsr93-1.0.ebuild b/dev-java/jsr93/jsr93-1.0.ebuild deleted file mode 100644 index bf773602756f..000000000000 --- a/dev-java/jsr93/jsr93-1.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Java API for XML Registries (JAXR) - API" -HOMEPAGE="http://download.oracle.com/otndocs/jcp/jaxr-1.0-fr-oth-JSpec/" -SRC_URI="jaxr-1_0-fr-spec.zip" - -LICENSE="sun-jsr93" -RESTRICT="fetch" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -IUSE="" - -COMMON_DEP="dev-java/sun-jaf" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEP}" - -S="${WORKDIR}" - -pkg_nofetch() { - - einfo "Please go to" - einfo " ${HOMEPAGE}" - einfo "and download file:" - einfo ' "Java API for XML Registries Specification 1.0"' - einfo "Place the file ${SRC_URI} in:" - einfo " ${DISTDIR}" - -} - -src_unpack() { - - unpack ${A} - - cd "${WORKDIR}" - mkdir src || die - unzip -qq jaxr-apisrc.jar -d src || die "unzip failed" - rm -v *.jar || die - mkdir lib || die - - cd lib - java-pkg_jar-from sun-jaf - - cp "${FILESDIR}/build.xml-${PV}" "${S}/build.xml" || die - -} - -src_install() { - - java-pkg_dojar "jsr93-api.jar" - - use source && java-pkg_dosrc src/* - -} diff --git a/dev-java/qdox/files/jflex-1.6.1.patch b/dev-java/qdox/files/jflex-1.6.1.patch new file mode 100644 index 000000000000..4e506246f2a2 --- /dev/null +++ b/dev-java/qdox/files/jflex-1.6.1.patch @@ -0,0 +1,27 @@ +https://github.com/jflex-de/jflex/commit/f312d563777d907bbb12d1e2ac79835ba83ca53c + +--- a/src/grammar/skeleton.inner 2012-11-04 16:16:30.000000000 +0000 ++++ b/src/grammar/skeleton.inner 2015-11-02 20:57:37.566057363 +0000 +@@ -407,15 +407,15 @@ + zzMarkedPos = zzMarkedPosL; + --- char count update + +---- actions +- default: +- if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { +- zzAtEOF = true; ++ if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { ++ zzAtEOF = true; + --- eofvalue +- } +- else { ++ } ++ else { ++--- actions ++ default: + --- no match +- } ++ } + } + } + } diff --git a/dev-java/qdox/qdox-1.12-r2.ebuild b/dev-java/qdox/qdox-1.12-r2.ebuild deleted file mode 100644 index 140ace0c440d..000000000000 --- a/dev-java/qdox/qdox-1.12-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Parser for extracting class/interface/method definitions" -HOMEPAGE="https://github.com/codehaus/qdox" -SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz " - -LICENSE="Apache-2.0" -SLOT="1.12" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" - -S="${WORKDIR}/${P}-SNAPSHOT" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip:0 - dev-java/byaccj:0 - dev-java/jflex:0 - dev-java/jmock:1.0 - test? ( dev-java/junit:0 ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -java_prepare() { - if ! use test ; then - rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java - rm -rf src/java/com/thoughtworks/qdox/junit - rm -rf src/test - fi -} - -src_compile() { - jflex \ - src/grammar/lexer.flex \ - --skel src/grammar/skeleton.inner \ - -d src/java/com/thoughtworks/qdox/parser/impl/ || die - byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die - mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die - - # create jar - mkdir -p build/classes || die - - local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)" - - if use test ; then - cp="${cp}:$(java-pkg_getjars --build-only junit)" - fi - - ejavac -sourcepath . -d build/classes -classpath "${cp}" \ - $(find . -name "*.java") || die "Cannot compile sources" - - mkdir dist || die - cd build/classes || die - jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR" - - # generate javadoc - if use doc ; then - cd "${S}" - mkdir javadoc || die - javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}" - fi -} - -src_test() { - java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \ - com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!" -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - java-pkg_register-ant-task - - use source && java-pkg_dosrc src/java/com - use doc && java-pkg_dojavadoc javadoc -} diff --git a/dev-java/qdox/qdox-1.12.1.ebuild b/dev-java/qdox/qdox-1.12.1-r1.ebuild index 7f99e232abf6..9082187a46ff 100644 --- a/dev-java/qdox/qdox-1.12.1.ebuild +++ b/dev-java/qdox/qdox-1.12.1-r1.ebuild @@ -6,7 +6,7 @@ EAPI="5" JAVA_PKG_IUSE="doc source test" -inherit java-pkg-2 java-ant-2 +inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="Parser for extracting class/interface/method definitions" HOMEPAGE="https://github.com/codehaus/qdox" @@ -14,7 +14,7 @@ SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="1.12" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" S="${WORKDIR}/${PN}-${PN}-${PV}" @@ -23,7 +23,7 @@ CDEPEND="dev-java/ant-core:0" DEPEND=">=virtual/jdk-1.4 app-arch/unzip:0 dev-java/byaccj:0 - >=dev-java/jflex-1.4.3:0 + >=dev-java/jflex-1.6.1:0 dev-java/jmock:1.0 test? ( dev-java/junit:0 ) ${CDEPEND}" @@ -32,6 +32,8 @@ RDEPEND=">=virtual/jre-1.4 ${CDEPEND}" java_prepare() { + epatch "${FILESDIR}"/jflex-1.6.1.patch + if ! use test ; then rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java rm -rf src/java/com/thoughtworks/qdox/junit diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest deleted file mode 100644 index b3039a951a40..000000000000 --- a/dev-java/xmlc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xmlc-src-2.3.1.zip 8147268 SHA256 b95b422fc143c8bd2d61706d70ab4985431d5155b88df528951fc6f0c76b1b04 SHA512 377ec4d57373038e550b2f1902b019e413aeddc8b80f297898156a17c1fa437948b1e1f9302ca82f6b46fc8114a96f32bef9d27f68662fcf4fae1e7c3a52c16a WHIRLPOOL 819526aca87805a545237720b39fadbf3cb9f19bfab5acd38a24a084a0406ac7ece1b0d83b76cbe9fbd18286b45e846832afe58dfbc52cc6fb3c8d6c315d461e diff --git a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch b/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch deleted file mode 100644 index 58c3db7f62ae..000000000000 --- a/dev-java/xmlc/files/xmlc-2.3.1-build.xml.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -Nur xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties ---- xmlc-src-2.3.1/xmlc/modules/taskdef/build-default.properties 2007-04-22 00:40:58.000000000 +0300 -+++ xmlc-src-2.3.1_patched/xmlc/modules/taskdef/build-default.properties 2009-01-31 20:00:27.000000000 +0200 -@@ -37,7 +37,7 @@ - # Comma seperated list of libraries (or more exactly, include patterns) this
- # module depends on for building.
- # They are searched relative to ${lib.dir}
--module.depends=xmlc.jar
-+module.depends=xmlc.jar,ant.jar
-
- # Javadoc settings
- javadoc.packages=org.enhydra.*
-diff -Nur xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml ---- xmlc-src-2.3.1/xmlc/modules/xmlc/build.xml 2007-11-04 01:07:36.000000000 +0200 -+++ xmlc-src-2.3.1_patched/xmlc/modules/xmlc/build.xml 2009-01-31 20:13:12.000000000 +0200 -@@ -148,15 +148,12 @@ - description="Build the module .jar file">
- <tstamp/>
- <delete file="${module.jar}"/>
-- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar.jar"/>
-- <jarjar jarfile="${module.jar}"><!-- index="true"-->
-+ <jar jarfile="${module.jar}"><!-- index="true"-->
- <fileset file="${dist.root}/../LICENSE-xmlc"/>
- <fileset dir="${build.classes}" />
- <fileset dir="${src.dir}"
- includes="${module.lib.extra.includes}"
- excludes="${module.lib.extra.excludes}" />
-- <zipfileset src="${build.lib.dir}/asm.jar"/>
-- <rule pattern="org.objectweb.asm.**" result="org.enhydra.xml.xmlc.deferredparsing.asm.@1"/>
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
- <attribute name="Built-On" value="${TODAY}"/>
-@@ -171,18 +168,13 @@ - <attribute name="Implementation-Vendor" value="OW2 Consortium"/>
- <attribute name="Implementation-Vendor-Id" value="org.ow2"/>
- <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
-- </section>
-- <section name="org/enhydra/xml/xmlc/deferredparsing/asm/">
-- <attribute name="Implementation-Title" value="ASM"/>
-- <attribute name="Implementation-Version" value="3.1"/>
-- <attribute name="Implementation-Vendor" value="France Telecom R&D"/>
-- </section>
-+ </section>
- </manifest>
- <!--indexjars>
- <fileset dir="${dist.root}/lib" includes="*.jar"/>
- <fileset dir="${dist.root}/build-lib" includes="*.jar"/>
- </indexjars-->
-- </jarjar>
-+ </jar>
- </target>
-
- <target name="lib-tests" depends="init,compile-tests" unless="lib-test.skip"
diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml deleted file mode 100644 index 88da3839a529..000000000000 --- a/dev-java/xmlc/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>java</herd> -<longdescription> -Enhydra XMLC is the presentation technology that supports the needs of -designers, developers and architects alike, delivering what JSP cannot - strict -separation of markup and logic in a true object view of dynamic presentations. -</longdescription> -</pkgmetadata> diff --git a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild b/dev-java/xmlc/xmlc-2.3.1-r1.ebuild deleted file mode 100644 index 1d93761ebfc1..000000000000 --- a/dev-java/xmlc/xmlc-2.3.1-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -JAVA_PKG_IUSE="doc" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}-src-${PV}" -DESCRIPTION="Open Source Java/XML Presentation Compiler" -HOMEPAGE="http://xmlc.objectweb.org/" -SRC_URI="http://download.forge.objectweb.org/${PN}/${MY_P}.zip - http://download.us.forge.objectweb.org/${PN}/${MY_P}.zip" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -COMMON_DEP=" - dev-java/ant-core:0 - dev-java/asm:3 - dev-java/gnu-regexp:1 - dev-java/log4j:0 - dev-java/nekohtml:0 - dev-java/xerces:2 - dev-java/xml-commons-external:1.4 - dev-java/xml-commons-resolver:0 - java-virtuals/servlet-api:2.5" -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip - ${COMMON_DEP}" - -S="${WORKDIR}/${MY_P}/" - -java_prepare() { - find -name '*.jar' -exec rm -v {} + || die - - # get rid of jarjar, and add ant.jar to the taskdef module's classpath - epatch "${FILESDIR}/${P}-build.xml.patch" -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" - -EANT_BUILD_TARGET="all-libs" -EANT_GENTOO_CLASSPATH="xerces-2,gnu-regexp-1,log4j,nekohtml,asm-3,xml-commons-external-1.4,xml-commons-resolver,servlet-api-2.5,ant-core" - -src_install() { - # the rest of jars are included in all-runtime - java-pkg_dojar release/lib/{xmlc-all-runtime,xmlc-taskdef}.jar - java-pkg_register-ant-task - - newdoc xmlc/modules/xmlc/README.XMLC README || die - dodoc xmlc/modules/xmlc/ChangeLog || die - dohtml release/release-notes/xmlc-${PV//./-}-release-note.html \ - xmlc/bugs/bugs.html || die - - # move the generated documentation around - if use doc; then - mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die - mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die - mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die - java-pkg_dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation" - fi -} diff --git a/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch new file mode 100644 index 000000000000..5cec4b608286 --- /dev/null +++ b/dev-lang/go/files/go-1.5.1-darwin-sysctl.patch @@ -0,0 +1,11 @@ +--- src/cmd/dist/util.go. ++++ src/cmd/dist/util.go +@@ -404,7 +404,7 @@ + switch gohostos { + case "darwin": + // Even on 64-bit platform, darwin uname -m prints i386. +- if strings.Contains(run("", CheckExit, "sysctl", "machdep.cpu.extfeatures"), "EM64T") { ++ if strings.Contains(run("", CheckExit, "/usr/sbin/sysctl", "machdep.cpu.extfeatures"), "EM64T") { + gohostarch = "amd64" + } + case "solaris": diff --git a/dev-lang/go/go-1.4.2.ebuild b/dev-lang/go/go-1.4.2.ebuild index 8384e081cd1b..ec8f8651c6a0 100644 --- a/dev-lang/go/go-1.4.2.ebuild +++ b/dev-lang/go/go-1.4.2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} = 9999 ]]; then else SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz" # Upstream only supports go on amd64, arm and x86 architectures. - KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos" + KEYWORDS="-* amd64 arm x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris" fi DESCRIPTION="A concurrent garbage collected and typesafe programming language" diff --git a/dev-lang/go/go-1.5.1.ebuild b/dev-lang/go/go-1.5.1.ebuild index 8d4c7158d828..139b35042ebe 100644 --- a/dev-lang/go/go-1.5.1.ebuild +++ b/dev-lang/go/go-1.5.1.ebuild @@ -54,6 +54,7 @@ go_arch() local portage_arch=$(tc-arch $@) case "${portage_arch}" in x86) echo 386;; + x64-*) echo amd64;; *) echo "${portage_arch}";; esac } @@ -112,6 +113,7 @@ src_prepare() sed -i -e 's/"-Werror",//g' src/cmd/dist/build.go || die 'sed failed' fi + epatch "${FILESDIR}"/${P}-darwin-sysctl.patch epatch_user } diff --git a/dev-lang/ocaml/ocaml-4.02.3.ebuild b/dev-lang/ocaml/ocaml-4.02.3.ebuild index 2417bf4cd76f..8583ffe1ece9 100644 --- a/dev-lang/ocaml/ocaml-4.02.3.ebuild +++ b/dev-lang/ocaml/ocaml-4.02.3.ebuild @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="emacs latex ncurses +ocamlopt X xemacs" RDEPEND=" diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index a6664e31fe33..cdef06773900 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -6,4 +6,5 @@ DIST php-5.6.14.tar.bz2 14073920 SHA256 36f295f11641c1839a5df00e693f685fd134c65e DIST php-5.6.15.tar.bz2 14060562 SHA256 11a0645c4d4b749e256da1e0d6df89dd886b5b06b83c914d942653661dbd1c38 SHA512 3841b1b64bbe1b3bdbbbf2591f2ca81754f1e7391dae593f45302ea7a4157dd8032e0f525308a13769938aadbfca9e25cbe15ac9bf8eed1427263fefcbede2aa WHIRLPOOL 6d5a6b860d0db887c09d1bfb8304a39d44f1c5966bab3f881c277e3aa0331cd794f1bff02cbac2bdba23fd9bc4fe71a8e1d4b51cbb4c1dfe1ceadca15ec38665 DIST php-7.0.0RC4.tar.bz2 13973356 SHA256 5475a6856b600a7a4f31a0276339725140d64da31a8a363e0cdb45ed233f27cd SHA512 02a55ce90d66f6ee2019461658eeb7ce7fd2c78c5c32869a3882f0f6fd6a54454b26f3440266ed8e850da740633243f697086a5c0cf0d616f0029e6ba4ddd1bf WHIRLPOOL 7695a9e3b54470c456104e29082479d27c47806e86f739d9d01ffe57580d28b1130d3aaadd3d78f205b457ed4d3207a3ad52a95996cef6b70898ed948b1373a5 DIST php-7.0.0RC5.tar.bz2 13985797 SHA256 90e3f91c6781e6cdd198dd7b3f9bceff0c00be74a56ea0940b4ad9c6b312b4db SHA512 0deceb3bc33bf67076a9613cb150d5b036a4198429c46b49d92a172d0773980bd9df764e89c3f5c53f4e39069376f5cf6bca82b61851e138b30460087003b66b WHIRLPOOL a4228765601c28d88ecb5a298bb24c4b20d9f0559429c415a23dd4cb92847586223b124aecd958de718f6dfe45c314b82b63ed84d9143e94de9f967358be2d15 +DIST php-7.0.0RC6.tar.bz2 13984976 SHA256 d36b768d0ae9cc8b8c7c259949f60edca7946cfb5956d248921cb2100ea81361 SHA512 b5d2ff80c6058391f9d7285d45fdf6911601e89835d4446e851fc6884b5d403ceb453f7d24b1ad1bcaae15317e681b7d149e2c628fddc8248d5bf5965c6c7ef7 WHIRLPOOL 80895829e075106b4098bcac1cb8302c0c80f22b719cebb5922b97d98883f195b6f6212f3a8ace319a18d0e4d397f1160fe73ab2d7883ae55f0a6eb28f55ab55 DIST php-patchset-5.4-r2.tar.bz2 5824 SHA256 4a47f4d31f50a244f85349486cdb3474cf315562e097ed4c116c2b9b5730ecef SHA512 3c2523458a627373da7acb93fb2cd621f50b19fe2ba1d30beb62eeaaa39045262b917cfd0b631046fec9c8027cfa99bd0426a079ab45eb172b21d25d6e085dde WHIRLPOOL fe4f015e2f0dc66cc23ef16fb5bb33117952593ae0770d4bcd37ecc1c431cbcc7874189d265696305c60b4e395e7ce902667e38203db46867304868271affdea diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch new file mode 100644 index 000000000000..29876a9f97f6 --- /dev/null +++ b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch @@ -0,0 +1,59 @@ +From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001 +From: Xinchen Hui <laruence@gmail.com> +Date: Mon, 2 Nov 2015 10:47:02 +0800 +Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when + referencing a non-existent constant) + +--- + NEWS | 2 ++ + Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++ + Zend/zend_compile.c | 2 +- + 3 files changed, 27 insertions(+), 1 deletion(-) + create mode 100644 Zend/tests/bug70828.phpt + +diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt +new file mode 100644 +index 0000000..dd285b5 +--- /dev/null ++++ b/Zend/tests/bug70828.phpt +@@ -0,0 +1,24 @@ ++--TEST-- ++Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant) ++--FILE-- ++<?php ++ ++namespace test { ++ use const nonexistent; ++ ++ class test { ++ static function run(){ ++ var_dump(nonexistent); ++ existent; ++ } ++ } ++} ++ ++namespace { ++ define("test\\existent", "bug!", 1); ++ test\test::run(); ++} ++?> ++--EXPECTF-- ++Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8 ++string(11) "nonexistent" +diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c +index 5ff1b04..fca4e2a 100644 +--- a/Zend/zend_compile.c ++++ b/Zend/zend_compile.c +@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC); + } else { + opline->extended_value = IS_CONSTANT_UNQUALIFIED; +- if (CG(current_namespace)) { ++ if (check_namespace && CG(current_namespace)) { + opline->extended_value |= IS_CONSTANT_IN_NAMESPACE; + opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC); + } else { +-- +2.1.4 + diff --git a/dev-lang/php/php-5.6.15.ebuild b/dev-lang/php/php-5.6.15-r1.ebuild index c6cc5ca0f533..726c56adaee8 100644 --- a/dev-lang/php/php-5.6.15.ebuild +++ b/dev-lang/php/php-5.6.15-r1.ebuild @@ -79,8 +79,23 @@ DEPEND=" >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] >=dev-libs/libpcre-8.32[unicode] apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - <www-servers/apache-2.4[threads=] ) ) - berkdb? ( =sys-libs/db-4* ) + <www-servers/apache-2.4[threads=] ) )" + +# This wacky berkdb dependency really means "any 4.x or 5.x version of +# sys-libs/db". The ./configure flag is called --with-db4, but this is a +# misnomer since db5 also works (bug #521222). We really want to say +# "any 4.x or 5.x slot", but that's not possible. The safest thing to +# do is list all 4.x and 5.x slots in order of preference. +DEPEND="${DEPEND} + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 ) ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( @@ -276,14 +291,6 @@ php_set_ini_dir() { } src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - # Change PHP branding # Get the alpha/beta/rc version sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ @@ -308,6 +315,10 @@ src_prepare() { || die "Failed to fix heimdal crypt library reference" fi + # Fix a const crash in php-fpm, bug #564690. + # Only applies to php-5.6.15 and should be fixed in 5.6.16. + epatch "${FILESDIR}/fix-5.6.15-fpm-const-crash.patch" + #Add user patches #357637 epatch_user diff --git a/dev-lang/php/php-7.0.0_rc6.ebuild b/dev-lang/php/php-7.0.0_rc6.ebuild new file mode 100644 index 000000000000..933cebed567d --- /dev/null +++ b/dev-lang/php/php-7.0.0_rc6.ebuild @@ -0,0 +1,753 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + +function php_get_uri () +{ + case "${1}" in + "php-pre") + echo "http://downloads.php.net/ab/${2}" + ;; + "php") + echo "http://www.php.net/distributions/${2}" + ;; + "olemarkus") + echo "https://dev.gentoo.org/~olemarkus/php/${2}" + ;; + "gentoo") + echo "mirror://gentoo/${2}" + ;; + *) + die "unhandled case in php_get_uri" + ;; + esac +} + +PHP_MV="$(get_major_version)" +SLOT="$(get_version_component_range 1-2)" + +# alias, so we can handle different types of releases (finals, rcs, alphas, +# betas, ...) w/o changing the whole ebuild +PHP_PV="${PV/_rc/RC}" +PHP_PV="${PHP_PV/_alpha/alpha}" +PHP_PV="${PHP_PV/_beta/beta}" +PHP_RELEASE="php" +[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" +[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" +PHP_P="${PN}-${PHP_PV}" + +PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" + +PHP_FPM_CONF_VER="1" + +SRC_URI="${PHP_SRC_URI}" + +DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" +HOMEPAGE="http://php.net/" +LICENSE="PHP-3" + +S="${WORKDIR}/${PHP_P}" + +# We can build the following SAPIs in the given order +SAPIS="embed cli cgi fpm apache2" + +# SAPIs and SAPI-specific USE flags (cli SAPI is default on): +IUSE="${IUSE} + ${SAPIS/cli/+cli} + threads" + +IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk + crypt +ctype curl debug + enchant exif frontbase +fileinfo +filter firebird + flatfile ftp gd gdbm gmp +hash +iconv imap inifile + intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash + mysql mysqli nls + oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm + readline recode selinux +session sharedmem + +simplexml snmp soap sockets spell sqlite ssl + sysvipc systemd tidy +tokenizer truetype unicode vpx wddx + +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" + +DEPEND=" + >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] + >=dev-libs/libpcre-8.32[unicode] + apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] + <www-servers/apache-2.4[threads=] ) )" + +# This wacky berkdb dependency really means "any 4.x or 5.x version of +# sys-libs/db". The ./configure flag is called --with-db4, but this is a +# misnomer since db5 also works (bug #521222). We really want to say +# "any 4.x or 5.x slot", but that's not possible. The safest thing to +# do is list all 4.x and 5.x slots in order of preference. +DEPEND="${DEPEND} + berkdb? ( || ( sys-libs/db:5.3 + sys-libs/db:5.1 + sys-libs/db:4.8 + sys-libs/db:4.7 + sys-libs/db:4.6 + sys-libs/db:4.5 + sys-libs/db:4.4 + sys-libs/db:4.3 + sys-libs/db:4.2 ) ) + bzip2? ( app-arch/bzip2 ) + cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) + cjk? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + crypt? ( >=dev-libs/libmcrypt-2.4 ) + curl? ( >=net-misc/curl-7.10.5 ) + enchant? ( app-text/enchant ) + exif? ( !gd? ( + virtual/jpeg:0 + media-libs/libpng:0= + sys-libs/zlib + ) ) + firebird? ( dev-db/firebird ) + gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + gdbm? ( >=sys-libs/gdbm-1.8.0 ) + gmp? ( dev-libs/gmp:0 ) + iconv? ( virtual/libiconv ) + imap? ( virtual/imap-c-client[ssl=] ) + intl? ( dev-libs/icu:= ) + iodbc? ( dev-db/libiodbc ) + kerberos? ( virtual/krb5 ) + ldap? ( >=net-nds/openldap-1.2.11 ) + ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) + libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + nls? ( sys-devel/gettext ) + oci8-instant-client? ( dev-db/oracle-instantclient-basic ) + odbc? ( >=dev-db/unixODBC-1.8.13 ) + postgres? ( dev-db/postgresql:* ) + qdbm? ( dev-db/qdbm ) + readline? ( sys-libs/readline:0 ) + recode? ( app-text/recode ) + sharedmem? ( dev-libs/mm ) + simplexml? ( >=dev-libs/libxml2-2.6.8 ) + snmp? ( >=net-analyzer/net-snmp-5.2 ) + soap? ( >=dev-libs/libxml2-2.6.8 ) + spell? ( >=app-text/aspell-0.50 ) + sqlite? ( >=dev-db/sqlite-3.7.6.3 ) + ssl? ( dev-libs/openssl:0 ) + tidy? ( app-text/htmltidy ) + truetype? ( + =media-libs/freetype-2* + !gd? ( + virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) + ) + unicode? ( dev-libs/oniguruma ) + vpx? ( media-libs/libvpx ) + wddx? ( >=dev-libs/libxml2-2.6.8 ) + xml? ( >=dev-libs/libxml2-2.6.8 ) + xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) + xmlreader? ( >=dev-libs/libxml2-2.6.8 ) + xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) + xpm? ( + x11-libs/libXpm + virtual/jpeg:0 + media-libs/libpng:0= sys-libs/zlib + ) + xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) + zip? ( sys-libs/zlib ) + zlib? ( sys-libs/zlib ) + virtual/mta +" + +php="=${CATEGORY}/${PF}" + +REQUIRED_USE=" + truetype? ( gd ) + vpx? ( gd ) + cjk? ( gd ) + exif? ( gd ) + + xpm? ( gd ) + gd? ( zlib ) + simplexml? ( xml ) + soap? ( xml ) + wddx? ( xml ) + xmlrpc? ( || ( xml iconv ) ) + xmlreader? ( xml ) + xslt? ( xml ) + ldap-sasl? ( ldap ) + mhash? ( hash ) + phar? ( hash ) + + qdbm? ( !gdbm ) + readline? ( !libedit ) + recode? ( !imap !mysqli ) + sharedmem? ( !threads ) + + mysql? ( || ( mysqli pdo ) ) + + !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" + +RDEPEND="${DEPEND}" + +RDEPEND="${RDEPEND} + fpm? ( + selinux? ( sec-policy/selinux-phpfpm ) + systemd? ( sys-apps/systemd ) )" + +DEPEND="${DEPEND} + sys-devel/flex + >=sys-devel/m4-1.4.3 + >=sys-devel/libtool-1.5.18" + +# Allow users to install production version if they want to + +case "${PHP_INI_VERSION}" in + production|development) + ;; + *) + PHP_INI_VERSION="development" + ;; +esac + +PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" +PHP_INI_FILE="php.ini" + +want_apache + +pkg_setup() { + depend.apache_pkg_setup +} + +php_install_ini() { + local phpsapi="${1}" + + # work out where we are installing the ini file + php_set_ini_dir "${phpsapi}" + + local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" + cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" + + # default to /tmp for save_path, bug #282768 + sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" + + # Set the extension dir + sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" + + # Set the include path to point to where we want to find PEAR packages + sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" + + dodir "${PHP_INI_DIR#${EPREFIX}}" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${phpinisrc}" "${PHP_INI_FILE}" + + elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" + elog + + dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" + dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" + + if use_if_iuse opcache; then + elog "Adding opcache to $PHP_EXT_INI_DIR" + echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini + dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" + fi + + # SAPI-specific handling + + if [[ "${sapi}" == "fpm" ]] ; then + [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 + einfo "Installing FPM CGI config file php-fpm.conf" + insinto "${PHP_INI_DIR#${EPREFIX}}" + newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf + + # Remove bogus /etc/php-fpm.conf.default (bug 359906) + [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" + fi + + # Install PHP ini files into /usr/share/php + + dodoc php.ini-development + dodoc php.ini-production + +} + +php_set_ini_dir() { + PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" + PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" + PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" +} + +src_prepare() { + # Change PHP branding + # Get the alpha/beta/rc version + sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ + -i configure.in || die "Unable to change PHP branding" + + # Patch PHP to show Gentoo as the server platform + sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ + -i configure.in || die "Failed to fix server platform name" + + # Patch PHP to support heimdal instead of mit-krb5 + if has_version "app-crypt/heimdal" ; then + sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ + || die "Failed to fix heimdal libname" + sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ + || die "Failed to fix heimdal crypt library reference" + fi + + #Add user patches #357637 + epatch_user + + #force rebuilding aclocal.m4 + rm aclocal.m4 + eautoreconf + + if [[ ${CHOST} == *-darwin* ]] ; then + # http://bugs.php.net/bug.php?id=48795, bug #343481 + sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die + fi +} + +src_configure() { + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" + + # This is a global variable and should be in caps. It isn't because the + # phpconfutils eclass relies on exactly this name... + # for --with-libdir see bug #327025 + my_conf=" + --prefix="${PHP_DESTDIR}" + --mandir="${PHP_DESTDIR}"/man + --infodir="${PHP_DESTDIR}"/info + --libdir="${PHP_DESTDIR}"/lib + --with-libdir=$(get_libdir) + --without-pear + $(use_enable threads maintainer-zts)" + + # extension USE flag shared + my_conf+=" + $(use_enable bcmath bcmath ) + $(use_with bzip2 bz2 "${EPREFIX}"/usr) + $(use_enable calendar calendar ) + $(use_enable ctype ctype ) + $(use_with curl curl "${EPREFIX}"/usr) + $(use_enable xml dom ) + $(use_with enchant enchant "${EPREFIX}"/usr) + $(use_enable exif exif ) + $(use_enable fileinfo fileinfo ) + $(use_enable filter filter ) + $(use_enable ftp ftp ) + $(use_with nls gettext "${EPREFIX}"/usr) + $(use_with gmp gmp "${EPREFIX}"/usr) + $(use_enable hash hash ) + $(use_with mhash mhash "${EPREFIX}"/usr) + $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) + $(use_enable intl intl ) + $(use_enable ipv6 ipv6 ) + $(use_enable json json ) + $(use_with kerberos kerberos "${EPREFIX}"/usr) + $(use_enable xml libxml ) + $(use_with xml libxml-dir "${EPREFIX}"/usr) + $(use_enable unicode mbstring ) + $(use_with crypt mcrypt "${EPREFIX}"/usr) + $(use_with unicode onig "${EPREFIX}"/usr) + $(use_with ssl openssl "${EPREFIX}"/usr) + $(use_with ssl openssl-dir "${EPREFIX}"/usr) + $(use_enable pcntl pcntl ) + $(use_enable phar phar ) + $(use_enable pdo pdo ) + $(use_enable opcache opcache ) + $(use_with postgres pgsql "${EPREFIX}"/usr) + $(use_enable posix posix ) + $(use_with spell pspell "${EPREFIX}"/usr) + $(use_with recode recode "${EPREFIX}"/usr) + $(use_enable simplexml simplexml ) + $(use_enable sharedmem shmop ) + $(use_with snmp snmp "${EPREFIX}"/usr) + $(use_enable soap soap ) + $(use_enable sockets sockets ) + $(use_with sqlite sqlite3 "${EPREFIX}"/usr) + $(use_enable sysvipc sysvmsg ) + $(use_enable sysvipc sysvsem ) + $(use_enable sysvipc sysvshm ) + $(use_with systemd fpm-systemd) + $(use_with tidy tidy "${EPREFIX}"/usr) + $(use_enable tokenizer tokenizer ) + $(use_enable wddx wddx ) + $(use_enable xml xml ) + $(use_enable xmlreader xmlreader ) + $(use_enable xmlwriter xmlwriter ) + $(use_with xmlrpc xmlrpc) + $(use_with xslt xsl "${EPREFIX}"/usr) + $(use_enable zip zip ) + $(use_with zlib zlib "${EPREFIX}"/usr) + $(use_enable debug debug )" + + # DBA support + if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ + || use qdbm ; then + my_conf+=" --enable-dba${shared}" + fi + + # DBA drivers support + my_conf+=" + $(use_with cdb cdb) + $(use_with berkdb db4 ${EPREFIX}/usr) + $(use_enable flatfile flatfile ) + $(use_with gdbm gdbm ${EPREFIX}/usr) + $(use_enable inifile inifile ) + $(use_with qdbm qdbm ${EPREFIX}/usr)" + + # Support for the GD graphics library + my_conf+=" + $(use_with truetype freetype-dir ${EPREFIX}/usr) + $(use_enable cjk gd-jis-conv ) + $(use_with gd jpeg-dir ${EPREFIX}/usr) + $(use_with gd png-dir ${EPREFIX}/usr) + $(use_with xpm xpm-dir ${EPREFIX}/usr) + $(use_with vpx vpx-dir ${EPREFIX}/usr)" + # enable gd last, so configure can pick up the previous settings + my_conf+=" + $(use_with gd gd)" + + # IMAP support + if use imap ; then + my_conf+=" + $(use_with imap imap ${EPREFIX}/usr) + $(use_with ssl imap-ssl ${EPREFIX}/usr)" + fi + + # Interbase/firebird support + my_conf+=" + $(use_with firebird interbase ${EPREFIX}/usr)" + + # LDAP support + if use ldap ; then + my_conf+=" + $(use_with ldap ldap ${EPREFIX}/usr) + $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" + fi + + # MySQL support + local mysqllib="mysqlnd" + local mysqlilib="mysqlnd" + + my_conf+=" $(use_with mysqli mysqli $mysqlilib)" + + local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" + if use mysql ; then + my_conf+="${mysqlsock}" + elif use mysqli ; then + my_conf+="${mysqlsock}" + fi + + # ODBC support + my_conf+=" + $(use_with odbc unixODBC ${EPREFIX}/usr) + $(use_with iodbc iodbc ${EPREFIX}/usr)" + + # Oracle support + my_conf+=" + $(use_with oci8-instant-client oci8)" + + # PDO support + if use pdo ; then + my_conf+=" + $(use_with mysql pdo-mysql ${mysqllib}) + $(use_with postgres pdo-pgsql ) + $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) + $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr) + $(use_with oci8-instant-client pdo-oci)" + fi + + # readline/libedit support + my_conf+=" + $(use_with readline readline ${EPREFIX}/usr) + $(use_with libedit libedit ${EPREFIX}/usr)" + + # Session support + if use session ; then + my_conf+=" + $(use_with sharedmem mm ${EPREFIX}/usr)" + else + my_conf+=" + $(use_enable session session )" + fi + + # Use pic for shared modules such as apache2's mod_php + my_conf+=" --with-pic" + + # we use the system copy of pcre + # --with-pcre-regex affects ext/pcre + # --with-pcre-dir affects ext/filter and ext/zip + my_conf+=" --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" + + # Catch CFLAGS problems + # Fixes bug #14067. + # Changed order to run it in reverse for bug #32022 and #12021. + replace-cpu-flags "k6*" "i586" + + # Support user-passed configuration parameters + my_conf+=" ${EXTRA_ECONF:-}" + + # Support the Apache2 extras, they must be set globally for all + # SAPIs to work correctly, especially for external PHP extensions + + mkdir -p "${WORKDIR}/sapis-build" + for one_sapi in $SAPIS ; do + use "${one_sapi}" || continue + php_set_ini_dir "${one_sapi}" + + cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" + cd "${WORKDIR}/sapis-build/${one_sapi}" + + sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} + --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" + + for sapi in $SAPIS ; do + case "$sapi" in + cli|cgi|embed|fpm) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --enable-${sapi}" + else + sapi_conf="${sapi_conf} --disable-${sapi}" + fi + ;; + + apache2) + if [[ "${one_sapi}" == "${sapi}" ]] ; then + sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" + else + sapi_conf="${sapi_conf} --without-apxs2" + fi + ;; + esac + done + + econf ${sapi_conf} + done +} + +src_compile() { + # snmp seems to run during src_compile, too (bug #324739) + addpredict /usr/share/snmp/mibs/.index + addpredict /var/lib/net-snmp/mib_indexes + + for sapi in ${SAPIS} ; do + if use "${sapi}"; then + cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" + emake || die "emake failed" + fi + done +} + +src_install() { + # see bug #324739 for what happens when we don't have that + addpredict /usr/share/snmp/mibs/.index + + # grab the first SAPI that got built and install common files from there + local first_sapi="" + for sapi in $SAPIS ; do + if use $sapi ; then + first_sapi=$sapi + break + fi + done + + # Makefile forgets to create this before trying to write to it... + dodir "${PHP_DESTDIR#${EPREFIX}}/bin" + + # Install php environment (without any sapis) + cd "${WORKDIR}/sapis-build/$first_sapi" + emake INSTALL_ROOT="${D}" \ + install-build install-headers install-programs \ + || die "emake install failed" + + local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" + + # Create the directory where we'll put version-specific php scripts + keepdir /usr/share/php${PHP_MV} + + local sapi="", file="" + local sapi_list="" + + for sapi in ${SAPIS}; do + if use "${sapi}" ; then + einfo "Installing SAPI: ${sapi}" + cd "${WORKDIR}/sapis-build/${sapi}" + + if [[ "${sapi}" == "apache2" ]] ; then + # We're specifically not using emake install-sapi as libtool + # may cause unnecessary relink failures (see bug #351266) + insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" + newins ".libs/libphp${PHP_MV}$(get_libname)" "libphp${PHP_MV}$(get_libname)" + keepdir "/usr/$(get_libdir)/apache2/modules" + else + # needed each time, php_install_ini would reset it + local dest="${PHP_DESTDIR#${EPREFIX}}" + into "${dest}" + case "$sapi" in + cli) + source="sapi/cli/php" + ;; + cgi) + source="sapi/cgi/php-cgi" + ;; + fpm) + source="sapi/fpm/php-fpm" + ;; + embed) + source="libs/libphp${PHP_MV}$(get_libname)" + ;; + *) + die "unhandled sapi in src_install" + ;; + esac + + if [[ "${source}" == *"$(get_libname)" ]]; then + dolib.so "${source}" || die "Unable to install ${sapi} sapi" + else + dobin "${source}" || die "Unable to install ${sapi} sapi" + local name="$(basename ${source})" + dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" + fi + fi + + php_install_ini "${sapi}" + + # construct correct SAPI string for php-config + # thanks to ferringb for the bash voodoo + if [[ "${sapi}" == "apache2" ]]; then + sapi_list="${sapi_list:+${sapi_list} }apache2handler" + else + sapi_list="${sapi_list:+${sapi_list} }${sapi}" + fi + fi + done + + # Installing opcache module + if use_if_iuse opcache ; then + dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" + fi + + # Install env.d files + newenvd "${FILESDIR}/20php5-envd" \ + "20php${SLOT}" + sed -e "s|/lib/|/$(get_libdir)/|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + sed -e "s|php5|php${SLOT}|g" -i \ + "${ED}/etc/env.d/20php${SLOT}" + + # set php-config variable correctly (bug #278439) + sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ + "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" + + if use fpm ; then + if use systemd; then + systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" + else + systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" + fi + fi +} + +src_test() { + echo ">>> Test phase [test]: ${CATEGORY}/${PF}" + PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" + if [[ ! -x "${PHP_BIN}" ]] ; then + ewarn "Test phase requires USE=cli, skipping" + return + else + export TEST_PHP_EXECUTABLE="${PHP_BIN}" + fi + + if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then + export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" + fi + + REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ + "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" + + for name in ${EXPECTED_TEST_FAILURES}; do + mv "${name}.out" "${name}.out.orig" 2>/dev/null + done + + local failed="$(find -name '*.out')" + if [[ ${failed} != "" ]] ; then + ewarn "The following test cases failed unexpectedly:" + for name in ${failed}; do + ewarn " ${name/.out/}" + done + else + einfo "No unexpected test failures, all fine" + fi + + if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then + local passed="" + for name in ${EXPECTED_TEST_FAILURES}; do + [[ -f "${name}.diff" ]] && continue + passed="${passed} ${name}" + done + if [[ ${passed} != "" ]] ; then + einfo "The following test cases passed unexpectedly:" + for name in ${passed}; do + ewarn " ${passed}" + done + else + einfo "None of the known-to-fail tests passed, all fine" + fi + fi +} + +pkg_postinst() { + # Output some general info to the user + if use apache2 ; then + APACHE2_MOD_DEFINE="PHP5" + APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php + apache-module_pkg_postinst + fi + + # Create the symlinks for php + for m in ${SAPIS}; do + [[ ${m} == 'embed' ]] && continue; + if use $m ; then + local ci=$(eselect php show $m) + if [[ -z $ci ]]; then + eselect php set $m php${SLOT} + einfo "Switched ${m} to use php:${SLOT}" + einfo + elif [[ $ci != "php${SLOT}" ]] ; then + elog "To switch $m to use php:${SLOT}, run" + elog " eselect php set $m php${SLOT}" + elog + fi + fi + done + + elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" + elog "to compile extensions for the ${SLOT} ABI" + elog + if ! use readline && use cli ; then + ewarn "Note that in order to use php interactivly, you need to enable" + ewarn "the readline USE flag or php -a will hang" + fi + elog + elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." + elog "You can choose which version of php.ini to install by default by setting PHP_INI_VERSION to either" + elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" + elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" + + elog + elog "For more details on how minor version slotting works (PHP_TARGETS) please see the wiki:" + elog "https://wiki.gentoo.org/wiki/PHP" + elog +} + +pkg_prerm() { + eselect php cleanup +} diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 2374fdc0f371..f600c9f200bd 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -1,2 +1 @@ -DIST icu4c-54_1-src.tgz 25485678 SHA256 d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 SHA512 d54d4cd826e1aef62a574595a04f9fec0a42c4445ed0a166a6bb5c5f3c9f692bf3273756f350233f50b2a1ad32c437dedfeeac96d6dc814d27bfd9159b7a651c WHIRLPOOL 1ae01eb26824ca591ff76ea040f703023f24975ad4177d49b1dd60f7e7f96f60884745d6c6e5e2bdf17fc8e104e97ed814f6c0ca051d1807814e324eb24e94dd DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a diff --git a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch b/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch deleted file mode 100644 index db86c921bc8c..000000000000 --- a/dev-libs/icu/files/icu-54.1-CVE-2014-9654.patch +++ /dev/null @@ -1,1105 +0,0 @@ -Index: /icu/trunk/source/common/unicode/utypes.h
-===================================================================
---- /icu/trunk/source/common/unicode/utypes.h (revision 36800)
-+++ /icu/trunk/source/common/unicode/utypes.h (revision 36801)
-@@ -648,4 +648,5 @@
- U_REGEX_TIME_OUT, /**< Maximum allowed match time exceeded */
- U_REGEX_STOPPED_BY_CALLER, /**< Matching operation aborted by user callback fn. */
-+ U_REGEX_PATTERN_TOO_BIG, /**< Pattern exceeds limits on size or complexity. @draft ICU 55 */
- U_REGEX_ERROR_LIMIT, /**< This must always be the last value to indicate the limit for regexp errors */
-
-Index: /icu/trunk/source/common/utypes.c
-===================================================================
---- /icu/trunk/source/common/utypes.c (revision 36800)
-+++ /icu/trunk/source/common/utypes.c (revision 36801)
-@@ -2,5 +2,5 @@
- ******************************************************************************
- *
--* Copyright (C) 1997-2011, International Business Machines
-+* Copyright (C) 1997-2014, International Business Machines
- * Corporation and others. All Rights Reserved.
- *
-@@ -166,5 +166,6 @@
- "U_REGEX_STACK_OVERFLOW",
- "U_REGEX_TIME_OUT",
-- "U_REGEX_STOPPED_BY_CALLER"
-+ "U_REGEX_STOPPED_BY_CALLER",
-+ "U_REGEX_PATTERN_TOO_BIG"
- };
-
-Index: /icu/trunk/source/i18n/regexcmp.cpp
-===================================================================
---- /icu/trunk/source/i18n/regexcmp.cpp (revision 36800)
-+++ /icu/trunk/source/i18n/regexcmp.cpp (revision 36801)
-@@ -305,5 +305,5 @@
- // the position in the compiled pattern.
- //
-- fRXPat->fFrameSize+=RESTACKFRAME_HDRCOUNT;
-+ allocateStackData(RESTACKFRAME_HDRCOUNT);
-
- //
-@@ -371,7 +371,7 @@
- //4 NOP Resreved, will be replaced by a save if there are
- // OR | operators at the top level
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_STATE_SAVE, 2), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_JMP, 3), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_FAIL, 0), *fStatus);
-+ appendOp(URX_STATE_SAVE, 2);
-+ appendOp(URX_JMP, 3);
-+ appendOp(URX_FAIL, 0);
-
- // Standard open nonCapture paren action emits the two NOPs and
-@@ -396,5 +396,5 @@
-
- // add the END operation to the compiled pattern.
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_END, 0), *fStatus);
-+ appendOp(URX_END, 0);
-
- // Terminate the pattern compilation state machine.
-@@ -418,5 +418,5 @@
- int32_t op = (int32_t)fRXPat->fCompiledPat->elementAti(savePosition);
- U_ASSERT(URX_TYPE(op) == URX_NOP); // original contents of reserved location
-- op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1);
-+ op = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+1);
- fRXPat->fCompiledPat->setElementAt(op, savePosition);
-
-@@ -424,6 +424,5 @@
- // the JMP will eventually be the location following the ')' for the
- // group. This will be patched in later, when the ')' is encountered.
-- op = URX_BUILD(URX_JMP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP, 0);
-
- // Push the position of the newly added JMP op onto the parentheses stack.
-@@ -434,5 +433,5 @@
- // for a SAVE in the event that there is yet another '|' following
- // this one.
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
- fParenStack.push(fRXPat->fCompiledPat->size()-1, *fStatus);
- }
-@@ -460,10 +459,8 @@
- {
- fixLiterals();
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- int32_t varsLoc = fRXPat->fFrameSize; // Reserve three slots in match stack frame.
-- fRXPat->fFrameSize += 3;
-- int32_t cop = URX_BUILD(URX_START_CAPTURE, varsLoc);
-- fRXPat->fCompiledPat->addElement(cop, *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ int32_t varsLoc = allocateStackData(3); // Reserve three slots in match stack frame.
-+ appendOp(URX_START_CAPTURE, varsLoc);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -490,6 +487,6 @@
- {
- fixLiterals();
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -513,10 +510,8 @@
- {
- fixLiterals();
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- int32_t varLoc = fRXPat->fDataSize; // Reserve a data location for saving the
-- fRXPat->fDataSize += 1; // state stack ptr.
-- int32_t stoOp = URX_BUILD(URX_STO_SP, varLoc);
-- fRXPat->fCompiledPat->addElement(stoOp, *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ int32_t varLoc = allocateData(1); // Reserve a data location for saving the state stack ptr.
-+ appendOp(URX_STO_SP, varLoc);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -561,24 +556,12 @@
- {
- fixLiterals();
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 2;
-- int32_t op = URX_BUILD(URX_LA_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_JMP, fRXPat->fCompiledPat->size()+ 3);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_BACKTRACK, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ int32_t dataLoc = allocateData(2);
-+ appendOp(URX_LA_START, dataLoc);
-+ appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+ 2);
-+ appendOp(URX_JMP, fRXPat->fCompiledPat->size()+ 3);
-+ appendOp(URX_LA_END, dataLoc);
-+ appendOp(URX_BACKTRACK, 0);
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -605,14 +588,8 @@
- {
- fixLiterals();
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 2;
-- int32_t op = URX_BUILD(URX_LA_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_STATE_SAVE, 0); // dest address will be patched later.
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
--
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ int32_t dataLoc = allocateData(2);
-+ appendOp(URX_LA_START, dataLoc);
-+ appendOp(URX_STATE_SAVE, 0); // dest address will be patched later.
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -652,21 +629,17 @@
-
- // Allocate data space
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 4;
-+ int32_t dataLoc = allocateData(4);
-
- // Emit URX_LB_START
-- int32_t op = URX_BUILD(URX_LB_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_START, dataLoc);
-
- // Emit URX_LB_CONT
-- op = URX_BUILD(URX_LB_CONT, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MinMatchLength. To be filled later.
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MaxMatchLength. To be filled later.
--
-- // Emit the NOP
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_CONT, dataLoc);
-+ appendOp(URX_RESERVED_OP, 0); // MinMatchLength. To be filled later.
-+ appendOp(URX_RESERVED_OP, 0); // MaxMatchLength. To be filled later.
-+
-+ // Emit the NOPs
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -708,22 +681,18 @@
-
- // Allocate data space
-- int32_t dataLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize += 4;
-+ int32_t dataLoc = allocateData(4);
-
- // Emit URX_LB_START
-- int32_t op = URX_BUILD(URX_LB_START, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_START, dataLoc);
-
- // Emit URX_LBN_CONT
-- op = URX_BUILD(URX_LBN_CONT, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MinMatchLength. To be filled later.
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // MaxMatchLength. To be filled later.
-- fRXPat->fCompiledPat->addElement(0, *fStatus); // Continue Loc. To be filled later.
--
-- // Emit the NOP
-- op = URX_BUILD(URX_NOP, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LBN_CONT, dataLoc);
-+ appendOp(URX_RESERVED_OP, 0); // MinMatchLength. To be filled later.
-+ appendOp(URX_RESERVED_OP, 0); // MaxMatchLength. To be filled later.
-+ appendOp(URX_RESERVED_OP, 0); // Continue Loc. To be filled later.
-+
-+ // Emit the NOPs
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -795,10 +764,7 @@
- if (URX_TYPE(repeatedOp) == URX_SETREF) {
- // Emit optimized code for [char set]+
-- int32_t loopOpI = URX_BUILD(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-- fRXPat->fCompiledPat->addElement(loopOpI, *fStatus);
-- frameLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, frameLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ appendOp(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-+ frameLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, frameLoc);
- break;
- }
-@@ -808,5 +774,5 @@
- URX_TYPE(repeatedOp) == URX_DOTANY_UNIX) {
- // Emit Optimized code for .+ operations.
-- int32_t loopOpI = URX_BUILD(URX_LOOP_DOT_I, 0);
-+ int32_t loopOpI = buildOp(URX_LOOP_DOT_I, 0);
- if (URX_TYPE(repeatedOp) == URX_DOTANY_ALL) {
- // URX_LOOP_DOT_I operand is a flag indicating ". matches any" mode.
-@@ -816,9 +782,7 @@
- loopOpI |= 2;
- }
-- fRXPat->fCompiledPat->addElement(loopOpI, *fStatus);
-- frameLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, frameLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ appendOp(loopOpI);
-+ frameLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, frameLoc);
- break;
- }
-@@ -834,16 +798,13 @@
- // Emit the code sequence that can handle it.
- insertOp(topLoc);
-- frameLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
--
-- int32_t op = URX_BUILD(URX_STO_INP_LOC, frameLoc);
-+ frameLoc = allocateStackData(1);
-+
-+ int32_t op = buildOp(URX_STO_INP_LOC, frameLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
-- op = URX_BUILD(URX_JMP_SAV_X, topLoc+1);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP_SAV_X, topLoc+1);
- } else {
- // Simpler code when the repeated body must match something non-empty
-- int32_t jmpOp = URX_BUILD(URX_JMP_SAV, topLoc);
-- fRXPat->fCompiledPat->addElement(jmpOp, *fStatus);
-+ appendOp(URX_JMP_SAV, topLoc);
- }
- }
-@@ -857,6 +818,5 @@
- {
- int32_t topLoc = blockTopLoc(FALSE);
-- int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, topLoc);
-- fRXPat->fCompiledPat->addElement(saveStateOp, *fStatus);
-+ appendOp(URX_STATE_SAVE, topLoc);
- }
- break;
-@@ -872,5 +832,5 @@
- {
- int32_t saveStateLoc = blockTopLoc(TRUE);
-- int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size());
-+ int32_t saveStateOp = buildOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size());
- fRXPat->fCompiledPat->setElementAt(saveStateOp, saveStateLoc);
- }
-@@ -891,12 +851,10 @@
- int32_t jmp2_loc = fRXPat->fCompiledPat->size();
-
-- int32_t jmp1_op = URX_BUILD(URX_JMP, jmp2_loc+1);
-+ int32_t jmp1_op = buildOp(URX_JMP, jmp2_loc+1);
- fRXPat->fCompiledPat->setElementAt(jmp1_op, jmp1_loc);
-
-- int32_t jmp2_op = URX_BUILD(URX_JMP, jmp2_loc+2);
-- fRXPat->fCompiledPat->addElement(jmp2_op, *fStatus);
--
-- int32_t save_op = URX_BUILD(URX_STATE_SAVE, jmp1_loc+1);
-- fRXPat->fCompiledPat->addElement(save_op, *fStatus);
-+ appendOp(URX_JMP, jmp2_loc+2);
-+
-+ appendOp(URX_STATE_SAVE, jmp1_loc+1);
- }
- break;
-@@ -938,10 +896,8 @@
- if (URX_TYPE(repeatedOp) == URX_SETREF) {
- // Emit optimized code for a [char set]*
-- int32_t loopOpI = URX_BUILD(URX_LOOP_SR_I, URX_VAL(repeatedOp));
-+ int32_t loopOpI = buildOp(URX_LOOP_SR_I, URX_VAL(repeatedOp));
- fRXPat->fCompiledPat->setElementAt(loopOpI, topLoc);
-- dataLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, dataLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ dataLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, dataLoc);
- break;
- }
-@@ -951,5 +907,5 @@
- URX_TYPE(repeatedOp) == URX_DOTANY_UNIX) {
- // Emit Optimized code for .* operations.
-- int32_t loopOpI = URX_BUILD(URX_LOOP_DOT_I, 0);
-+ int32_t loopOpI = buildOp(URX_LOOP_DOT_I, 0);
- if (URX_TYPE(repeatedOp) == URX_DOTANY_ALL) {
- // URX_LOOP_DOT_I operand is a flag indicating . matches any mode.
-@@ -960,8 +916,6 @@
- }
- fRXPat->fCompiledPat->setElementAt(loopOpI, topLoc);
-- dataLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- int32_t loopOpC = URX_BUILD(URX_LOOP_C, dataLoc);
-- fRXPat->fCompiledPat->addElement(loopOpC, *fStatus);
-+ dataLoc = allocateStackData(1);
-+ appendOp(URX_LOOP_C, dataLoc);
- break;
- }
-@@ -972,5 +926,5 @@
-
- int32_t saveStateLoc = blockTopLoc(TRUE);
-- int32_t jmpOp = URX_BUILD(URX_JMP_SAV, saveStateLoc+1);
-+ int32_t jmpOp = buildOp(URX_JMP_SAV, saveStateLoc+1);
-
- // Check for minimum match length of zero, which requires
-@@ -978,10 +932,9 @@
- if (minMatchLength(saveStateLoc, fRXPat->fCompiledPat->size()-1) == 0) {
- insertOp(saveStateLoc);
-- dataLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
--
-- int32_t op = URX_BUILD(URX_STO_INP_LOC, dataLoc);
-+ dataLoc = allocateStackData(1);
-+
-+ int32_t op = buildOp(URX_STO_INP_LOC, dataLoc);
- fRXPat->fCompiledPat->setElementAt(op, saveStateLoc+1);
-- jmpOp = URX_BUILD(URX_JMP_SAV_X, saveStateLoc+2);
-+ jmpOp = buildOp(URX_JMP_SAV_X, saveStateLoc+2);
- }
-
-@@ -990,10 +943,10 @@
- int32_t continueLoc = fRXPat->fCompiledPat->size()+1;
-
-- // Put together the save state op store it into the compiled code.
-- int32_t saveStateOp = URX_BUILD(URX_STATE_SAVE, continueLoc);
-+ // Put together the save state op and store it into the compiled code.
-+ int32_t saveStateOp = buildOp(URX_STATE_SAVE, continueLoc);
- fRXPat->fCompiledPat->setElementAt(saveStateOp, saveStateLoc);
-
- // Append the URX_JMP_SAV or URX_JMPX operation to the compiled pattern.
-- fRXPat->fCompiledPat->addElement(jmpOp, *fStatus);
-+ appendOp(jmpOp);
- }
- break;
-@@ -1009,8 +962,7 @@
- int32_t jmpLoc = blockTopLoc(TRUE); // loc 1.
- int32_t saveLoc = fRXPat->fCompiledPat->size(); // loc 3.
-- int32_t jmpOp = URX_BUILD(URX_JMP, saveLoc);
-- int32_t stateSaveOp = URX_BUILD(URX_STATE_SAVE, jmpLoc+1);
-+ int32_t jmpOp = buildOp(URX_JMP, saveLoc);
- fRXPat->fCompiledPat->setElementAt(jmpOp, jmpLoc);
-- fRXPat->fCompiledPat->addElement(stateSaveOp, *fStatus);
-+ appendOp(URX_STATE_SAVE, jmpLoc+1);
- }
- break;
-@@ -1085,7 +1037,7 @@
- // First the STO_SP before the start of the loop
- insertOp(topLoc);
-- int32_t varLoc = fRXPat->fDataSize; // Reserve a data location for saving the
-- fRXPat->fDataSize += 1; // state stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, varLoc);
-+
-+ int32_t varLoc = allocateData(1); // Reserve a data location for saving the
-+ int32_t op = buildOp(URX_STO_SP, varLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
-@@ -1096,6 +1048,5 @@
-
- // Then the LD_SP after the end of the loop
-- op = URX_BUILD(URX_LD_SP, varLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, varLoc);
- }
-
-@@ -1133,13 +1084,11 @@
- {
- fixLiterals(FALSE);
-- int32_t op;
- if (fModeFlags & UREGEX_DOTALL) {
-- op = URX_BUILD(URX_DOTANY_ALL, 0);
-+ appendOp(URX_DOTANY_ALL, 0);
- } else if (fModeFlags & UREGEX_UNIX_LINES) {
-- op = URX_BUILD(URX_DOTANY_UNIX, 0);
-+ appendOp(URX_DOTANY_UNIX, 0);
- } else {
-- op = URX_BUILD(URX_DOTANY, 0);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_DOTANY, 0);
-+ }
- }
- break;
-@@ -1148,15 +1097,13 @@
- {
- fixLiterals(FALSE);
-- int32_t op = 0;
- if ( (fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_CARET;
-+ appendOp(URX_CARET, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_CARET_M;
-+ appendOp(URX_CARET_M, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_CARET; // Only testing true start of input.
-+ appendOp(URX_CARET, 0); // Only testing true start of input.
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_CARET_M_UNIX;
-- }
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+ appendOp(URX_CARET_M_UNIX, 0);
-+ }
- }
- break;
-@@ -1165,15 +1112,13 @@
- {
- fixLiterals(FALSE);
-- int32_t op = 0;
- if ( (fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_DOLLAR;
-+ appendOp(URX_DOLLAR, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) == 0) {
-- op = URX_DOLLAR_M;
-+ appendOp(URX_DOLLAR_M, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) == 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_DOLLAR_D;
-+ appendOp(URX_DOLLAR_D, 0);
- } else if ((fModeFlags & UREGEX_MULTILINE) != 0 && (fModeFlags & UREGEX_UNIX_LINES) != 0) {
-- op = URX_DOLLAR_MD;
-- }
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+ appendOp(URX_DOLLAR_MD, 0);
-+ }
- }
- break;
-@@ -1181,5 +1126,5 @@
- case doBackslashA:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_CARET, 0), *fStatus);
-+ appendOp(URX_CARET, 0);
- break;
-
-@@ -1193,5 +1138,5 @@
- fixLiterals(FALSE);
- int32_t op = (fModeFlags & UREGEX_UWORD)? URX_BACKSLASH_BU : URX_BACKSLASH_B;
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 1), *fStatus);
-+ appendOp(op, 1);
- }
- break;
-@@ -1206,5 +1151,5 @@
- fixLiterals(FALSE);
- int32_t op = (fModeFlags & UREGEX_UWORD)? URX_BACKSLASH_BU : URX_BACKSLASH_B;
-- fRXPat->fCompiledPat->addElement(URX_BUILD(op, 0), *fStatus);
-+ appendOp(op, 0);
- }
- break;
-@@ -1212,44 +1157,40 @@
- case doBackslashD:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_D, 1), *fStatus);
-+ appendOp(URX_BACKSLASH_D, 1);
- break;
-
- case doBackslashd:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_D, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_D, 0);
- break;
-
- case doBackslashG:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_G, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_G, 0);
- break;
-
- case doBackslashS:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STAT_SETREF_N, URX_ISSPACE_SET), *fStatus);
-+ appendOp(URX_STAT_SETREF_N, URX_ISSPACE_SET);
- break;
-
- case doBackslashs:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STATIC_SETREF, URX_ISSPACE_SET), *fStatus);
-+ appendOp(URX_STATIC_SETREF, URX_ISSPACE_SET);
- break;
-
- case doBackslashW:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STAT_SETREF_N, URX_ISWORD_SET), *fStatus);
-+ appendOp(URX_STAT_SETREF_N, URX_ISWORD_SET);
- break;
-
- case doBackslashw:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(
-- URX_BUILD(URX_STATIC_SETREF, URX_ISWORD_SET), *fStatus);
-+ appendOp(URX_STATIC_SETREF, URX_ISWORD_SET);
- break;
-
- case doBackslashX:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_X, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_X, 0);
- break;
-
-@@ -1257,10 +1198,10 @@
- case doBackslashZ:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_DOLLAR, 0), *fStatus);
-+ appendOp(URX_DOLLAR, 0);
- break;
-
- case doBackslashz:
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKSLASH_Z, 0), *fStatus);
-+ appendOp(URX_BACKSLASH_Z, 0);
- break;
-
-@@ -1322,11 +1263,9 @@
- // and shouldn't enter this code path at all.
- fixLiterals(FALSE);
-- int32_t op;
- if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-- op = URX_BUILD(URX_BACKREF_I, groupNum);
-+ appendOp(URX_BACKREF_I, groupNum);
- } else {
-- op = URX_BUILD(URX_BACKREF, groupNum);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_BACKREF, groupNum);
-+ }
- }
- break;
-@@ -1349,20 +1288,16 @@
- // Emit the STO_SP
- int32_t topLoc = blockTopLoc(TRUE);
-- int32_t stoLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize++; // Reserve the data location for storing save stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, stoLoc);
-+ int32_t stoLoc = allocateData(1); // Reserve the data location for storing save stack ptr.
-+ int32_t op = buildOp(URX_STO_SP, stoLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
- // Emit the STATE_SAVE
-- op = URX_BUILD(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+2);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_STATE_SAVE, fRXPat->fCompiledPat->size()+2);
-
- // Emit the JMP
-- op = URX_BUILD(URX_JMP, topLoc+1);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP, topLoc+1);
-
- // Emit the LD_SP
-- op = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -1384,21 +1319,18 @@
-
- // emit STO_SP loc
-- int32_t stoLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize++; // Reserve the data location for storing save stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, stoLoc);
-+ int32_t stoLoc = allocateData(1); // Reserve the data location for storing save stack ptr.
-+ int32_t op = buildOp(URX_STO_SP, stoLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
- // Emit the SAVE_STATE 5
- int32_t L7 = fRXPat->fCompiledPat->size()+1;
-- op = URX_BUILD(URX_STATE_SAVE, L7);
-+ op = buildOp(URX_STATE_SAVE, L7);
- fRXPat->fCompiledPat->setElementAt(op, topLoc+1);
-
- // Append the JMP operation.
-- op = URX_BUILD(URX_JMP, topLoc+1);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_JMP, topLoc+1);
-
- // Emit the LD_SP loc
-- op = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -1419,17 +1351,15 @@
-
- // Emit the STO_SP
-- int32_t stoLoc = fRXPat->fDataSize;
-- fRXPat->fDataSize++; // Reserve the data location for storing save stack ptr.
-- int32_t op = URX_BUILD(URX_STO_SP, stoLoc);
-+ int32_t stoLoc = allocateData(1); // Reserve the data location for storing save stack ptr.
-+ int32_t op = buildOp(URX_STO_SP, stoLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc);
-
- // Emit the SAVE_STATE
- int32_t continueLoc = fRXPat->fCompiledPat->size()+1;
-- op = URX_BUILD(URX_STATE_SAVE, continueLoc);
-+ op = buildOp(URX_STATE_SAVE, continueLoc);
- fRXPat->fCompiledPat->setElementAt(op, topLoc+1);
-
- // Emit the LD_SP
-- op = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -1488,6 +1418,6 @@
- {
- fixLiterals(FALSE);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_NOP, 0), *fStatus);
-+ appendOp(URX_NOP, 0);
-+ appendOp(URX_NOP, 0);
-
- // On the Parentheses stack, start a new frame and add the postions
-@@ -1826,5 +1756,4 @@
- //------------------------------------------------------------------------------
- void RegexCompile::fixLiterals(UBool split) {
-- int32_t op = 0; // An op from/for the compiled pattern.
-
- // If no literal characters have been scanned but not yet had code generated
-@@ -1865,21 +1794,21 @@
- if ((fModeFlags & UREGEX_CASE_INSENSITIVE) &&
- u_hasBinaryProperty(lastCodePoint, UCHAR_CASE_SENSITIVE)) {
-- op = URX_BUILD(URX_ONECHAR_I, lastCodePoint);
-+ appendOp(URX_ONECHAR_I, lastCodePoint);
- } else {
-- op = URX_BUILD(URX_ONECHAR, lastCodePoint);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_ONECHAR, lastCodePoint);
-+ }
- } else {
- // Two or more chars, emit a URX_STRING to match them.
-+ if (fLiteralChars.length() > 0x00ffffff || fRXPat->fLiteralText.length() > 0x00ffffff) {
-+ error(U_REGEX_PATTERN_TOO_BIG);
-+ }
- if (fModeFlags & UREGEX_CASE_INSENSITIVE) {
-- op = URX_BUILD(URX_STRING_I, fRXPat->fLiteralText.length());
-+ appendOp(URX_STRING_I, fRXPat->fLiteralText.length());
- } else {
- // TODO here: add optimization to split case sensitive strings of length two
- // into two single char ops, for efficiency.
-- op = URX_BUILD(URX_STRING, fRXPat->fLiteralText.length());
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_STRING_LEN, fLiteralChars.length());
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_STRING, fRXPat->fLiteralText.length());
-+ }
-+ appendOp(URX_STRING_LEN, fLiteralChars.length());
-
- // Add this string into the accumulated strings of the compiled pattern.
-@@ -1891,6 +1820,56 @@
-
-
--
--
-+int32_t RegexCompile::buildOp(int32_t type, int32_t val) {
-+ if (U_FAILURE(*fStatus)) {
-+ return 0;
-+ }
-+ if (type < 0 || type > 255) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ type = URX_RESERVED_OP;
-+ }
-+ if (val > 0x00ffffff) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ val = 0;
-+ }
-+ if (val < 0) {
-+ if (!(type == URX_RESERVED_OP_N || type == URX_RESERVED_OP)) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return -1;
-+ }
-+ if (URX_TYPE(val) != 0xff) {
-+ U_ASSERT(FALSE);
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return -1;
-+ }
-+ type = URX_RESERVED_OP_N;
-+ }
-+ return (type << 24) | val;
-+}
-+
-+
-+//------------------------------------------------------------------------------
-+//
-+// appendOp() Append a new instruction onto the compiled pattern
-+// Includes error checking, limiting the size of the
-+// pattern to lengths that can be represented in the
-+// 24 bit operand field of an instruction.
-+//
-+//------------------------------------------------------------------------------
-+void RegexCompile::appendOp(int32_t op) {
-+ if (U_FAILURE(*fStatus)) {
-+ return;
-+ }
-+ fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ if ((fRXPat->fCompiledPat->size() > 0x00fffff0) && U_SUCCESS(*fStatus)) {
-+ error(U_REGEX_PATTERN_TOO_BIG);
-+ }
-+}
-+
-+void RegexCompile::appendOp(int32_t type, int32_t val) {
-+ appendOp(buildOp(type, val));
-+}
-
-
-@@ -1908,5 +1887,5 @@
- U_ASSERT(where>0 && where < code->size());
-
-- int32_t nop = URX_BUILD(URX_NOP, 0);
-+ int32_t nop = buildOp(URX_NOP, 0);
- code->insertElementAt(nop, where, *fStatus);
-
-@@ -1929,5 +1908,5 @@
- // needs to be incremented to adjust for the insertion.
- opValue++;
-- op = URX_BUILD(opType, opValue);
-+ op = buildOp(opType, opValue);
- code->setElementAt(op, loc);
- }
-@@ -1953,4 +1932,56 @@
- }
-
-+
-+//------------------------------------------------------------------------------
-+//
-+// allocateData() Allocate storage in the matcher's static data area.
-+// Return the index for the newly allocated data.
-+// The storage won't actually exist until we are running a match
-+// operation, but the storage indexes are inserted into various
-+// opcodes while compiling the pattern.
-+//
-+//------------------------------------------------------------------------------
-+int32_t RegexCompile::allocateData(int32_t size) {
-+ if (U_FAILURE(*fStatus)) {
-+ return 0;
-+ }
-+ if (size <= 0 || size > 0x100 || fRXPat->fDataSize < 0) {
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return 0;
-+ }
-+ int32_t dataIndex = fRXPat->fDataSize;
-+ fRXPat->fDataSize += size;
-+ if (fRXPat->fDataSize >= 0x00fffff0) {
-+ error(U_REGEX_INTERNAL_ERROR);
-+ }
-+ return dataIndex;
-+}
-+
-+
-+//------------------------------------------------------------------------------
-+//
-+// allocateStackData() Allocate space in the back-tracking stack frame.
-+// Return the index for the newly allocated data.
-+// The frame indexes are inserted into various
-+// opcodes while compiling the pattern, meaning that frame
-+// size must be restricted to the size that will fit
-+// as an operand (24 bits).
-+//
-+//------------------------------------------------------------------------------
-+int32_t RegexCompile::allocateStackData(int32_t size) {
-+ if (U_FAILURE(*fStatus)) {
-+ return 0;
-+ }
-+ if (size <= 0 || size > 0x100 || fRXPat->fFrameSize < 0) {
-+ error(U_REGEX_INTERNAL_ERROR);
-+ return 0;
-+ }
-+ int32_t dataIndex = fRXPat->fFrameSize;
-+ fRXPat->fFrameSize += size;
-+ if (fRXPat->fFrameSize >= 0x00fffff0) {
-+ error(U_REGEX_PATTERN_TOO_BIG);
-+ }
-+ return dataIndex;
-+}
-
-
-@@ -1996,5 +2027,5 @@
- }
- if (reserveLoc) {
-- int32_t nop = URX_BUILD(URX_NOP, 0);
-+ int32_t nop = buildOp(URX_NOP, 0);
- fRXPat->fCompiledPat->insertElementAt(nop, theLoc, *fStatus);
- }
-@@ -2071,6 +2102,5 @@
-
- int32_t frameVarLocation = URX_VAL(captureOp);
-- int32_t endCaptureOp = URX_BUILD(URX_END_CAPTURE, frameVarLocation);
-- fRXPat->fCompiledPat->addElement(endCaptureOp, *fStatus);
-+ appendOp(URX_END_CAPTURE, frameVarLocation);
- }
- break;
-@@ -2083,6 +2113,5 @@
- U_ASSERT(URX_TYPE(stoOp) == URX_STO_SP);
- int32_t stoLoc = URX_VAL(stoOp);
-- int32_t ldOp = URX_BUILD(URX_LD_SP, stoLoc);
-- fRXPat->fCompiledPat->addElement(ldOp, *fStatus);
-+ appendOp(URX_LD_SP, stoLoc);
- }
- break;
-@@ -2093,6 +2122,5 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LA_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LA_END, dataLoc);
- }
- break;
-@@ -2104,10 +2132,7 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LA_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_BACKTRACK, 0);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LA_END, dataLoc);
-+ appendOp(URX_BACKTRACK, 0);
-+ appendOp(URX_LA_END, dataLoc);
-
- // Patch the URX_SAVE near the top of the block.
-@@ -2116,5 +2141,5 @@
- U_ASSERT(URX_TYPE(saveOp) == URX_STATE_SAVE);
- int32_t dest = fRXPat->fCompiledPat->size()-1;
-- saveOp = URX_BUILD(URX_STATE_SAVE, dest);
-+ saveOp = buildOp(URX_STATE_SAVE, dest);
- fRXPat->fCompiledPat->setElementAt(saveOp, fMatchOpenParen);
- }
-@@ -2129,8 +2154,6 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LB_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LB_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-- op = URX_BUILD(URX_LA_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LB_END, dataLoc);
-+ appendOp(URX_LA_END, dataLoc);
-
- // Determine the min and max bounds for the length of the
-@@ -2168,6 +2191,5 @@
- U_ASSERT(URX_TYPE(startOp) == URX_LB_START);
- int32_t dataLoc = URX_VAL(startOp);
-- int32_t op = URX_BUILD(URX_LBN_END, dataLoc);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(URX_LBN_END, dataLoc);
-
- // Determine the min and max bounds for the length of the
-@@ -2194,5 +2216,5 @@
- // Insert the pattern location to continue at after a successful match
- // as the last operand of the URX_LBN_CONT
-- op = URX_BUILD(URX_RELOC_OPRND, fRXPat->fCompiledPat->size());
-+ int32_t op = buildOp(URX_RELOC_OPRND, fRXPat->fCompiledPat->size());
- fRXPat->fCompiledPat->setElementAt(op, fMatchOpenParen-1);
- }
-@@ -2235,5 +2257,5 @@
- {
- // Set of no elements. Always fails to match.
-- fRXPat->fCompiledPat->addElement(URX_BUILD(URX_BACKTRACK, 0), *fStatus);
-+ appendOp(URX_BACKTRACK, 0);
- delete theSet;
- }
-@@ -2256,6 +2278,5 @@
- int32_t setNumber = fRXPat->fSets->size();
- fRXPat->fSets->addElement(theSet, *fStatus);
-- int32_t setOp = URX_BUILD(URX_SETREF, setNumber);
-- fRXPat->fCompiledPat->addElement(setOp, *fStatus);
-+ appendOp(URX_SETREF, setNumber);
- }
- }
-@@ -2296,11 +2317,8 @@
- // +1 --> Input index (for breaking non-progressing loops)
- // (Only present if unbounded upper limit on loop)
-- int32_t counterLoc = fRXPat->fFrameSize;
-- fRXPat->fFrameSize++;
-- if (fIntervalUpper < 0) {
-- fRXPat->fFrameSize++;
-- }
--
-- int32_t op = URX_BUILD(InitOp, counterLoc);
-+ int32_t dataSize = fIntervalUpper < 0 ? 2 : 1;
-+ int32_t counterLoc = allocateStackData(dataSize);
-+
-+ int32_t op = buildOp(InitOp, counterLoc);
- fRXPat->fCompiledPat->setElementAt(op, topOfBlock);
-
-@@ -2310,5 +2328,5 @@
- // position to move.
- int32_t loopEnd = fRXPat->fCompiledPat->size();
-- op = URX_BUILD(URX_RELOC_OPRND, loopEnd);
-+ op = buildOp(URX_RELOC_OPRND, loopEnd);
- fRXPat->fCompiledPat->setElementAt(op, topOfBlock+1);
-
-@@ -2319,6 +2337,5 @@
- // Apend the CTR_LOOP op. The operand is the location of the CTR_INIT op.
- // Goes at end of the block being looped over, so just append to the code so far.
-- op = URX_BUILD(LoopOp, topOfBlock);
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ appendOp(LoopOp, topOfBlock);
-
- if ((fIntervalLow & 0xff000000) != 0 ||
-@@ -2373,5 +2390,5 @@
- int32_t endOfSequenceLoc = fRXPat->fCompiledPat->size()-1
- + fIntervalUpper + (fIntervalUpper-fIntervalLow);
-- int32_t saveOp = URX_BUILD(URX_STATE_SAVE, endOfSequenceLoc);
-+ int32_t saveOp = buildOp(URX_STATE_SAVE, endOfSequenceLoc);
- if (fIntervalLow == 0) {
- insertOp(topOfBlock);
-@@ -2386,11 +2403,8 @@
- int32_t i;
- for (i=1; i<fIntervalUpper; i++ ) {
-- if (i == fIntervalLow) {
-- fRXPat->fCompiledPat->addElement(saveOp, *fStatus);
-- }
-- if (i > fIntervalLow) {
-- fRXPat->fCompiledPat->addElement(saveOp, *fStatus);
-- }
-- fRXPat->fCompiledPat->addElement(op, *fStatus);
-+ if (i >= fIntervalLow) {
-+ appendOp(saveOp);
-+ }
-+ appendOp(op);
- }
- return TRUE;
-@@ -3612,5 +3626,5 @@
- U_ASSERT(operandAddress>=0 && operandAddress<deltas.size());
- int32_t fixedOperandAddress = operandAddress - deltas.elementAti(operandAddress);
-- op = URX_BUILD(opType, fixedOperandAddress);
-+ op = buildOp(opType, fixedOperandAddress);
- fRXPat->fCompiledPat->setElementAt(op, dst);
- dst++;
-@@ -3627,5 +3641,5 @@
- }
- where = fRXPat->fGroupMap->elementAti(where-1);
-- op = URX_BUILD(opType, where);
-+ op = buildOp(opType, where);
- fRXPat->fCompiledPat->setElementAt(op, dst);
- dst++;
-@@ -3979,5 +3993,5 @@
- //
- // scanNamedChar
-- // Get a UChar32 from a \N{UNICODE CHARACTER NAME} in the pattern.
-+// Get a UChar32 from a \N{UNICODE CHARACTER NAME} in the pattern.
- //
- // The scan position will be at the 'N'. On return
-Index: /icu/trunk/source/i18n/regexcmp.h
-===================================================================
---- /icu/trunk/source/i18n/regexcmp.h (revision 36800)
-+++ /icu/trunk/source/i18n/regexcmp.h (revision 36801)
-@@ -105,4 +105,11 @@
- void insertOp(int32_t where); // Open up a slot for a new op in the
- // generated code at the specified location.
-+ void appendOp(int32_t op); // Append a new op to the compiled pattern.
-+ void appendOp(int32_t type, int32_t val); // Build & append a new op to the compiled pattern.
-+ int32_t buildOp(int32_t type, int32_t val); // Construct a new pcode instruction.
-+ int32_t allocateData(int32_t size); // Allocate space in the matcher data area.
-+ // Return index of the newly allocated data.
-+ int32_t allocateStackData(int32_t size); // Allocate space in the match back-track stack frame.
-+ // Return offset index in the frame.
- int32_t minMatchLength(int32_t start,
- int32_t end);
-Index: /icu/trunk/source/i18n/regeximp.h
-===================================================================
---- /icu/trunk/source/i18n/regeximp.h (revision 36800)
-+++ /icu/trunk/source/i18n/regeximp.h (revision 36801)
-@@ -1,4 +1,4 @@
- //
--// Copyright (C) 2002-2013 International Business Machines Corporation
-+// Copyright (C) 2002-2014 International Business Machines Corporation
- // and others. All rights reserved.
- //
-@@ -242,5 +242,4 @@
- // Convenience macros for assembling and disassembling a compiled operation.
- //
--#define URX_BUILD(type, val) (int32_t)((type << 24) | (val))
- #define URX_TYPE(x) ((uint32_t)(x) >> 24)
- #define URX_VAL(x) ((x) & 0xffffff)
-Index: /icu/trunk/source/test/intltest/regextst.cpp
-===================================================================
---- /icu/trunk/source/test/intltest/regextst.cpp (revision 36800)
-+++ /icu/trunk/source/test/intltest/regextst.cpp (revision 36801)
-@@ -145,4 +145,7 @@
- if (exec) TestBug11049();
- break;
-+ case 25: name = "TestBug11371";
-+ if (exec) TestBug11371();
-+ break;
- default: name = "";
- break; //needed to end loop
-@@ -5368,4 +5371,47 @@
-
-
-+void RegexTest::TestBug11371() {
-+ if (quick) {
-+ logln("Skipping test. Runs in exhuastive mode only.");
-+ return;
-+ }
-+ UErrorCode status = U_ZERO_ERROR;
-+ UnicodeString patternString;
-+
-+ for (int i=0; i<8000000; i++) {
-+ patternString.append(UnicodeString("()"));
-+ }
-+ LocalPointer<RegexPattern> compiledPat(RegexPattern::compile(patternString, 0, status));
-+ if (status != U_REGEX_PATTERN_TOO_BIG) {
-+ errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+ __FILE__, __LINE__, u_errorName(status));
-+ }
-+
-+ status = U_ZERO_ERROR;
-+ patternString = "(";
-+ for (int i=0; i<20000000; i++) {
-+ patternString.append(UnicodeString("A++"));
-+ }
-+ patternString.append(UnicodeString("){0}B++"));
-+ LocalPointer<RegexPattern> compiledPat2(RegexPattern::compile(patternString, 0, status));
-+ if (status != U_REGEX_PATTERN_TOO_BIG) {
-+ errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+ __FILE__, __LINE__, u_errorName(status));
-+ }
-+
-+ // Pattern with too much string data, such that string indexes overflow operand data field size
-+ // in compiled instruction.
-+ status = U_ZERO_ERROR;
-+ patternString = "";
-+ while (patternString.length() < 0x00ffffff) {
-+ patternString.append(UnicodeString("stuff and things dont you know, these are a few of my favorite strings\n"));
-+ }
-+ patternString.append(UnicodeString("X? trailing string"));
-+ LocalPointer<RegexPattern> compiledPat3(RegexPattern::compile(patternString, 0, status));
-+ if (status != U_REGEX_PATTERN_TOO_BIG) {
-+ errln("File %s, line %d expected status=U_REGEX_PATTERN_TOO_BIG; got %s.",
-+ __FILE__, __LINE__, u_errorName(status));
-+ }
-+}
-
- #endif /* !UCONFIG_NO_REGULAR_EXPRESSIONS */
-Index: /icu/trunk/source/test/intltest/regextst.h
-===================================================================
---- /icu/trunk/source/test/intltest/regextst.h (revision 36800)
-+++ /icu/trunk/source/test/intltest/regextst.h (revision 36801)
-@@ -51,4 +51,5 @@
- virtual void TestCaseInsensitiveStarters();
- virtual void TestBug11049();
-+ virtual void TestBug11371();
-
- // The following functions are internal to the regexp tests.
diff --git a/dev-libs/icu/icu-54.1-r1.ebuild b/dev-libs/icu/icu-54.1-r1.ebuild deleted file mode 100644 index 3cf83effa2de..000000000000 --- a/dev-libs/icu/icu-54.1-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal - -DESCRIPTION="International Components for Unicode" -HOMEPAGE="http://www.icu-project.org/" -SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz" - -LICENSE="BSD" - -SLOT="0/54a" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="debug doc examples static-libs" - -DEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen[dot] - ) -" - -S="${WORKDIR}/${PN}/source" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/icu-config -) - -src_prepare() { - local variable - - epatch "${FILESDIR}/${PN}-remove-bashisms.patch" - epatch "${FILESDIR}/${P}-CVE-2014-9654.patch" - epatch_user - - # Disable renaming as it is stupind thing to do - sed -i \ - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \ - common/unicode/uconfig.h || die - - # Fix linking of icudata - sed -i \ - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \ - config/mh-linux || die - - # Append doxygen configuration to configure - sed -i \ - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \ - configure.ac || die - - eautoreconf -} - -src_configure() { - # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard. - append-cxxflags -std=gnu++98 - - if tc-is-cross-compiler; then - mkdir "${WORKDIR}"/host || die - pushd "${WORKDIR}"/host >/dev/null || die - - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \ - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \ - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \ - "${S}"/configure --disable-renaming --disable-debug \ - --disable-samples --enable-static || die - emake - - popd >/dev/null || die - fi - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myeconfargs=( - --disable-renaming - --disable-samples - $(use_enable debug) - $(use_enable static-libs static) - ) - - multilib_is_native_abi && myeconfargs+=( - $(use_enable examples samples) - ) - tc-is-cross-compiler && myeconfargs+=( - --with-cross-build="${WORKDIR}"/host - ) - - # icu tries to use clang by default - tc-export CC CXX - - ECONF_SOURCE=${S} \ - econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen -u Doxyfile || die - doxygen Doxyfile || die - fi -} - -multilib_src_test() { - # INTLTEST_OPTS: intltest options - # -e: Exhaustive testing - # -l: Reporting of memory leaks - # -v: Increased verbosity - # IOTEST_OPTS: iotest options - # -e: Exhaustive testing - # -v: Increased verbosity - # CINTLTST_OPTS: cintltst options - # -e: Exhaustive testing - # -v: Increased verbosity - emake -j1 VERBOSE="1" check -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use doc; then - dohtml -p api -r doc/html/ - fi -} - -multilib_src_install_all() { - einstalldocs - dohtml ../readme.html -} diff --git a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild index 850c54636040..1d6e162b5965 100644 --- a/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild +++ b/dev-ml/camlp4/camlp4-4.02.1_p3.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2-with-linking-exception" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="+ocamlopt" DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]" diff --git a/dev-ml/findlib/findlib-1.5.6.ebuild b/dev-ml/findlib/findlib-1.5.6.ebuild index 5a87fbb32591..0de266bf85d8 100644 --- a/dev-ml/findlib/findlib-1.5.6.ebuild +++ b/dev-ml/findlib/findlib-1.5.6.ebuild @@ -14,7 +14,7 @@ IUSE="doc +ocamlopt tk" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" DEPEND=">=dev-lang/ocaml-4.02.1:=[ocamlopt?] tk? ( dev-ml/labltk:= )" diff --git a/dev-ml/labltk/labltk-8.06.0.ebuild b/dev-ml/labltk/labltk-8.06.0.ebuild index 75857bae0fed..72386d87a1a8 100644 --- a/dev-ml/labltk/labltk-8.06.0.ebuild +++ b/dev-ml/labltk/labltk-8.06.0.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1455/${P}.tar.gz" LICENSE="QPL-1.0 LGPL-2" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="+ocamlopt X" RDEPEND=">=dev-lang/tk-8.0.3 diff --git a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild index ee694821688b..8ebc7be8e1da 100644 --- a/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1.ebuild +++ b/dev-ml/ocaml-ctypes/ocaml-ctypes-0.4.1-r1.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="test" RDEPEND=" - >=dev-lang/ocaml-4:=[ocamlopt] + >=dev-lang/ocaml-4.02:=[ocamlopt] virtual/libffi " DEPEND="${RDEPEND} diff --git a/dev-perl/SDL/Manifest b/dev-perl/SDL/Manifest index b8dda29daf66..9eda14849dee 100644 --- a/dev-perl/SDL/Manifest +++ b/dev-perl/SDL/Manifest @@ -1,2 +1,3 @@ DIST SDL-2.540.tar.gz 2490785 SHA256 031866be84e6bbd7bb082aed26265ad64f84dc867db5239476921746a41e6a1f SHA512 6c85ea179174415da40fe20f27086626b56570d8dbb6416957fb3236550d27ad893f171c7aedf7c6cda2ca6f2078dfad5d8813e428b49c920c1f8487416193b3 WHIRLPOOL 1cf79640cf56237f7ed439cd2c13ef60e4978762867495d50ad7db06f75685022fb4409265ef4243bdb688c467eb66acbeab40e18ee5f688511f1e60a52894f9 DIST SDL-2.544.tar.gz 2487263 SHA256 3878d7171c7fb34b5d35f9ef3883e532fb44188c666f7492ce2bf14f5acad096 SHA512 df8a6cc1f395e143bfa59f08a0c91c640b83463742250f5ea545dcde1d7b3f819dcae03535e62f572ae2d7ad3bbc988b034a1c83a451926f6ec2d5e11ae90ddc WHIRLPOOL 667675bb12a3b6957848de0616f158f36b9f6a14b5ea0af68e3f14839dc8b24a810b51b3f06fc2f3695a060991ae58fdb9f75ba7d221e42c51032752b0592b71 +DIST SDL-2.546.tar.gz 2487053 SHA256 e08aa73550b3f8d32ced0941c3c629f01c4ba4d480fc269e57f3fa6f8df86631 SHA512 7f7015c90a277b91951a2357bcdf7c3f2f930270d211657c903240ed4529f408c200337ca79e4971eb3912da28ebf1e950053ce4d763c2599c701444c618c71a WHIRLPOOL f5afa1710321c08f57da105ed20953bffc9b534f3ab7c5fc6d729285b4e28f2ee58763f82ed88d9e0c2167ce7d8d182c0fc3259c4cb798ce17ffa79e306df54c diff --git a/dev-perl/SDL/SDL-2.546.ebuild b/dev-perl/SDL/SDL-2.546.ebuild new file mode 100644 index 000000000000..8d36ad96d962 --- /dev/null +++ b/dev-perl/SDL/SDL-2.546.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +MODULE_AUTHOR=FROGGS +inherit perl-module + +DESCRIPTION="Simple DirectMedia Layer (SDL) bindings for perl" +HOMEPAGE="http://sdl.perl.org/ http://search.cpan.org/dist/SDL/ https://github.com/PerlGameDev/SDL" + +LICENSE="GPL-2 OFL-1.1" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~x86" +IUSE="" + +RDEPEND=">=dev-perl/Alien-SDL-1.434 + dev-perl/Capture-Tiny + dev-perl/File-ShareDir + dev-perl/Test-Most + dev-perl/Tie-Simple + media-libs/libpng:0 + media-libs/libsdl + media-libs/sdl-gfx + media-libs/sdl-image + media-libs/sdl-mixer + media-libs/sdl-pango + media-libs/sdl-ttf + media-libs/smpeg + media-libs/tiff:0 + virtual/glu + virtual/jpeg:0 + virtual/opengl + virtual/perl-ExtUtils-CBuilder + >=dev-perl/Module-Build-0.400.0 + virtual/perl-Scalar-List-Utils + virtual/perl-Test-Simple" +DEPEND=${RDEPEND} + +SRC_TEST=parallel +mydoc='CHANGELOG README TODO' +PATCHES=( "${FILESDIR}"/${P}-pointer.patch ) diff --git a/dev-perl/SDL/files/SDL-2.546-pointer.patch b/dev-perl/SDL/files/SDL-2.546-pointer.patch new file mode 100644 index 000000000000..b3721ac805e2 --- /dev/null +++ b/dev-perl/SDL/files/SDL-2.546-pointer.patch @@ -0,0 +1,29 @@ +--- ./src/Core/objects/Event.xs.orig 2015-11-02 17:32:54.831820664 -0500 ++++ ./src/Core/objects/Event.xs 2015-11-02 17:33:35.802090936 -0500 +@@ -611,7 +611,7 @@ + char *CLASS = "SDL::JoyHatEvent"; + CODE: + RETVAL = NULL; +- if ( &event != NULL ) ++ if ( event ) + RETVAL = &(event->jhat); + OUTPUT: + RETVAL +@@ -683,7 +683,7 @@ + char *CLASS = "SDL::JoyButtonEvent"; + CODE: + RETVAL = NULL; +- if ( &event != NULL ) ++ if ( event ) + RETVAL = &(event->jbutton); + OUTPUT: + RETVAL +@@ -755,7 +755,7 @@ + char *CLASS = "SDL::ResizeEvent"; + CODE: + RETVAL = NULL; +- if ( &event != NULL ) ++ if ( event ) + RETVAL = &(event->resize); + OUTPUT: + RETVAL diff --git a/dev-php/pecl-mongo/Manifest b/dev-php/pecl-mongo/Manifest index be474332f3cc..cc75cbf3bdd0 100644 --- a/dev-php/pecl-mongo/Manifest +++ b/dev-php/pecl-mongo/Manifest @@ -1,5 +1,6 @@ DIST mongo-1.5.4.tgz 191364 SHA256 19d01417f0c96c10fb9149fc6cb5cc9c1f096e9c6fa31ee4c454f229e33dbd30 SHA512 509eb4f9dc0fd7617ec2f7616b1511266b91b804c0ec04ef5dcfbb9b1a77ec6e9acc3108dfe6b2607f4e97f6091dc2f94456900dcd7e64c85e2f754aafb65c05 WHIRLPOOL 4807844725f6221d130ec30c3ab47fc9da25286ce039568c58332d63412a73a663cb713dd346095acc5d6c539ac0e6c0cdbae80ad6582ef1473a5dc23fa24edf DIST mongo-1.5.6.tgz 193219 SHA256 939231c5129176f5f00ba6275dd34b261e173675b1e81a5fa536a14d05b12b11 SHA512 588915079ea08631ef60fce26bd86a0596003900b75c11af7935e57aa418220e21197aff4617f79808a5ee2bc0d74aba031f54f05be4604c6fc94ce146823c10 WHIRLPOOL c1c922750fa272cc2565d2377b65f5e25b2cb9e55f19abe94c34661e93d62b4162a8a18ef53b71b4c8e653778cc0d837930819b8ed79c6bbfd9690b35801f550 +DIST mongo-1.6.11.tgz 209141 SHA256 cd180ae35f537a199d374a3105106ee5a2b0cab618b12f6221e4c985c28955ac SHA512 82c668e25fd68c6a7982f15fced06c72d87deab5b587ebd66f3d78f59d9fc9c94467a37e355adffd98a347786effd9eda3e1104fc89c85c31947fd6786cbb1e8 WHIRLPOOL 3a4e181c3cd505d25fa18251d5d866e3f22535caa8213f90bb08adc803b527fc7ae0e0f9557a110dbfcea0717d5550cf2e1592be9e745f337675f35aaba08176 DIST mongo-1.6.2.tgz 204061 SHA256 b9a1319910a3d91af94aec46b9dd0021e5b2504b199c60cc8b6075f8d3d78e7b SHA512 01118fd8f227c220c9c29749687cc33a6a56af1b8ed03f72e966d2ce4fd4e23048c6d0576d3c619b4e9e7c690892a05c665970bf8592170a8cb569a84094dd9d WHIRLPOOL cbef6dd822ef59301c4e534e4fe8a07bebdfbdf02f24b279ddf1c72c9ed27a5fafa81e9c20beb6687d049663ce2cf65777715d2e4c28aee65e848254ae0857c1 DIST mongo-1.6.3.tgz 204130 SHA256 53620808eaf0c3dc7537162984354b45b3c90cbaaa36b7b23e0bf650051e77c3 SHA512 e15cdcbfcaef4793b78011435b94bd7de7ef38441b7ef55dc73214e0f29ce6d5312b7881f15d3514143c848c8894c3dd7473b608665ec87a8c6c5a89e5f6f556 WHIRLPOOL bc03929df2490ad72b7eeaa30889537c5f07fac2620ff8bc24795dad55b915d7f90102a4c4d55d300d862e95fb37f17d29d6b887f721f5f9084f074e4b2fd9f0 DIST mongo-1.6.9.tgz 208955 SHA256 b8213e0f08873f1455b2c7e8bfb5f33405afbcd5ce598d81b5f5c49556114581 SHA512 0a649ef67450a795a2fd8fc34d927e640bc7ecde5a1885b581c967f8adb61429d864cd993939fa7299dc35edd58d13a28562e71a0287a754f9fd04f2ac1643de WHIRLPOOL b2c1d6adc08979520ad5d9b6ae1110c2bb4a5209be0074558290d1abfa27906ea0c446d8c0eaa784c3c77a2432ef58bfd7843a863ab541e385ee0959877ed06b diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild new file mode 100644 index 000000000000..c0b16c41deba --- /dev/null +++ b/dev-php/pecl-mongo/pecl-mongo-1.6.11.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PHP_EXT_NAME="mongo" +USE_PHP="php5-4 php5-5 php5-6" +DOCS="README.md" + +inherit php-ext-pecl-r2 + +DESCRIPTION="Legacy MongoDB database driver for PHP" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" diff --git a/dev-php/smarty-docs/Manifest b/dev-php/smarty-docs/Manifest deleted file mode 100644 index a547591db2e4..000000000000 --- a/dev-php/smarty-docs/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST Smarty-2.6.14-docs.tar.gz 136235 SHA256 50d92a5fe2ff2a77668de36de5d9bff7a021892aa66e31ff660a89240edb6dc3 SHA512 2389db876bd419bbf7c96e37a818108106364a94e82fb1286265829c4444038eae01de5642f7c1d29d4faed9209e184fe8abdc8ed3de7a32a3b3717e80f02b69 WHIRLPOOL b4d478df28ab17e641a1348540572bc5f750ce42f556f2c0f6f13878e1a989610f9bbde18b356e502aebacc29ee9632122bb287ba1b2eccc00e71c56d3bbc950 -DIST smarty-docs-3.0-en.pdf 1167021 SHA256 13dbe6e3eb052e6bf1ce3f2b1b014c54977cbd51df7b8c0ddd7c5a554537d0d2 SHA512 2bdf77e088d6e2e2fabf84449b2ca5c70e706cf433751da0b1fd130ad74512d82fd66d9395140969b69d9e9f924cfd635919f51ea798f561d4994f02d6139683 WHIRLPOOL 7113f9bba2ccb2b0f5c96666caa774b1d4bf8eb33e0f3125602bdc3a69f9af5b995bd17f8f8cc87cca848c7e2af743a781beece2348c127908c631303eba647a -DIST smarty-docs-3.0-en.zip 344408 SHA256 1bdf02a6fcb02aa4faca4b42b6a32efa76361e659c2c1cd7357e03a25cc47af4 SHA512 22f54e3fc895b5abe7c08d28be19f1dabe050d0afbcec0d5b86b72173bc44994d62e4d589b7103acb66d79a8a7a7e3ab7d391106b8655b9b1334403690c053b5 WHIRLPOOL 8548cf10ee6913c4aea65e8a91fd70764cfbf05a17256740cf8724c9a54ba321d7a59a3a8e1fdfc0dc4a3cd0213789ebde63e54260646de9a53399d9e889a76b diff --git a/dev-php/smarty-docs/metadata.xml b/dev-php/smarty-docs/metadata.xml deleted file mode 100644 index b821fbacd809..000000000000 --- a/dev-php/smarty-docs/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>php</herd> - <use> - <flag name="html">Install the documentation in HTML format</flag> - <flag name="pdf">Install the documentation in PDF format</flag> - </use> -</pkgmetadata> diff --git a/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild b/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild deleted file mode 100644 index d13a72f7dd5d..000000000000 --- a/dev-php/smarty-docs/smarty-docs-2.6.14.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86" - -MY_P="Smarty-${PV}-docs" - -DESCRIPTION="Documentation for Smarty, a template engine for PHP" -HOMEPAGE="http://smarty.php.net/docs.php" -SRC_URI="http://smarty.php.net/distributions/manual/en/${MY_P}.tar.gz" -LICENSE="LGPL-2.1" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}/manual" - -src_install() { - dohtml -r . -} diff --git a/dev-php/smarty-docs/smarty-docs-3.0.ebuild b/dev-php/smarty-docs/smarty-docs-3.0.ebuild deleted file mode 100644 index 9ed7df437cac..000000000000 --- a/dev-php/smarty-docs/smarty-docs-3.0.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=4 - -KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="pdf html" -DESCRIPTION="Documentation for Smarty, a template engine for PHP" -HOMEPAGE="http://www.smarty.net/documentation" -SRC_URI="html? ( http://www.smarty.net/files/docs/manual-en-${PV}.zip -> ${P}-en.zip ) - pdf? ( http://www.smarty.net/files/docs/manual-en-${PV}.pdf -> ${P}-en.pdf )" - -LANGS="en" - -for X in ${LANGS}; do - [[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? ( - html? ( http://www.smarty.net/files/docs/manual-${X}-${PV}.zip -> ${P}-${X}.zip ) - pdf? ( http://www.smarty.net/files/docs/manual-${X}-${PV}.pdf -> ${P}-${X}.pdf ) )" - IUSE="${IUSE} linguas_${X}" -done - -LICENSE="LGPL-2.1" -SLOT="0" - -DEPEND="html? ( app-arch/unzip )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="|| ( html pdf )" - -src_unpack() { - mkdir -p "${S}" - - if use html; then - mkdir "${S}"/html - pushd "${S}"/html > /dev/null - - unpack ${P}-en.zip - - for X in ${LANGS}; do - if [[ ${X} != "en" ]] && use linguas_${X}; then - unpack ${P}-${X}.zip - fi - done - - popd > /dev/null - fi -} - -src_install() { - if use html; then - dohtml -r html/* - fi - - if use pdf; then - docinto pdf - dodoc "${DISTDIR}"/${P}-*.pdf - fi -} diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild index f415ff9239ff..6e84b2090268 100644 --- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild +++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="test" RDEPEND=" @@ -25,8 +25,11 @@ DEPENDS="${RDEPEND} test? ( dev-python/pytest[${PYTHON_USEDEP}] ) " +# Not included +RESTRICT=test + python_test() { - py.test -v || die + py.test -v -v || die } pkg_postinst() { diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest index f0df1af0adf9..15db42a3eee1 100644 --- a/dev-python/alabaster/Manifest +++ b/dev-python/alabaster/Manifest @@ -1,6 +1 @@ -DIST alabaster-0.6.0.tar.gz 11086 SHA256 86423a9d10cff61524df31cba430e9beff4829d49d1334fa836f319eea1f8fdf SHA512 89946c37e069860791a0429ea183619d8052e661d2f5ded906456ca6b7fabe66a9f222b18f3f089d1a34929c0001bd2dd255b8c593d2acf733c4e409771372e0 WHIRLPOOL 712e39761cae5ec2e76ccce90a58b61880159991cf7663456dcf1c10208df6aef8e35a1a478b0a12219f7333a8ac96bb543509bf14fe029fda93b0a36cc2667b -DIST alabaster-0.6.3.tar.gz 11749 SHA256 30d72e732d61f3ac74bb8bd6a2b063ec7b0522b00bfef979dce4435f7982439e SHA512 c9d102884eca20063da8929dbbd030faa3e86c7f8aeb4e72f9f7dcccbf94334efe2de0143939d8fcb8e79afbbfe6922cedc9621332242d0a482ab4f61b365c0f WHIRLPOOL 15eee45a1e868f765257c6655e33adb1c4da807875b704a76f08d760c4b688ffc26567fd8e00315f6cabbf45e7d82d7d968ccdef83d21e1b1339ed8f5e0ac4e7 -DIST alabaster-0.7.2.tar.gz 15024 SHA256 f8f436a350e37607a3a3d333b6c2d9baf3320cd661e72e95ee0e3037ac7a3157 SHA512 1a1b2c7f76b2c93042044c869e376512bda975765497186908520cba314129bb3ad34d39ab365105331d696b54eeae3094e320c2cb6429ebbd30a2019157b5e3 WHIRLPOOL 532da1cee88e9eedbb53acc263031ecbc796d90ea11075fc02108329b416c6a516ae7681b5ce7970d6e094dc836ed40f050bc75c8966b4e611b50f9af015d1b1 -DIST alabaster-0.7.4.tar.gz 15183 SHA256 ce77e2fdbaabaae393ffce2a6252a0a666e3977c6c2fa1c48c4ded0569785951 SHA512 42d7939b49b843611f6fe8be8b8c5f02cda9a3bb81b27a60c7764ff894d40a4a74deeadf183b3a23631100e925c76ce2cb3f8b479ce9c17ae279d5f720cf26af WHIRLPOOL e07b8cb114421463c105f9ec8eb4a6ffe6cdd1bd27eccdb36348e22f61fafb18d9b00eb5db1e4238897e8aec328840ec8a4ca259dce9f3fe2a1bb5ea2a9fb4fd -DIST alabaster-0.7.5.tar.gz 16204 SHA256 8022f269eba3aefd390b927ac740ab1da7af15838e1c90caed0e66370eef8fd3 SHA512 abe51a04224163cd834609dd3a07710f12ec7c52e0859f25327e8067db27a460d723d340c25f8f2440f92c9ba2a968e021993a07bb8faef093d6af0a6209a4c8 WHIRLPOOL 1838aa91704b5c533847127052170731c2aad786c791c31a53d675fe95bc80fa764c595b272d9e4a3a01e646f533752320d2029057f794b3368ac1242e9aac89 DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812 diff --git a/dev-python/alabaster/alabaster-0.6.0.ebuild b/dev-python/alabaster/alabaster-0.6.0.ebuild deleted file mode 100644 index 42b190a34df6..000000000000 --- a/dev-python/alabaster/alabaster-0.6.0.ebuild +++ /dev/null @@ -1,18 +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_3,3_4} pypy ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.6.3.ebuild b/dev-python/alabaster/alabaster-0.6.3.ebuild deleted file mode 100644 index af905cf4f0e6..000000000000 --- a/dev-python/alabaster/alabaster-0.6.3.ebuild +++ /dev/null @@ -1,18 +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_3,3_4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="amd64 x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.2.ebuild b/dev-python/alabaster/alabaster-0.7.2.ebuild deleted file mode 100644 index fe40f4500105..000000000000 --- a/dev-python/alabaster/alabaster-0.7.2.ebuild +++ /dev/null @@ -1,18 +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_3,3_4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.4.ebuild b/dev-python/alabaster/alabaster-0.7.4.ebuild deleted file mode 100644 index 9aa52bdf086a..000000000000 --- a/dev-python/alabaster/alabaster-0.7.4.ebuild +++ /dev/null @@ -1,19 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.5.ebuild b/dev-python/alabaster/alabaster-0.7.5.ebuild deleted file mode 100644 index 9aa52bdf086a..000000000000 --- a/dev-python/alabaster/alabaster-0.7.5.ebuild +++ /dev/null @@ -1,19 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="A configurable sidebar-enabled Sphinx theme" -HOMEPAGE="https://github.com/bitprophet/alabaster" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" -SLOT="0" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/alabaster/alabaster-0.7.6.ebuild b/dev-python/alabaster/alabaster-0.7.6.ebuild index e946d925470b..c6467fd0053e 100644 --- a/dev-python/alabaster/alabaster-0.7.6.ebuild +++ b/dev-python/alabaster/alabaster-0.7.6.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/bitprophet/alabaster" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" SLOT="0" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/appdirs/appdirs-1.4.0.ebuild b/dev-python/appdirs/appdirs-1.4.0.ebuild index 3460ca2d489d..630aa3f32298 100644 --- a/dev-python/appdirs/appdirs-1.4.0.ebuild +++ b/dev-python/appdirs/appdirs-1.4.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" RDEPEND="" diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest index 0c7a81b02920..0c9ea25a1720 100644 --- a/dev-python/certifi/Manifest +++ b/dev-python/certifi/Manifest @@ -1,3 +1 @@ -DIST certifi-14.05.14.tar.gz 168608 SHA256 1e1bcbacd6357c151ae37cf0290dcc809721d32ce21fd6b7339568f3ddef1b69 SHA512 5edba0cc432c27212e31085fb3c2f2ded6fa177d716116111517c25b980d9fc206a9a6d47e2c001762e951ff50203b269d0eb245a039df20188b1136f3b700b2 WHIRLPOOL 54c3f7a8da25693f5df890c5bc348242350a7a63bc0094d5fbb08a4f89c79fcc3ce0bbf0cdeac7d2dfca5ebe5601a7ae5ec4fef492a6cf9afe6ecf5119d47f8b -DIST certifi-2015.04.28.tar.gz 370682 SHA256 99785e6cf715cdcde59dee05a676e99f04835a71e7ced201ca317401c322ba96 SHA512 c63287d9e0814226a1eb6ea0f6d1a53f0fd88995c0c2541e404efd0c70471fae01cb56ecca5425c6754342c28c96948ba912bd860bf2d336bba95a0b751f8f99 WHIRLPOOL e235b016ca30332359f9172cf907f9372714371efcccf5bc2b82e08538ca1620f6854697201a6a3d1de5d25e74f5b3fede68e3c46255a9cd28b1f87b8dfa97b2 DIST certifi-2015.9.6.2.tar.gz 368588 SHA256 dc3a2b2d9d1033dbf27586366ae61b9d7c44d8c3a6f29694ffcbb0618ea7aea6 SHA512 78166fa708e7f5162bc36c5b552b1c19e316f4f540db5733167730e9d3a7610b90622546b9e49bc539d9d4de543a169046d24fbbcded98b74f68351a91d15f31 WHIRLPOOL 4c1f075ea41d00819325bd49213c39f0af3f7e0393a2ea8b4c6efbfc38e828ee8e6b807da4a43974182a65565c6eed76d491d09f03841c9f96251d15bf19f9b7 diff --git a/dev-python/certifi/certifi-14.05.14.ebuild b/dev-python/certifi/certifi-14.05.14.ebuild deleted file mode 100644 index e0d711a7f31c..000000000000 --- a/dev-python/certifi/certifi-14.05.14.ebuild +++ /dev/null @@ -1,20 +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_3,3_4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="Python package for providing Mozilla's CA Bundle" -HOMEPAGE="http://python-requests.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 x86" -IUSE="" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/certifi/certifi-2015.04.28.ebuild b/dev-python/certifi/certifi-2015.04.28.ebuild deleted file mode 100644 index 1e8ccc5746e8..000000000000 --- a/dev-python/certifi/certifi-2015.04.28.ebuild +++ /dev/null @@ -1,21 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Python package for providing Mozilla's CA Bundle" -HOMEPAGE="http://certifi.io/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild index a9182ffb380a..68f2b27de9eb 100644 --- a/dev-python/certifi/certifi-2015.9.6.2.ebuild +++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/click/click-5.1.ebuild b/dev-python/click/click-5.1.ebuild index b0aa96c7e1c2..b7e064631bc5 100644 --- a/dev-python/click/click-5.1.ebuild +++ b/dev-python/click/click-5.1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="doc examples test" DEPEND=" diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild index 7536aa84c6a6..9e6fa0ed217e 100644 --- a/dev-python/colorama/colorama-0.3.3.ebuild +++ b/dev-python/colorama/colorama-0.3.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="examples" python_install_all() { diff --git a/dev-python/distlib/distlib-0.2.1-r1.ebuild b/dev-python/distlib/distlib-0.2.1-r1.ebuild new file mode 100644 index 000000000000..5f843295eb78 --- /dev/null +++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Distribution utilities" +HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${P}-unbundle.patch +) + +python_prepare_all() { + rm -r \ + distlib/*.exe \ + distlib/_backport \ + tests/test_shutil.py* \ + tests/test_sysconfig.py* || die + + # Broken tests + # 1 fails due to it being sensitive to dictionary ordering + # inconsistency between code and test + sed \ + -e 's:test_dependency_finder:_&:g' \ + -e 's:test_abi:_&:g' \ + -i tests/*py || die + + distutils-r1_python_prepare_all +} + +python_test() { + sed \ + -e '/PIP_AVAILABLE/s:True:False:g' \ + -i tests/*py || die + PYTHONHASHSEED=0 esetup.py test +} diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild index 5bf9fdf746ed..94201d077b7e 100644 --- a/dev-python/distlib/distlib-0.2.1.ebuild +++ b/dev-python/distlib/distlib-0.2.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" SLOT="0" LICENSE="BSD" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" python_test() { diff --git a/dev-python/distlib/files/distlib-0.2.1-unbundle.patch b/dev-python/distlib/files/distlib-0.2.1-unbundle.patch new file mode 100644 index 000000000000..5ee912905602 --- /dev/null +++ b/dev-python/distlib/files/distlib-0.2.1-unbundle.patch @@ -0,0 +1,35 @@ +--- distlib-0.1.9/distlib/compat.py.orig 2014-06-06 09:58:21.317560756 +0200 ++++ distlib-0.1.9/distlib/compat.py 2014-06-06 09:58:29.955611427 +0200 +@@ -17,7 +17,7 @@ if sys.version_info[0] < 3: + from types import FileType as file_type + import __builtin__ as builtins + import ConfigParser as configparser +- from ._backport import shutil ++ import shutil + from urlparse import urlparse, urlunparse, urljoin, urlsplit, urlunsplit + from urllib import (urlretrieve, quote as _quote, unquote, url2pathname, + pathname2url, ContentTooShortError, splittype) +@@ -267,7 +267,7 @@ except ImportError: # pragma: no cover + try: + import sysconfig + except ImportError: # pragma: no cover +- from ._backport import sysconfig ++ import sysconfig + + try: + callable = callable +--- distlib-0.1.9/setup.py.orig 2014-06-06 10:19:13.971997156 +0200 ++++ distlib-0.1.9/setup.py 2014-06-06 10:19:20.012034150 +0200 +@@ -62,12 +62,7 @@ distutils.core.setup( + platforms='any', + packages=[ + 'distlib', +- 'distlib._backport', + ], +- package_data={ +- 'distlib._backport': ['sysconfig.cfg'], +- 'distlib': ['t32.exe', 't64.exe', 'w32.exe', 'w64.exe'], +- }, + cmdclass={ + 'test': TestCommand, + }, diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest index b120c6251721..33e719f161ee 100644 --- a/dev-python/django-openstack-auth/Manifest +++ b/dev-python/django-openstack-auth/Manifest @@ -1,3 +1,2 @@ -DIST django_openstack_auth-1.1.5.tar.gz 40893 SHA256 ad63e85575caae1107bd05afd8d27b45d4590cc1f6d3b63905959a7c457b1aef SHA512 43a95a1a5b9c24e15d4ff76660a52204c03d6679400632e870ee364c9f7de7b39128cc6acd883cd12abc80cbdfab44a3e3f2a803193eeac7d3e838be39a93ea2 WHIRLPOOL 2515c77ce6aa2c9f3e2860506ae0d5656f3dfda9bf17eb1fba5c307bf477de5aa22a3834b94c053a5f6fc439c9cf2a5b9bbeb7e87bef3bcf3e7739f55b80dd77 DIST django_openstack_auth-1.2.0.tar.gz 75577 SHA256 5ad78e5c92502f1abfb10fd101c023adf74a3e728bd42ed19ffea2185680f9a6 SHA512 793f0763b47574574864c16c9d79787d44c84259304587b5d2b3375de04291c5d200699297960b3b3904b959ceee31f696fef2233659db9b846c6af06fd8c251 WHIRLPOOL 37632e35beb810979ffb7878c9ffed0258a64caf4a80f61050bb054d70b56e09c9f0f13dac2ce339b87ccdcbeba779893c2ce81912b95f50d52a88b947872092 DIST django_openstack_auth-1.3.1.tar.gz 75165 SHA256 99c6e92170656eade430d31f79ddf60e66355ff7b84caf038ab1ecc879cff9ba SHA512 cf9b4a1c526f237a23dadab4a7e6a2bd1f80a8d6d89d9b83f4d0fb6fc4df80aba68ad344662fbeaddeca2ca8ec36856af1074da383368d85d56460ed199609aa WHIRLPOOL b99b9381ce9eb1357939b750a40f86373fcbbe411d90a23e15f2d1e77dcfab45e58ac69e4e774228dc1b0dc3d3a0649e451efc0f271e904a4241b06c80b4d8bd diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild deleted file mode 100644 index 48457ec18278..000000000000 --- a/dev-python/django-openstack-auth/django-openstack-auth-1.1.5.ebuild +++ /dev/null @@ -1,39 +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 ) - -inherit distutils-r1 - -DESCRIPTION="A Django authentication backend for use with the OpenStack Keystone -Identity backend." -HOMEPAGE="http://django_openstack_auth.readthedocs.org/" -SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz" -S="${WORKDIR}/django_openstack_auth-${PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}] - <dev-python/pbr-1.0[${PYTHON_USEDEP}] - test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}] - <dev-python/hacking-0.9[${PYTHON_USEDEP}] - >=dev-python/Babel-1.3[${PYTHON_USEDEP}] - >=dev-python/coverage-3.6[${PYTHON_USEDEP}] - >=dev-python/mox-0.5.3[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - <dev-python/sphinx-1.2[${PYTHON_USEDEP}] - dev-python/oslo-sphinx[${PYTHON_USEDEP}] )" -RDEPEND=">=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}] - >=dev-python/django-1.4[${PYTHON_USEDEP}] - <dev-python/django-1.7[${PYTHON_USEDEP}] - >=dev-python/six-1.5.2[${PYTHON_USEDEP}]" - -python_test() { - "${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed" -} diff --git a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild index 23635efaa7eb..48e1247e1587 100644 --- a/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild +++ b/dev-python/django-openstack-auth/django-openstack-auth-1.2.0.ebuild @@ -7,15 +7,14 @@ PYTHON_COMPAT=( python2_7 python3_3 ) inherit distutils-r1 -DESCRIPTION="A Django authentication backend for use with the OpenStack Keystone -Identity backend." +DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend" HOMEPAGE="http://django_openstack_auth.readthedocs.org/" SRC_URI="mirror://pypi/${PN:0:1}/django_openstack_auth/django_openstack_auth-${PV}.tar.gz" S="${WORKDIR}/django_openstack_auth-${PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest index 666cbb2fbb27..48f03ab8f768 100644 --- a/dev-python/feedparser/Manifest +++ b/dev-python/feedparser/Manifest @@ -1 +1,2 @@ DIST feedparser-5.1.3.tar.bz2 202373 SHA256 7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3 SHA512 6a0374e001295566316ad86a581c875cd367fc6200e30296bf917cdff7fa2a83c05565b747c37079f38755ce94565d56890a995be7ee020d0f9466ee1b7c079b WHIRLPOOL bacb6cf0563ee7feb476ea4b767586cb6fbd649d036f72f18b60330e4b4120ccb1e65a923e121108eecf64ea2343fd7a40dd56d7bf71384ff3f52ad20a59a54b +DIST feedparser-5.2.1.tar.gz 252956 SHA256 bd030652c2d08532c034c27fcd7c85868e7fa3cb2b17f230a44a6bbc92519bf9 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81 WHIRLPOOL 7214fbafa15351d9d759b6d281e5edd4cf38f6285e0a2d788933c1336ab0e66c2587ea341773ed956d7a006e9b09f2f769876690eec9374c9f96b464f2c71ba3 diff --git a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild index 00be3c719602..825382655862 100644 --- a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild +++ b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy ) inherit distutils-r1 eutils DESCRIPTION="Parse RSS and Atom feeds in Python" -HOMEPAGE="https://code.google.com/p/feedparser/ https://pypi.python.org/pypi/feedparser" +HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser" SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2" # sgmllib is licensed under PSF-2. diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild new file mode 100644 index 000000000000..a985e7e9e6b9 --- /dev/null +++ b/dev-python/feedparser/feedparser-5.2.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 eutils + +DESCRIPTION="Parse RSS and Atom feeds in Python" +HOMEPAGE="https://github.com/kurtmckee/feedparser https://pypi.python.org/pypi/feedparser" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +# sgmllib is licensed under PSF-2. +LICENSE="BSD-2 PSF-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="" + +# Tests have issues with chardet installed, and are just kind of buggy. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${P}-sgmllib.patch" +) + +python_prepare_all() { + mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die + distutils-r1_python_prepare_all +} + +python_test() { + cp feedparser/feedparsertest.py "${BUILD_DIR}" || die + ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die + cd "${BUILD_DIR}" || die + if [[ ${EPYTHON} == python3* ]]; then + 2to3 --no-diffs -w -n feedparsertest.py || die + fi + "${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}" +} diff --git a/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch deleted file mode 100644 index 426290370d49..000000000000 --- a/dev-python/feedparser/files/feedparser-5.0.1-sgmllib.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- feedparser/feedparser.py -+++ feedparser/feedparser.py -@@ -135,7 +135,11 @@ - #ACCEPTABLE_URI_SCHEMES = () - - # ---------- required modules (should come with any Python distribution) ---------- --import sgmllib, re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime -+import re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime -+try: -+ import sgmllib -+except ImportError: -+ import _feedparser_sgmllib as sgmllib - try: - from io import BytesIO as _StringIO - except ImportError: ---- setup.py -+++ setup.py -@@ -17,7 +17,7 @@ - download_url = 'http://code.google.com/p/feedparser/', - platforms = ['POSIX', 'Windows'], - package_dir = {'': 'feedparser'}, -- py_modules = ['feedparser'], -+ py_modules = ['feedparser', '_feedparser_sgmllib'], - keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'], - classifiers = [ - 'Development Status :: 5 - Production/Stable', diff --git a/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch new file mode 100644 index 000000000000..714480560e52 --- /dev/null +++ b/dev-python/feedparser/files/feedparser-5.2.1-sgmllib.patch @@ -0,0 +1,78 @@ +From 812793c07d3202d3f5bc39091aec2e7071d000c8 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sun, 1 Jan 2012 19:30:57 +0100 +Subject: [PATCH] Use shipped sgmllib for Python 3.x + +--- + feedparser/feedparser.py | 19 +++---------------- + setup.py | 2 +- + 2 files changed, 4 insertions(+), 17 deletions(-) + +diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py +index 8275c29..9a8a053 100644 +--- a/feedparser/feedparser.py ++++ b/feedparser/feedparser.py +@@ -204,17 +204,9 @@ else: + try: + import sgmllib + except ImportError: +- # This is probably Python 3, which doesn't include sgmllib anymore +- _SGML_AVAILABLE = 0 ++ import _feedparser_sgmllib as sgmllib + +- # Mock sgmllib enough to allow subclassing later on +- class sgmllib(object): +- class SGMLParser(object): +- def goahead(self, i): +- pass +- def parse_starttag(self, i): +- pass +-else: ++if True: + _SGML_AVAILABLE = 1 + + # sgmllib defines a number of module-level regular expressions that are +@@ -2520,9 +2512,6 @@ class _RelativeURIResolver(_BaseHTMLProcessor): + _BaseHTMLProcessor.unknown_starttag(self, tag, attrs) + + def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type): +- if not _SGML_AVAILABLE: +- return htmlSource +- + p = _RelativeURIResolver(baseURI, encoding, _type) + p.feed(htmlSource) + return p.output() +@@ -2803,8 +2792,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor): + + + def _sanitizeHTML(htmlSource, encoding, _type): +- if not _SGML_AVAILABLE: +- return htmlSource + p = _HTMLSanitizer(encoding, _type) + htmlSource = htmlSource.replace('<![CDATA[', '<![CDATA[') + p.feed(htmlSource) +@@ -3890,7 +3877,7 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer + result['bozo'] = 1 + result['bozo_exception'] = feedparser.exc or e + use_strict_parser = 0 +- if not use_strict_parser and _SGML_AVAILABLE: ++ if not use_strict_parser: + feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities) + feedparser.feed(data.decode('utf-8', 'replace')) + result['feed'] = feedparser.feeddata +diff --git a/setup.py b/setup.py +index a4a60fe..8c15451 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ setup( + download_url = 'https://pypi.python.org/pypi/feedparser', + platforms = ['POSIX', 'Windows'], + package_dir = {'': 'feedparser'}, +- py_modules = ['feedparser'], ++ py_modules = ['feedparser', '_feedparser_sgmllib'], + keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'], + classifiers = [ + 'Development Status :: 5 - Production/Stable', +-- +1.7.8.1 + diff --git a/dev-python/fixtures/fixtures-1.4.0.ebuild b/dev-python/fixtures/fixtures-1.4.0.ebuild index af97575a95c0..51cef468516d 100644 --- a/dev-python/fixtures/fixtures-1.4.0.ebuild +++ b/dev-python/fixtures/fixtures-1.4.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="|| ( Apache-2.0 BSD )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test" # nose not listed but provides coverage output of tests diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild index 7fe7deeec924..c406e19b0405 100644 --- a/dev-python/funcsigs/funcsigs-0.4.ebuild +++ b/dev-python/funcsigs/funcsigs-0.4.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=( python2_7 pypy pypy3 ) +PYTHON_COMPAT=( python2_7 pypy ) inherit distutils-r1 diff --git a/dev-python/html5lib/html5lib-0.9999999.ebuild b/dev-python/html5lib/html5lib-0.9999999.ebuild index 9d0148740a9a..a76b5bbf96c5 100644 --- a/dev-python/html5lib/html5lib-0.9999999.ebuild +++ b/dev-python/html5lib/html5lib-0.9999999.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="test" RDEPEND="dev-python/six[${PYTHON_USEDEP}]" diff --git a/dev-python/hypothesis/hypothesis-1.12.0.ebuild b/dev-python/hypothesis/hypothesis-1.12.0.ebuild index f65d7fd3072e..593db2e85e4f 100644 --- a/dev-python/hypothesis/hypothesis-1.12.0.ebuild +++ b/dev-python/hypothesis/hypothesis-1.12.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" RDEPEND="" diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild index 779e9abaec70..5d183f5a5b9e 100644 --- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild +++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="PSF-2" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild index a4bd220b0cb5..193684a50261 100644 --- a/dev-python/linecache2/linecache2-1.0.0.ebuild +++ b/dev-python/linecache2/linecache2-1.0.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild index 1979687a3a4e..07c87a83a7f9 100644 --- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild +++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="doc test" DEPEND=" diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest index 1ba6bf179eb1..8286fb7d0665 100644 --- a/dev-python/markdown/Manifest +++ b/dev-python/markdown/Manifest @@ -1,4 +1,2 @@ -DIST Markdown-2.5.1.tar.gz 288970 SHA256 8f81ed12c18608a502828acb7d318f362c42f4eca97d01e93cadfc52c1e40b73 SHA512 27f0d3909d6aa1e0ae15403da1cdfafcbfd463d7a236e0ea0cf02c55efa8f863c2554d54e20b0d9f58d80502dbf333120431474f16c64883001e5a318866eeb0 WHIRLPOOL 88f76fcb744ad6b8429442de409275c655a85039475d6dab11031a141e148286cc56d7865f590b432bfcf91af4965963989dae9a68a01e6931f367f425f83420 DIST Markdown-2.6.1.tar.gz 298074 SHA256 b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78 WHIRLPOOL 58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6 -DIST Markdown-2.6.2.tar.gz 298231 SHA256 ee17d0d7dc091e645dd48302a2e21301cc68f188505c2069d8635f94554170bf SHA512 a69dabf65187f54d200f59191a149bfe2109f94ffc5d003e15c2e6333c0b5fdeebfc4136842d7be5a15bc903b7a22120a4ccba2722858194c43fd09cd8fbea16 WHIRLPOOL a3c74f150e6e140b0b0500d0694b89b8e6836adef66cd2c14a1ad5ff8d4dc202b35fae8a0c9683e53030fc80792885cd4b22c46729963a683ebbbb5101963dd7 DIST Markdown-2.6.3.tar.gz 301441 SHA256 ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af SHA512 29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee WHIRLPOOL 8d50fa6895a117c081f1ccb5cfc456a297a8ff36e1597add78fbd8acfd4b72f79c617c5bffc790bc7c6d76f7aefef5706b8d8083f4104500f4b5c035aa14546d diff --git a/dev-python/markdown/markdown-2.5.1.ebuild b/dev-python/markdown/markdown-2.5.1.ebuild deleted file mode 100644 index 51866a3c35e0..000000000000 --- a/dev-python/markdown/markdown-2.5.1.ebuild +++ /dev/null @@ -1,45 +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_3,3_4} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN="Markdown" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python implementation of the markdown markup language" -HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test pygments" - -DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] )" -# source cites pytidylib however from testruns it appears optional -RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && esetup.py build_docs -} - -python_test() { - cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die - pushd "${BUILD_DIR}" > /dev/null - "${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}" - popd > /dev/null -} - -python_install_all() { - # make use doc do a doc build - use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/markdown/markdown-2.6.2.ebuild b/dev-python/markdown/markdown-2.6.2.ebuild deleted file mode 100644 index 644d6cf16ddd..000000000000 --- a/dev-python/markdown/markdown-2.6.2.ebuild +++ /dev/null @@ -1,48 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -MY_PN="Markdown" -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python implementation of the markdown markup language" -HOMEPAGE="http://www.freewisdom.org/projects/python-markdown https://pypi.python.org/pypi/Markdown" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="|| ( BSD GPL-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test pygments" - -DEPEND=" - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - )" -# source cites pytidylib however from testruns it appears optional -RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )" - -S="${WORKDIR}/${MY_P}" - -python_compile_all() { - use doc && esetup.py build_docs -} - -python_test() { - cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die - cd "${BUILD_DIR}" || die - "${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}" -} - -python_install_all() { - # make use doc do a doc build - use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/markdown/markdown-2.6.3.ebuild b/dev-python/markdown/markdown-2.6.3.ebuild index c1bcd346fb8d..27f86b1f9435 100644 --- a/dev-python/markdown/markdown-2.6.3.ebuild +++ b/dev-python/markdown/markdown-2.6.3.ebuild @@ -21,7 +21,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="|| ( BSD GPL-2 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test pygments" DEPEND=" diff --git a/dev-python/markdown/metadata.xml b/dev-python/markdown/metadata.xml index 3f4751307c52..50c3f9d83463 100644 --- a/dev-python/markdown/metadata.xml +++ b/dev-python/markdown/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>python</herd> diff --git a/dev-python/matplotlib/matplotlib-1.4.2.ebuild b/dev-python/matplotlib/matplotlib-1.4.2.ebuild index defc79b79f4b..f5b16b1f5680 100644 --- a/dev-python/matplotlib/matplotlib-1.4.2.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.2.ebuild @@ -202,6 +202,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild b/dev-python/matplotlib/matplotlib-1.4.3.ebuild index a31fa3f6d9a7..86adcbf5e7e2 100644 --- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild +++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild @@ -219,6 +219,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild b/dev-python/matplotlib/matplotlib-1.5.0.ebuild index f644ffe5def9..cc6fe7edd615 100644 --- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild +++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild @@ -224,6 +224,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/matplotlib/matplotlib-9999.ebuild b/dev-python/matplotlib/matplotlib-9999.ebuild index 64665e727b18..a62eac5ee1f0 100644 --- a/dev-python/matplotlib/matplotlib-9999.ebuild +++ b/dev-python/matplotlib/matplotlib-9999.ebuild @@ -215,6 +215,7 @@ python_configure() { wrap_setup() { local MPLSETUPCFG=${BUILD_DIR}/setup.cfg export MPLSETUPCFG + unset DISPLAY # Note: remove build... if switching to out-of-source build "${@}" build --build-lib="${BUILD_DIR}"/build/lib diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild index 0ac8f25a6861..b1d0f6501ff3 100644 --- a/dev-python/mock/mock-1.3.0-r1.ebuild +++ b/dev-python/mock/mock-1.3.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="doc test" CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7') diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild index bc3755153129..462db3981964 100644 --- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild +++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="" RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]" diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 6ce4c2583077..6baec64d2f08 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -1,17 +1,10 @@ DIST numpy-1.10.1.tar.gz 4048478 SHA256 8b9f453f29ce96a14e625100d3dcf8926301d36c5f622623bf8820e748510858 SHA512 ea717bac913a8e63bf93822bddbfe7701a3de00051bf3c7020f5e22756987becb5a2f96a6a52a36fc7c2b856815a782e450099688ce86b21fa94b0076b9ef376 WHIRLPOOL 7671368bec55c7f53ffa78a509946acc998e6f4223da4f3429b82a5a38b5e0277a0f89773ec2335f8e46b5c695620a4119af5ab59734184054c31b11841de44b -DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2 -DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398 DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311 -DIST numpy-1.9.0.tar.gz 3962108 SHA256 2745b1d64445da3c29a34450320025c11897ae4af77475f861966e98b2cb1a0f SHA512 dc9fb453367bd429336ed7391c0923d0d3af5f8ab26ef8681bc1a9e934ac28e2c9bc30e11f1026c2ea5710a3c4e27188007ee14b194bfca6a03228fad8f3d2fd WHIRLPOOL 5111f5cbb43bd279587f858196fbe86103abde7e8d6536337af51fe4a8371d39057d9ea75ac73ab501ff5c07c5c6e7e4e62f660ca263181e2fee3e6e61718ba9 -DIST numpy-1.9.1.tar.gz 3978007 SHA256 0075bbe07e30b659ae4415446f45812dc1b96121a493a4a1f8b1ba77b75b1e1c SHA512 8286a55f4bd5f9c16b1252ee64a644fe4a03758d31ef2e16714c2f5c61d96f766fb6ffc98986c58e1db1c2b812a2d10e89eae3442263615e46472418c2d4edd4 WHIRLPOOL 9025fee798b2e0b23af4c5870fd12606de65c91a176e2900ca93ed853767165dfbe7344125aba19a58d031f82880d6347095070ed3585deb8866819c32422751 DIST numpy-1.9.2.tar.gz 3986067 SHA256 325e5f2b0b434ecb6e6882c7e1034cc6cdde3eeeea87dbc482575199a6aeef2a SHA512 70470ebb9afef5dfd0c83ceb7a9d5f1b7a072b1a9b54b04f04f5ed50fbaedd5b4906bd500472268d478f94df9e749a88698b1ff30f2d80258e7f3fec040617d9 WHIRLPOOL 59f5dc52cb95c7ce80fec3a7feac6cfda1d149596bf6d95c18bd8314e31a8df494b2b470c4cc3d8c296c9fc11c718d70d5b9b5344337175ca75496504c0fd201 DIST numpy-1.9.3.tar.gz 3984430 SHA256 c3b74d3b9da4ceb11f66abd21e117da8cf584b63a0efbd01a9b7e91b693fbbd6 SHA512 32531cd8d1480a50812454ef8e3b68c0f84b2a4bc5de0df1457070db7f6fd94cdb50e6479a85fa4d1dc569a10d28f6864d5069fcf2a32fa20fa8803476a3df8c WHIRLPOOL a0235594e793625d5e3cef57956f4710587158885f39d7d1267c9845b12fb1d39fb9987ec095720c2d285c7c726383a15471f3629b739b77186470e2c40ba093 -DIST numpy-html-1.8.0.zip 9779825 SHA256 39e853c1aaa711976333782f465f2579ca66e6698393f6ba79f5cc78317b1203 SHA512 33333c48a3f4d27ccddf6696dce4e346f8729d1f398128b3bfebb8a9d53ded7bb62b63a766319f6e49ba7cf8ca4e1ce252996acd263976ad2990bf9650d71043 WHIRLPOOL 7eea0ad3418c55d6104a4a115fcdcd5eeb291b9fc1237724e10dcbbf95bc7a4a23b519c64976ac405fb4c5abbaae87a6c747f9ad695d08b6326b459ba1fb8a15 DIST numpy-html-1.8.1.zip 9703711 SHA256 f7fc3af4dba7b40deabd1828a86ea2e2eb5b9fa17c7ebddd73ee4cb8625105b1 SHA512 1d52c657931f4eebb5325159444aedd969b201f5098855058f1ef632dc8677372d632291154ebc3db9869cdb8abf7eb820eade1a9edba2d6be1ae918cb38c071 WHIRLPOOL e502b1416bad4b189773ba98035dfbeed0dc251d8f9b76e336450f14e8425caf92d55d2b1c2cc5ef9eb2d33eb2bf7cd55e720c1b265e45539b195fea1d7f046c DIST numpy-html-1.9.1.zip 9839137 SHA256 12a24937f8273fcf79090c99b6c4154a0ecfc378386498cf2afe727ea171407c SHA512 647a6be9f93995aca14185e283a2b412678c6e8080fe4f14e7cc9ee63c28eebb64dea6bbe28f30ef6850a5565dd1e06928fd660ac762e9a91454d309eff96ed4 WHIRLPOOL 68c367fd0416d27b1cf43edf7ca48bc8845c02856bbbacdf63c88fe8bbffd5dd86fb3e5cdea8f669dd78adf7bcc4d184953048783802df323126c1b22baf8e92 -DIST numpy-ref-1.8.0.pdf 5324229 SHA256 49ecb1d768eb48598439cc63058f830ca3522fe1cfeba1a321086e9820ae8911 SHA512 d89314215c4adefa487b3e46b2babeda7739ee193fef821846d4df0089fabf2167b47dd2990b6bd423432f75238547548924622c6f3b9a90a36d578450001eb2 WHIRLPOOL 3bb12c719cbe4734014774f1bfc3f98af544ee2c407adb2e3ee988e2b1035ad0ef711eaa68168656be7b034df2db76c8789daa2940a048b4a6cb3af0bb0eca68 DIST numpy-ref-1.8.1.pdf 5348248 SHA256 973851e66d0d5ab095f444f8aeb966fefe2dd544226395abbb110fc1b60f351d SHA512 340dd8f47430f24fea81bb3a8674e1a58f4290a9d1c5d64bac96d50b31a94a770e78381e42daf8b0a6a90cefe5cafe86b0c89f7cc7635a042a7e85eb74bdbdf5 WHIRLPOOL be13f88bb68944186c564a5c3789daededade240a26e7fb61c980a090249ab3a5b1f40805e97214168fbf0c099fb6b12d981ff313bace572f130023b29e7aaa7 DIST numpy-ref-1.9.1.pdf 5318122 SHA256 3c8e5881a3460e1cc9da95fe2167044e8f832ab8e980c3606d1f353e7ac6dcee SHA512 5171bb22588117a53e0eac355520581f7817a7e7a099ae83bb73f2ac8248a60e139ae9719dc543b44f25ccf8319c9f149fec1bf5aa55d943fad06a8e6da0d9ba WHIRLPOOL 5c99daf3ae2e6bf235aed287682f1b96d5b6afc9d290f544a8baab892b39c9f6dd9f649abe3e103cc90c990d87e4d653d8157d774a8bd35eccc9cc6ac7a870f9 -DIST numpy-user-1.8.0.pdf 408447 SHA256 a8c30360f9e46c63cfdf48fa594971d94d68ce59ece08c13d4acde8b14032cfe SHA512 10293dba45377c6f1024125a49810b01e388eb33a3e8ed75b8ec39c2b93e53878cbe62e6b7adbf1e957dc47ef253e20304afa7d86d798fb5198887cbe618131f WHIRLPOOL 70cc5a5e97a919bb027f92ac87127fb1bc08d06e2a131c4b413837e76d8feab9b65d7dc9e95b6e797d057efb6abf0d2b3e7562ee3cd140b1ff1418bad5475335 DIST numpy-user-1.8.1.pdf 408305 SHA256 be827f2d92ef86c3af7f59c623017e7bc23ee95c64f88e8c9871f3ad1f99b262 SHA512 9e646e89e7e67834fa596e43082b43842d1c59287d22fd8d20c9f0a1d3d56a518a08cc2c036de4972ad0d6d9d3c2f56e2210f76e7244d3f7547b5204d84d3c7c WHIRLPOOL bf4105093b208b35b1914e842821b8d289b46eb28f1fda110643f5970bbfafe801e9d148c5f535b43eba9a23e09d333e3aecd9a55b33e64827883d253477d19a DIST numpy-user-1.9.1.pdf 418111 SHA256 e1f6baed0b73f3d4b106c88924c083f9a519e860c1beb718830bf1aee1892232 SHA512 724302468a8e93daf70d379bb1ee7369953e297c40ea260f080b7aca3c9c81e619a81705bdfb2ea214da5b5325ec2b48e953eceeaa1d60c07593b00c35989f45 WHIRLPOOL f93ed20c5da7b379e3afcafab97c7eb60231ed4f73cebf18184e00b9a8a5a531fa32992f7f28f16d2714b3056c61153c29267c8c6b93cb100e06f53bced1bd6a diff --git a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch b/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch deleted file mode 100644 index 5a68e8e2aa99..000000000000 --- a/dev-python/numpy/files/numpy-1.8.0-f2py-insecure-temporary.patch +++ /dev/null @@ -1,214 +0,0 @@ - numpy/core/tests/test_memmap.py | 34 ++++++++++++++++------------------ - numpy/core/tests/test_multiarray.py | 9 +++------ - numpy/f2py/__init__.py | 22 +++++++++++----------- - numpy/f2py/f2py2e.py | 4 ++-- - numpy/lib/tests/test_io.py | 24 ++++++++++++++++-------- - 5 files changed, 48 insertions(+), 45 deletions(-) - -diff --git a/numpy/core/tests/test_memmap.py b/numpy/core/tests/test_memmap.py -index 6de6319..10e7a08 100644 ---- a/numpy/core/tests/test_memmap.py -+++ b/numpy/core/tests/test_memmap.py -@@ -1,7 +1,7 @@ - from __future__ import division, absolute_import, print_function - - import sys --from tempfile import NamedTemporaryFile, TemporaryFile, mktemp -+from tempfile import NamedTemporaryFile, TemporaryFile - import os - - from numpy import memmap -@@ -33,12 +33,11 @@ class TestMemmap(TestCase): - assert_array_equal(self.data, newfp) - - def test_open_with_filename(self): -- tmpname = mktemp('', 'mmap') -- fp = memmap(tmpname, dtype=self.dtype, mode='w+', -- shape=self.shape) -- fp[:] = self.data[:] -- del fp -- os.unlink(tmpname) -+ with NamedTemporaryFile() as tmp: -+ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', -+ shape=self.shape) -+ fp[:] = self.data[:] -+ del fp - - def test_unnamed_file(self): - with TemporaryFile() as f: -@@ -55,17 +54,16 @@ class TestMemmap(TestCase): - del fp - - def test_filename(self): -- tmpname = mktemp('', 'mmap') -- fp = memmap(tmpname, dtype=self.dtype, mode='w+', -- shape=self.shape) -- abspath = os.path.abspath(tmpname) -- fp[:] = self.data[:] -- self.assertEqual(abspath, fp.filename) -- b = fp[:1] -- self.assertEqual(abspath, b.filename) -- del b -- del fp -- os.unlink(tmpname) -+ with NamedTemporaryFile() as tmp: -+ fp = memmap(tmp.name, dtype=self.dtype, mode='w+', -+ shape=self.shape) -+ abspath = os.path.abspath(tmp.name) -+ fp[:] = self.data[:] -+ self.assertEqual(abspath, fp.filename) -+ b = fp[:1] -+ self.assertEqual(abspath, b.filename) -+ del b -+ del fp - - def test_filename_fileobj(self): - fp = memmap(self.tmpfp, dtype=self.dtype, mode="w+", -diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py -index a0c4bcf..37b9931 100644 ---- a/numpy/core/tests/test_multiarray.py -+++ b/numpy/core/tests/test_multiarray.py -@@ -2051,12 +2051,11 @@ class TestIO(object): - self.x = rand(shape) + rand(shape).astype(np.complex)*1j - self.x[0,:, 1] = [nan, inf, -inf, nan] - self.dtype = self.x.dtype -- self.filename = tempfile.mktemp() -+ self.file = tempfile.NamedTemporaryFile() -+ self.filename = self.file.name - - def tearDown(self): -- if os.path.isfile(self.filename): -- os.unlink(self.filename) -- #tmp_file.close() -+ self.file.close() - - def test_bool_fromstring(self): - v = np.array([True, False, True, False], dtype=np.bool_) -@@ -2084,7 +2083,6 @@ class TestIO(object): - y = np.fromfile(f, dtype=self.dtype) - f.close() - assert_array_equal(y, self.x.flat) -- os.unlink(self.filename) - - def test_roundtrip_filename(self): - self.x.tofile(self.filename) -@@ -2217,7 +2215,6 @@ class TestIO(object): - s = f.read() - f.close() - assert_equal(s, '1.51,2.0,3.51,4.0') -- os.unlink(self.filename) - - def test_tofile_format(self): - x = np.array([1.51, 2, 3.51, 4], dtype=float) -diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py -index ccdbd4e..fcfd185 100644 ---- a/numpy/f2py/__init__.py -+++ b/numpy/f2py/__init__.py -@@ -28,20 +28,20 @@ def compile(source, - from numpy.distutils.exec_command import exec_command - import tempfile - if source_fn is None: -- fname = os.path.join(tempfile.mktemp()+'.f') -+ f = tempfile.NamedTemporaryFile(suffix='.f') - else: -- fname = source_fn -- -- f = open(fname, 'w') -- f.write(source) -- f.close() -- -- args = ' -c -m %s %s %s'%(modulename, fname, extra_args) -- c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable, args) -- s, o = exec_command(c) -- if source_fn is None: -- try: os.remove(fname) -- except OSError: pass -+ f = open(source_fn, 'w') -+ -+ try: -+ f.write(source) -+ f.flush() -+ -+ args = ' -c -m %s %s %s'%(modulename, f.name, extra_args) -+ c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' % \ -+ (sys.executable, args) -+ s, o = exec_command(c) -+ finally: -+ f.close() - return s - - from numpy.testing import Tester -diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py -old mode 100755 -new mode 100644 -index 011b430..b264ea3 ---- a/numpy/f2py/f2py2e.py -+++ b/numpy/f2py/f2py2e.py -@@ -91,7 +91,7 @@ Options: - --lower is assumed with -h key, and --no-lower without -h key. - - --build-dir <dirname> All f2py generated files are created in <dirname>. -- Default is tempfile.mktemp(). -+ Default is tempfile.mkdtemp(). - - --overwrite-signature Overwrite existing signature file. - -@@ -428,7 +428,7 @@ def run_compile(): - del sys.argv[i] - else: - remove_build_dir = 1 -- build_dir = os.path.join(tempfile.mktemp()) -+ build_dir = tempfile.mkdtemp() - - _reg1 = re.compile(r'[-][-]link[-]') - sysinfo_flags = [_m for _m in sys.argv[1:] if _reg1.match(_m)] -diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py -index fdd78b2..caffada 100644 ---- a/numpy/lib/tests/test_io.py -+++ b/numpy/lib/tests/test_io.py -@@ -4,7 +4,9 @@ import sys - import gzip - import os - import threading --from tempfile import mkstemp, mktemp, NamedTemporaryFile -+import shutil -+import contextlib -+from tempfile import mkstemp, mkdtemp, NamedTemporaryFile - import time - import warnings - import gc -@@ -21,6 +23,12 @@ from numpy.ma.testutils import (TestCase, assert_equal, assert_array_equal, - assert_raises, run_module_suite) - from numpy.testing import assert_warns, assert_, build_err_msg - -+@contextlib.contextmanager -+def tempdir(change_dir=False): -+ tmpdir = mkdtemp() -+ yield tmpdir -+ shutil.rmtree(tmpdir) -+ - - class TextIO(BytesIO): - """Helper IO class. -@@ -145,14 +153,14 @@ class TestSavezLoad(RoundtripTest, TestCase): - @np.testing.dec.slow - def test_big_arrays(self): - L = (1 << 31) + 100000 -- tmp = mktemp(suffix='.npz') - a = np.empty(L, dtype=np.uint8) -- np.savez(tmp, a=a) -- del a -- npfile = np.load(tmp) -- a = npfile['a'] -- npfile.close() -- os.remove(tmp) -+ with tempdir() as tmpdir: -+ tmp = os.path.join(tmpdir, "file.npz") -+ np.savez(tmp, a=a) -+ del a -+ npfile = np.load(tmp) -+ a = npfile['a'] -+ npfile.close() - - def test_multiple_arrays(self): - a = np.array([[1, 2], [3, 4]], float) diff --git a/dev-python/numpy/files/numpy-1.9.0-OO.patch b/dev-python/numpy/files/numpy-1.9.0-OO.patch deleted file mode 100644 index f1ebc23e1577..000000000000 --- a/dev-python/numpy/files/numpy-1.9.0-OO.patch +++ /dev/null @@ -1,91 +0,0 @@ -From dc453917978e98dcdf3bbc106b080c80f0a1301e Mon Sep 17 00:00:00 2001 -From: Charles Harris <charlesr.harris@gmail.com> -Date: Fri, 3 Oct 2014 20:03:31 -0600 -Subject: [PATCH] BUG: Make numpy import when run with Python flag '-OO'. - -This consists of checking for a docstring equal to None and skipping two -tests that require docstrings. - -Closes #5148. ---- - numpy/lib/tests/test_function_base.py | 6 +++++- - numpy/lib/tests/test_utils.py | 3 ++- - numpy/ma/extras.py | 8 +++++--- - 3 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py -index ee38b35..a3f8056 100644 ---- a/numpy/lib/tests/test_function_base.py -+++ b/numpy/lib/tests/test_function_base.py -@@ -1,12 +1,14 @@ - from __future__ import division, absolute_import, print_function - - import warnings -+import sys - - import numpy as np - from numpy.testing import ( - run_module_suite, TestCase, assert_, assert_equal, assert_array_equal, - assert_almost_equal, assert_array_almost_equal, assert_raises, -- assert_allclose, assert_array_max_ulp, assert_warns, assert_raises_regex -+ assert_allclose, assert_array_max_ulp, assert_warns, -+ assert_raises_regex, dec - ) - from numpy.random import rand - from numpy.lib import * -@@ -2094,6 +2096,8 @@ def test_string_arg(self): - - - class TestAdd_newdoc(TestCase): -+ -+ @dec.skipif(sys.flags.optimize == 2) - def test_add_doc(self): - # test np.add_newdoc - tgt = "Current flat index into the array." -diff --git a/numpy/lib/tests/test_utils.py b/numpy/lib/tests/test_utils.py -index fcb37f9..8fbd1c4 100644 ---- a/numpy/lib/tests/test_utils.py -+++ b/numpy/lib/tests/test_utils.py -@@ -3,7 +3,7 @@ - import sys - from numpy.core import arange - from numpy.testing import ( -- run_module_suite, assert_, assert_equal -+ run_module_suite, assert_, assert_equal, dec - ) - from numpy.lib import deprecate - import numpy.lib.utils as utils -@@ -14,6 +14,7 @@ - from StringIO import StringIO - - -+@dec.skipif(sys.flags.optimize == 2) - def test_lookfor(): - out = StringIO() - utils.lookfor('eigenvalue', module='numpy', output=out, -diff --git a/numpy/ma/extras.py b/numpy/ma/extras.py -index 82a61a6..a993fd0 100644 ---- a/numpy/ma/extras.py -+++ b/numpy/ma/extras.py -@@ -434,8 +434,10 @@ def apply_over_axes(func, a, axes): - raise ValueError("function is not returning " - "an array of the correct shape") - return val --apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ -- :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ -+ -+if apply_over_axes.__doc__ is not None: -+ apply_over_axes.__doc__ = np.apply_over_axes.__doc__[ -+ :np.apply_over_axes.__doc__.find('Notes')].rstrip() + \ - """ - - Examples -@@ -462,7 +464,7 @@ def apply_over_axes(func, a, axes): - [[[46] - [--] - [124]]] --""" -+ """ - - - def average(a, axis=None, weights=None, returned=False): diff --git a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch deleted file mode 100644 index 128ea1391dda..000000000000 --- a/dev-python/numpy/files/numpy-1.9.0-no-hardcode-blas.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- numpy/distutils/system_info.py 2014-09-07 08:57:47.000000000 +0000 -+++ numpy/distutils/system_info.py 2014-10-19 17:57:12.099448481 +0000 -@@ -296,20 +296,7 @@ - 1 - display warning message - 2 - raise error - """ -- cl = {'atlas': atlas_info, # use lapack_opt or blas_opt instead -- 'atlas_threads': atlas_threads_info, # ditto -- 'atlas_blas': atlas_blas_info, -- 'atlas_blas_threads': atlas_blas_threads_info, -- 'lapack_atlas': lapack_atlas_info, # use lapack_opt instead -- 'lapack_atlas_threads': lapack_atlas_threads_info, # ditto -- 'mkl': mkl_info, -- # openblas which may or may not have embedded lapack -- 'openblas': openblas_info, # use blas_opt instead -- # openblas with embedded lapack -- 'openblas_lapack': openblas_lapack_info, # use blas_opt instead -- 'lapack_mkl': lapack_mkl_info, # use lapack_opt instead -- 'blas_mkl': blas_mkl_info, # use blas_opt instead -- 'x11': x11_info, -+ cl = {'x11': x11_info, - 'fft_opt': fft_opt_info, - 'fftw': fftw_info, - 'fftw2': fftw2_info, - diff --git a/dev-python/numpy/numpy-1.10.1.ebuild b/dev-python/numpy/numpy-1.10.1.ebuild deleted file mode 100644 index 02d74c2f4e14..000000000000 --- a/dev-python/numpy/numpy-1.10.1.ebuild +++ /dev/null @@ -1,152 +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 python3_{3,4,5} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator - -DOC_PV="1.9.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://www.numpy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - # we don't have f2py-3.3 - sed \ - -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \ - -i numpy/tests/test_scripts.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.8.0-r1.ebuild b/dev-python/numpy/numpy-1.8.0-r1.ebuild deleted file mode 100644 index e01e6de8052c..000000000000 --- a/dev-python/numpy/numpy-1.8.0-r1.ebuild +++ /dev/null @@ -1,147 +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_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="${PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf - )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( >=dev-python/nose-0.10[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${P}-no-hardcode-blas.patch - "${FILESDIR}"/${P}-f2py-insecure-temporary.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - docinto f2py - dodoc numpy/f2py/docs/*.txt - doman numpy/f2py/f2py.1 - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - insinto /usr/share/doc/${PF} - doins "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi -} diff --git a/dev-python/numpy/numpy-1.8.1.ebuild b/dev-python/numpy/numpy-1.8.1.ebuild deleted file mode 100644 index 7769eb5f1a4c..000000000000 --- a/dev-python/numpy/numpy-1.8.1.ebuild +++ /dev/null @@ -1,145 +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_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="${PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${P}/${PN}-user-${DOC_PV}.pdf - )" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.8.0-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - docinto f2py - dodoc numpy/f2py/docs/*.txt - doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.9.0-r1.ebuild b/dev-python/numpy/numpy-1.9.0-r1.ebuild deleted file mode 100644 index fa61e78e11e7..000000000000 --- a/dev-python/numpy/numpy-1.9.0-r1.ebuild +++ /dev/null @@ -1,148 +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_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="1.8.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch - # https://github.com/numpy/numpy/commit/dc453917978e98dcdf3bbc106b080c80f0a1301e.patch - "${FILESDIR}"/${PN}-1.9.0-OO.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.9.0.ebuild b/dev-python/numpy/numpy-1.9.0.ebuild deleted file mode 100644 index 12415c46b073..000000000000 --- a/dev-python/numpy/numpy-1.9.0.ebuild +++ /dev/null @@ -1,146 +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_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="1.8.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/numpy/numpy-1.9.1.ebuild b/dev-python/numpy/numpy-1.9.1.ebuild deleted file mode 100644 index 12415c46b073..000000000000 --- a/dev-python/numpy/numpy-1.9.1.ebuild +++ /dev/null @@ -1,146 +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_3,3_4} ) - -FORTRAN_NEEDED=lapack - -inherit distutils-r1 eutils flag-o-matic fortran-2 multilib toolchain-funcs versionator - -DOC_PV="1.8.1" -DOC_P="${PN}-${DOC_PV}" - -DESCRIPTION="Fast array and numerical python library" -HOMEPAGE="http://numpy.scipy.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz - doc? ( - http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip - http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf - http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf - )" -# It appears the docs haven't been upgraded, still @ 1.8.1 -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc lapack test" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - lapack? ( virtual/cblas virtual/lapack )" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip ) - lapack? ( virtual/pkgconfig ) - test? ( dev-python/nose[${PYTHON_USEDEP}] )" - -# Uses distutils.command.config. -DISTUTILS_IN_SOURCE_BUILD=1 - -PATCHES=( - "${FILESDIR}"/${PN}-1.9.0-no-hardcode-blas.patch -) - -src_unpack() { - default - if use doc; then - unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die - fi -} - -pc_incdir() { - $(tc-getPKG_CONFIG) --cflags-only-I $@ | \ - sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libdir() { - $(tc-getPKG_CONFIG) --libs-only-L $@ | \ - sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||' -} - -pc_libs() { - $(tc-getPKG_CONFIG) --libs-only-l $@ | \ - sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \ - -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \ - | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||' -} - -python_prepare_all() { - if use lapack; then - append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)" - local libdir="${EPREFIX}"/usr/$(get_libdir) - # make sure _dotblas.so gets built - sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die - cat >> site.cfg <<-EOF - [blas] - include_dirs = $(pc_incdir cblas) - library_dirs = $(pc_libdir cblas blas):${libdir} - blas_libs = $(pc_libs cblas blas) - [lapack] - library_dirs = $(pc_libdir lapack):${libdir} - lapack_libs = $(pc_libs lapack) - EOF - else - export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None - fi - - export CC="$(tc-getCC) ${CFLAGS}" - - append-flags -fno-strict-aliasing - - # See progress in http://projects.scipy.org/scipy/numpy/ticket/573 - # with the subtle difference that we don't want to break Darwin where - # -shared is not a valid linker argument - if [[ ${CHOST} != *-darwin* ]]; then - append-ldflags -shared - fi - - # only one fortran to link with: - # linking with cblas and lapack library will force - # autodetecting and linking to all available fortran compilers - append-fflags -fPIC - if use lapack; then - NUMPY_FCONFIG="config_fc --noopt --noarch" - # workaround bug 335908 - [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95" - fi - - # don't version f2py, we will handle it. - sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile() { - distutils-r1_python_compile ${NUMPY_FCONFIG} -} - -python_test() { - distutils_install_for_testing ${NUMPY_FCONFIG} - - cd "${TMPDIR}" || die - ${EPYTHON} -c " -import numpy, sys -r = numpy.test(label='full', verbose=3) -sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}" -} - -python_install() { - distutils-r1_python_install ${NUMPY_FCONFIG} -} - -python_install_all() { - distutils-r1_python_install_all - - dodoc COMPATIBILITY DEV_README.txt THANKS.txt - - if use doc; then - dohtml -r "${WORKDIR}"/html/* - dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf - fi - - # absent in 1.9 - #docinto f2py - #dodoc numpy/f2py/docs/*.txt - #doman numpy/f2py/f2py.1 -} diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild index ae34a310764b..fd8e855c4769 100644 --- a/dev-python/packaging/packaging-15.3-r2.ebuild +++ b/dev-python/packaging/packaging-15.3-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="Apache-2.0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND="" diff --git a/dev-python/path-py/path-py-8.1.2.ebuild b/dev-python/path-py/path-py-8.1.2.ebuild index c2fee53152eb..80fc7b5b3602 100644 --- a/dev-python/path-py/path-py-8.1.2.ebuild +++ b/dev-python/path-py/path-py-8.1.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/p/path.py/${MY_P}.tar.gz" SLOT="0" LICENSE="MIT" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test" DEPEND=" diff --git a/dev-python/pbr/pbr-1.8.1.ebuild b/dev-python/pbr/pbr-1.8.1.ebuild index 83455bd61922..5f2e3b7ed141 100644 --- a/dev-python/pbr/pbr-1.8.1.ebuild +++ b/dev-python/pbr/pbr-1.8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test" # git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038 @@ -52,6 +52,9 @@ python_prepare_all() { sed -e s':test_command_hooks:_&:' \ -e s':test_global_setup_hooks:_&:' \ -i pbr/tests/test_hooks.py || die + sed \ + -e "s:test_wsgi_script_install:_&:" \ + -i pbr/tests/test_wsgi.py || die einfo "rogue tests disabled" sed -i '/^hacking/d' test-requirements.txt || die diff --git a/dev-python/pillowfight/Manifest b/dev-python/pillowfight/Manifest new file mode 100644 index 000000000000..5678da7124f3 --- /dev/null +++ b/dev-python/pillowfight/Manifest @@ -0,0 +1 @@ +DIST pillowfight-0.2.tar.gz 2628 SHA256 15bce1925a3d66940ceb9a33c3c55de8d95462ce136c4d46e8673f2919b401d6 SHA512 2eff2fd0bdf5c02513ddb4838675e7b9f392135ff08a784ca2fedf06c5b96a56af75460559066cc6cded65f3d4da087ac679492b7b1dba23fb557e6ac3565e6e WHIRLPOOL 691e985dd6e8da23d117f1a826a99c1cf80fbe01e4e82be10b1cac1277be292ffb4be233e31c7ea4daf98c1c28af1be7d28a5f43e8535c176b15c7cb180f0e10 diff --git a/dev-python/pillowfight/metadata.xml b/dev-python/pillowfight/metadata.xml new file mode 100644 index 000000000000..ee7e8b2450a8 --- /dev/null +++ b/dev-python/pillowfight/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>python</herd> +</pkgmetadata> diff --git a/dev-python/pillowfight/pillowfight-0.2.ebuild b/dev-python/pillowfight/pillowfight-0.2.ebuild new file mode 100644 index 000000000000..7ffeb1c10f1b --- /dev/null +++ b/dev-python/pillowfight/pillowfight-0.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Eases the transition from PIL to Pillow" +HOMEPAGE="https://pypi.python.org/pypi/pillowfight/ https://github.com/beanbaginc/pillowfight" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] +" diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild index fcc23707a9b6..9eac501716dc 100644 --- a/dev-python/pip/pip-7.1.2.ebuild +++ b/dev-python/pip/pip-7.1.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github. SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" # Check pip/_vendor/vendor.txt for this diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest index 938952673fb7..78477263ebae 100644 --- a/dev-python/pkginfo/Manifest +++ b/dev-python/pkginfo/Manifest @@ -1,2 +1 @@ -DIST pkginfo-1.0.tar.gz 24802 SHA256 27b171632c6894ae5d0d5677678dfc4e9b86f3b422eb3db1cc62960b1c9886f0 SHA512 1b0f9ed60b53202deb729fa9261059b7fe1b3e4561f27ad51152e5077c45dd4f47fcb81da45cd2e509b046e9bb05652533ae90de31f93831743a9d35c938b14d WHIRLPOOL 312e3bac0a8e4740a40484f9e77a137479e339b6c472409e890d3ba13059a6637c8c2bb0d8bd4496364d98ff3ac1fe7272d4750560c4cdc1d9735187ede0cd5c DIST pkginfo-1.2.1.tar.gz 31072 SHA256 ad3f6dfe8a831f96a7b56a588ca874137ca102cc6b79fc9b0a1c3b7ab7320f3c SHA512 8a530a164befdcbc6f1f550e106880e14e9d2c762a5e1055f926ccf0228d9e2312f11598454ef015e97dccb78ac7aeb7309f34279590cd318c19c2bd9a29ed2a WHIRLPOOL 1ab43db82665e0abed88bf59115df726475ba7c611b077803721cd6bfcfcc81120c7a996e8945e74ad18c1ec7f6c9e5a1396df37d4f2c0eca24924f4c22e9ee3 diff --git a/dev-python/pkginfo/pkginfo-1.0.ebuild b/dev-python/pkginfo/pkginfo-1.0.ebuild deleted file mode 100644 index 511e86c64b5a..000000000000 --- a/dev-python/pkginfo/pkginfo-1.0.ebuild +++ /dev/null @@ -1,48 +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 pypy ) - -inherit distutils-r1 - -DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file" -HOMEPAGE="https://pypi.python.org/pypi/pkginfo" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="amd64 x86" -IUSE="doc examples" - -LICENSE="MIT" -SLOT="0" -DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -python_prepare_all() { - sed -e 's:SPHINXBUILD = sphinx-build:SPHINXBUILD = /usr/bin/sphinx-build:' \ - -i docs/Makefile || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} - -python_test() { - pushd pkginfo/tests/ > /dev/null - for test in test_*.py; do - ${PYTHON} ${test} || die "${test} failed with Python ${PYTHON_ABI}" - if [[ $? ]]; then - einfo "Test ${test} successful" - else - die "Test ${test} failed under ${EPYTHON}" - fi - done -} - -python_install_all() { - use doc && local HTML_DOCS=( docs/.build/html/. ) - use examples && local EXAMPLES=( docs/examples/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pkginfo/pkginfo-1.2.1.ebuild b/dev-python/pkginfo/pkginfo-1.2.1.ebuild index 03c1b353918d..de1efe153ece 100644 --- a/dev-python/pkginfo/pkginfo-1.2.1.ebuild +++ b/dev-python/pkginfo/pkginfo-1.2.1.ebuild @@ -11,7 +11,7 @@ inherit distutils-r1 DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file" HOMEPAGE="https://pypi.python.org/pypi/pkginfo" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 arm ppc ppc64 x86" IUSE="doc examples" LICENSE="MIT" diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild index c1c0cade68a2..fbdc74d35688 100644 --- a/dev-python/progress/progress-1.2.ebuild +++ b/dev-python/progress/progress-1.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="ISC" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="" diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest index 8d8e59c8aacf..b71db4c751b9 100644 --- a/dev-python/py/Manifest +++ b/dev-python/py/Manifest @@ -1,6 +1 @@ -DIST py-1.4.25.tar.gz 190298 SHA256 da6ea727748e00f79fef987adb6970e8b081f829de8ea39f5405718fa9e50c85 SHA512 7e24a9d57298cf98fc246fbda7db81f6cd9d16b78425266c24d00ab1db77146ffab38820630b2dddb49bca7d864c2366d45fdb3e81bb284e509a309d4c1b5b98 WHIRLPOOL 2eab3004febb8e0e0bb42c0fd6d6dd33e46c7a1fe9cdbe2864e55fc075393cf043c0697a508696d0f5bdee8322cef30f03765f676349d02353f3448a339a9432 -DIST py-1.4.26.tar.gz 190617 SHA256 28dd0b90d29b386afb552efc4e355c889f4639ce93658a7872a2150ece28bb89 SHA512 5772893d754e4f3fee5de9fdb0eca2c654ac5288eba5c89dac88fd4d9acb2c0795bae61e0c43b37a14471536a1649c9138ac1c4374cd5697307e74062e9813f3 WHIRLPOOL 9f845477bec75c083c7148d8008df9992a5309a89ee0ec68a9de5d99c236dd7f1e8cedf39a220c53a6b46570d1cba715623ac5eb6563874f7901694bdd0fb594 -DIST py-1.4.27.tar.gz 191447 SHA256 55c648870ba47375c52001d05a1adeedaa930937749ad66eb3327e8dea28ac79 SHA512 29d4c003f9382d5ae19ced0d1d759841b08ed8eb0e9d07e6105e974f4181c3cbb6b59908434eaf4f1164deac438258ccb25b89c0fec0f5a11e1d6487127af4a1 WHIRLPOOL bd3067bf8bbae2ab8ff51720132864701dbb347ecfca023c7dc0f85f6a94d73f77538e17bc8113cbf4946340be8e3f3faad04f92c2d8cee10a7ac3a497d48636 -DIST py-1.4.28.tar.gz 191592 SHA256 664dbb9fd86c26d26e90aa93d15b8a19c859128bb66b3905bef954eba737eeb5 SHA512 0f65ec7114d5d634cf8b0be0c91dee9c7ce7b4795143d1394f1e625586d852c3c0941b7e9490a1eb6a1d3ad5db7c64ab72b6532793f22fdda705a347d4945814 WHIRLPOOL 077f14d7e8a3e1ed1dbc3dd1a51ce55d0263f74b726ec66847c069ff91e81b9aab5581e031a5acbfdbbaaff22ced89efa7a362c2220db1964622342e6a02cd9f -DIST py-1.4.29.tar.gz 192088 SHA256 279e117233f205de1e46ec36eb7ffa5999f1bc53ae6bcf06889477ff28e45d83 SHA512 c172b598c3b7c8d7e0cc9b3123e80443355a0422e5e19b052f02d4261610fd832431cb50df35a3ee4913a29f87e53da2b12c17234189a3faabfab0c9899c1469 WHIRLPOOL 5924f8d0a9ef6428edc5fecc7d59de277b3cf30f93ff437a9067b7d16150a9b5ac9b4389343ed53f4a504ab083a220d2c0eee0936ea3e5ae5909d4944c89e545 DIST py-1.4.30.tar.gz 191796 SHA256 b703e57685ed7c280b1a51c496a4984d83d89def2a930b5e9e5da5a6ca151514 SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a WHIRLPOOL 890cd2dbb957c291e80c73a69fad89846e761f745500ab2a99bfb4f725a7e567104fa4a2a957b8c674ebc9498fdbb25373ff0d15ab8da7f8c45138844235c79f diff --git a/dev-python/py/py-1.4.25.ebuild b/dev-python/py/py-1.4.25.ebuild deleted file mode 100644 index bdd33014aea7..000000000000 --- a/dev-python/py/py-1.4.25.ebuild +++ /dev/null @@ -1,38 +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_3,3_4} pypy ) -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )" -RDEPEND="" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:_&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.26.ebuild b/dev-python/py/py-1.4.26.ebuild deleted file mode 100644 index bcc515eb9c60..000000000000 --- a/dev-python/py/py-1.4.26.ebuild +++ /dev/null @@ -1,39 +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_3,3_4} pypy pypy3 ) -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" -RDEPEND="" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.27.ebuild b/dev-python/py/py-1.4.27.ebuild deleted file mode 100644 index 4d184df25266..000000000000 --- a/dev-python/py/py-1.4.27.ebuild +++ /dev/null @@ -1,44 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -RDEPEND="" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - # 1 failure, test_comments, under both pypy only. - # Also appears the home repo has no issue tracker. - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.28.ebuild b/dev-python/py/py-1.4.28.ebuild deleted file mode 100644 index 4d184df25266..000000000000 --- a/dev-python/py/py-1.4.28.ebuild +++ /dev/null @@ -1,44 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -RDEPEND="" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - # 1 failure, test_comments, under both pypy only. - # Also appears the home repo has no issue tracker. - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.29.ebuild b/dev-python/py/py-1.4.29.ebuild deleted file mode 100644 index 4d184df25266..000000000000 --- a/dev-python/py/py-1.4.29.ebuild +++ /dev/null @@ -1,44 +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 python3_{3,4} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities" -HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -RDEPEND="" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] ) - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" - -python_prepare_all() { - sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C doc html -} - -python_test() { - # 1 failure, test_comments, under both pypy only. - # Also appears the home repo has no issue tracker. - py.test || die "testing failed with ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild index 1ea51d06536b..2c701149cce4 100644 --- a/dev-python/py/py-1.4.30.ebuild +++ b/dev-python/py/py-1.4.30.ebuild @@ -36,7 +36,7 @@ python_test() { # 1 failure, test_comments, under both pypy only. # Also appears the home repo has no issue tracker. [[ "${EPYTHON}" == pypy ]] && return - py.test || die "testing failed with ${EPYTHON}" + py.test -v -v || die "testing failed with ${EPYTHON}" } python_install_all() { diff --git a/dev-python/pyclimate/metadata.xml b/dev-python/pyclimate/metadata.xml index 056e23c1e4fc..e7cea021e06c 100644 --- a/dev-python/pyclimate/metadata.xml +++ b/dev-python/pyclimate/metadata.xml @@ -3,7 +3,7 @@ <pkgmetadata> <herd>sci</herd> <herd>python</herd> -<longdescription> + <longdescription> A package designed to accomplish some usual tasks during the analysis of climate variability using Python. It provides functions to perform some simple IO operations, operations with COARDS-compliant netCDF files, EOF @@ -11,10 +11,10 @@ filters, kernel based probability density function estimation and access to DCDFLIB.C library. </longdescription> -<longdescription lang="ja"> + <longdescription lang="ja"> このパッケージはPython言語を使った気候の変化を分析する必要なタスクを終えるために デザインされました。幾つかの単純なI/O操作、COARDS-compliant netCDFファイルの操作 -、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター>、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ +、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター>、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ ンとDCDFLIB.Cライブラリへのアクセス等の機能を提供します。 </longdescription> </pkgmetadata> diff --git a/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild b/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild index d2efe9cfda9b..0f9dfa211dca 100644 --- a/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild +++ b/dev-python/pyclimate/pyclimate-1.2.2-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://fisica.ehu.es/jsaenz/pyclimate_files/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="examples" DEPEND="" diff --git a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild index 503564a63636..a92283bc02c5 100644 --- a/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild +++ b/dev-python/pytest-runner/pytest-runner-2.6.2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.python.org/pypi/pytest-runner https://bitbucket.org/pytes SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" SLOT="0" IUSE="doc" diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild index 7a1d5acf0bd6..59d251c455fe 100644 --- a/dev-python/pytest/pytest-2.8.2.ebuild +++ b/dev-python/pytest/pytest-2.8.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test" # When bumping, please check setup.py for the proper py version @@ -45,6 +45,13 @@ python_prepare_all() { # Prevent un-needed d'loading sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die + + # https://github.com/pytest-dev/pytest/issues/1162 + # https://github.com/pytest-dev/pytest/issues/1163 + sed \ + -e 's:test_logging_initialized_in_test:_&:g' \ + -i testing/test_capture.py || die + distutils-r1_python_prepare_all } diff --git a/dev-python/regendoc/regendoc-0.5.ebuild b/dev-python/regendoc/regendoc-0.5.ebuild index 4120852391d6..d0517ffbca2a 100644 --- a/dev-python/regendoc/regendoc-0.5.ebuild +++ b/dev-python/regendoc/regendoc-0.5.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" SLOT="0" RDEPEND="dev-python/click[${PYTHON_USEDEP}]" diff --git a/dev-python/requests/requests-2.8.1.ebuild b/dev-python/requests/requests-2.8.1.ebuild index 85fa541b884d..a1c67484ce7a 100644 --- a/dev-python/requests/requests-2.8.1.ebuild +++ b/dev-python/requests/requests-2.8.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" IUSE="test" # bundles dev-python/urllib3 snapshot diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild index e4ab14d3e66b..d5c4809be41b 100644 --- a/dev-python/retrying/retrying-1.3.3.ebuild +++ b/dev-python/retrying/retrying-1.3.3.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" DEPEND=" diff --git a/dev-python/scientificpython/scientificpython-2.9.1.ebuild b/dev-python/scientificpython/scientificpython-2.9.1.ebuild index b8619890c09f..90b402ad7ff1 100644 --- a/dev-python/scientificpython/scientificpython-2.9.1.ebuild +++ b/dev-python/scientificpython/scientificpython-2.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ HOMEPAGE="http://sourcesup.cru.fr/projects/scientific-py/" LICENSE="CeCILL-2" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="doc mpi test" RDEPEND=" diff --git a/dev-python/scientificpython/scientificpython-2.9.4.ebuild b/dev-python/scientificpython/scientificpython-2.9.4.ebuild index 93af0d21a04a..357c2ffdb03f 100644 --- a/dev-python/scientificpython/scientificpython-2.9.4.ebuild +++ b/dev-python/scientificpython/scientificpython-2.9.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -51,7 +51,7 @@ python_compile() { python_test() { cd "${S}"/Tests || die - python_foreach_impl nosetests + nosetests -v -v || die } python_install() { diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild index d57da6bd7d2a..bdf35e056bd8 100644 --- a/dev-python/setuptools/setuptools-18.4.ebuild +++ b/dev-python/setuptools/setuptools-18.4.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]" diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild index 784a6dfc876c..aa5ba815a261 100644 --- a/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild +++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="test" DEPEND=" diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild index 465102afe7fe..13c3c8af2599 100644 --- a/dev-python/six/six-1.10.0.ebuild +++ b/dev-python/six/six-1.10.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" DEPEND=" @@ -26,6 +26,16 @@ PATCHES=( "${FILESDIR}"/1.9.0-mapping.patch ) +python_prepare_all() { + # https://bitbucket.org/gutworth/six/issues/139/ + sed \ + -e 's:test_assertCountEqual:_&:g' \ + -e 's:test_assertRegex:_&:g' \ + -e 's:test_assertRaisesRegex:_&:g' \ + -i test_six.py || die + distutils-r1_python_prepare_all +} + python_compile_all() { use doc && emake -C documentation html } diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild index b552eedd74c3..c65527da7486 100644 --- a/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild +++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0.ebuild @@ -14,5 +14,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="" diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild index b4d738fdd650..69407e0780a6 100644 --- a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild +++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc latex test" RDEPEND=" diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest index 3b26909a8096..195bdd9dfbb1 100644 --- a/dev-python/sphinx_rtd_theme/Manifest +++ b/dev-python/sphinx_rtd_theme/Manifest @@ -1,2 +1 @@ -DIST sphinx_rtd_theme-0.1.6.tar.gz 217067 SHA256 0f29f544f6d037989fa0c7729a9eab7e4d8ea50d6f0ef37363f472756c1edca6 SHA512 f79e8192264ef01675240853e9be8a5bd0c86808f0e918e60c7c6e0c078caeef87c76421db795149214ef4edc1389e7c2001a98436611292ff826e7b9b9d0f15 WHIRLPOOL 110494f3c9bb6e838557fa4bcb1ac8f33e91b30d2da780720e897cfc4f635c0a14f502d5aac50115495bcc591de79eae83a2e359b81b917e524c9459194420f6 DIST sphinx_rtd_theme-0.1.9.tar.gz 698461 SHA256 273846f8aacac32bf9542365a593b495b68d8035c2e382c9ccedcac387c9a0a1 SHA512 e793a4da6209c26acb261efd03e6591561d7fbad97b3d7ab0a105e125a15a035d2066a1b1572a95954304d361abec39d9e1e401cd7200c6206cc8c89ad134d0f WHIRLPOOL 77edc637b20b86a0273c9365fabdec7712dc40e6dae8533085c6c1f6261df9b0ada32f8b0d0d818f2c20902ce1c6619d9fe534da9c524f034638fb729a204052 diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild deleted file mode 100644 index 0971b04c9b49..000000000000 --- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.6.ebuild +++ /dev/null @@ -1,20 +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 python3_{3,4} pypy ) - -inherit distutils-r1 - -DESCRIPTION="ReadTheDocs.org theme for Sphinx" -HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild index 91eee72ba114..5e8f6764036b 100644 --- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild +++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" IUSE="" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/subunit/subunit-1.2.0.ebuild b/dev-python/subunit/subunit-1.2.0.ebuild index 66e8ef9128a5..65218341fc6a 100644 --- a/dev-python/subunit/subunit-1.2.0.ebuild +++ b/dev-python/subunit/subunit-1.2.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+d LICENSE="Apache-2.0 BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" IUSE="static-libs test" RDEPEND=" diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch new file mode 100644 index 000000000000..7622c0abfa43 --- /dev/null +++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport.patch @@ -0,0 +1,71 @@ +From 8f8ab15fafdad6db850c84772323b32375b09285 Mon Sep 17 00:00:00 2001 +From: Robert Collins <robertc@robertcollins.net> +Date: Tue, 10 Mar 2015 15:21:49 +1300 +Subject: [PATCH] Fixup tests with latest testtools. + +Testtools has started chunking exceptions (which is perhaps good, +perhaps bad) - but we shouldn't depend on the exact behaviour in it +for our tests. +--- + NEWS | 6 ++++++ + testrepository/tests/test_repository.py | 14 ++++++++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/NEWS b/NEWS +index e258b11..536308c 100644 +--- a/NEWS ++++ b/NEWS +@@ -5,6 +5,12 @@ testrepository release notes + NEXT (In development) + +++++++++++++++++++++ + ++CHANGES ++------- ++ ++* Isolate the testrepository test suite from the chunking (or otherwise) ++ behaviour of testtools' exception handlers. (Robert Collins) ++ + 0.0.20 + ++++++ + +diff --git a/testrepository/tests/test_repository.py b/testrepository/tests/test_repository.py +index e2e5e05..4a8667b 100644 +--- a/testrepository/tests/test_repository.py ++++ b/testrepository/tests/test_repository.py +@@ -28,6 +28,7 @@ + from testresources import TestResource + from testtools import ( + clone_test_with_new_id, ++ content, + PlaceHolder, + ) + import testtools +@@ -103,19 +104,24 @@ class Case(ResourcedTestCase): + def passing(self): + pass + +- def failing(self): +- self.fail("oops") +- + def unexpected_success(self): + self.expectFailure("unexpected success", self.assertTrue, True) + + ++class FailingCase: ++ ++ def run(self, result): ++ result.startTest(self) ++ result.addError( ++ self, None, details={'traceback': content.text_content("")}) ++ result.stopTest(self) ++ + def make_test(id, should_pass): + """Make a test.""" + if should_pass: + case = Case("passing") + else: +- case = Case("failing") ++ case = FailingCase() + return clone_test_with_new_id(case, id) + + diff --git a/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch new file mode 100644 index 000000000000..193b91e1cd3d --- /dev/null +++ b/dev-python/testrepository/files/testrepository-0.0.20-test-backport1.patch @@ -0,0 +1,22 @@ +From d3d6cac4fd42f2067c0dd81be748853f81c348fc Mon Sep 17 00:00:00 2001 +From: Robert Collins <robertc@robertcollins.net> +Date: Sun, 12 Jul 2015 21:37:34 +1200 +Subject: [PATCH] Fix 3.3+ tests with nested classnames. + +--- + testrepository/tests/ui/test_cli.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/testrepository/tests/ui/test_cli.py b/testrepository/tests/ui/test_cli.py +index 9ba11ad..e1f9b44 100644 +--- a/testrepository/tests/ui/test_cli.py ++++ b/testrepository/tests/ui/test_cli.py +@@ -157,7 +157,7 @@ def method(self): + self.assertThat(ui._stdout.buffer.getvalue().decode('utf8'), + DocTestMatches("""\ + ====================================================================== +-FAIL: testrepository.tests.ui.test_cli.Case.method ++FAIL: testrepository.tests.ui.test_cli...Case.method + ---------------------------------------------------------------------- + ...Traceback (most recent call last):... + File "...test_cli.py", line ..., in method diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild index ae10b32407ea..f9e97746ada3 100644 --- a/dev-python/testrepository/testrepository-0.0.20.ebuild +++ b/dev-python/testrepository/testrepository-0.0.20.ebuild @@ -34,9 +34,15 @@ DEPEND=" # Required for test phase DISTUTILS_IN_SOURCE_BUILD=1 +PATCHES=( + "${FILESDIR}"/${P}-test-backport.patch + "${FILESDIR}"/${P}-test-backport1.patch +) + python_test() { # some errors appear to have crept in the suite undert py3 since addition. # Python2.7 now passes all. - esetup.py testr + ${PYTHON} testr init || die + ${PYTHON} testr run || die } diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild index bbf5cf829f85..baa2f9af1693 100644 --- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild +++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild index 33679b9901e0..543a4b9ee4e3 100644 --- a/dev-python/testtools/testtools-1.8.0.ebuild +++ b/dev-python/testtools/testtools-1.8.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="doc test" CDEPEND=" @@ -37,6 +37,9 @@ PATCHES=( "${FILESDIR}"/${P}-twisted-backport2.patch ) +# https://github.com/testing-cabal/testtools/issues/156 +RESTRICT=test + python_compile_all() { use doc && emake -C doc html } diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild index c784cd5a9c54..80fed6be1a74 100644 --- a/dev-python/traceback2/traceback2-1.4.0.ebuild +++ b/dev-python/traceback2/traceback2-1.4.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86" IUSE="" DEPEND=" diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest index 04aadcbf9ac9..76c7f4dea3a0 100644 --- a/dev-python/unicodecsv/Manifest +++ b/dev-python/unicodecsv/Manifest @@ -1,3 +1,2 @@ DIST unicodecsv-0.13.0.tar.gz 9445 SHA256 a913fa13a26b4b25058950f8d6231abee855e8a03a0f265274b3ed30a91034a3 SHA512 c794baac1b165482733faf94bab9284f6f71a1ae999dbd802afc9c906e82e396e98c5f3291f0796c39acec9dc924ad746a94269ac535046fc671351a2db33583 WHIRLPOOL 76b22ad354e004bb970a161d4dcce37fb5373369917a881d9a01d37ac93623e948609cb12270d94f433812cd42eb3f9602c108cf5c09cd471b312ab5a1ecdaa9 DIST unicodecsv-0.14.1.tar.gz 10267 SHA256 018c08037d48649a0412063ff4eda26eaa81eff1546dbffa51fa5293276ff7fc SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9 WHIRLPOOL 2f1927af9c2f1818d88f6e4fd3894e58d920f7d549f151db4281ace879fb4a27cb3bb34388d7bc15e6105639ed8a74ea4274aca4bcca45bdb178d29d2b8311cc -DIST unicodecsv-0.9.4.tar.gz 9070 SHA256 0272570bc2b302093d9ac6e1171fc07862f7ac938146bb6152d8dfe20eeafd9b SHA512 2b0f4a602d68bd8bcbbeb9c7cbd2c9f3b43ca87e73816c40912b75a5c265739902e67b67f9946f1ef572ee99376cecdd7ce5a343216a32a86f25e0860251d828 WHIRLPOOL d3f47eb88ee1dac3fcafc2b9cb22619d310bae9dc6ba467526e7630cea7d57e02ad1139d1e4f6152f9cefc7030aed3d9f61ffec9052f59c44dd5a0108348f638 diff --git a/dev-python/unicodecsv/metadata.xml b/dev-python/unicodecsv/metadata.xml index 45698f311e27..37731a4e8e11 100644 --- a/dev-python/unicodecsv/metadata.xml +++ b/dev-python/unicodecsv/metadata.xml @@ -1,4 +1,4 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>python</herd> diff --git a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild b/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild deleted file mode 100644 index 6f2290f9ed97..000000000000 --- a/dev-python/unicodecsv/unicodecsv-0.9.4.ebuild +++ /dev/null @@ -1,20 +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 ) - -inherit distutils-r1 - -DESCRIPTION="Drop-in replacement for python stdlib csv module supporting unicode" -HOMEPAGE="https://pypi.python.org/pypi/unicodecsv" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND}" diff --git a/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch new file mode 100644 index 000000000000..78d71c9dc6eb --- /dev/null +++ b/dev-python/unittest2/files/unittest2-1.1.0-python3.5-test.patch @@ -0,0 +1,28 @@ +diff --git a/unittest2/test/test_loader.py b/unittest2/test/test_loader.py +index 683f662..347eea5 100644 +--- a/unittest2/test/test_loader.py ++++ b/unittest2/test/test_loader.py +@@ -509,6 +509,7 @@ class Test_TestLoader(unittest2.TestCase): + # + # What happens when an impossible name is given, relative to the provided + # `module`? ++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here") + def test_loadTestsFromName__relative_malformed_name(self): + loader = unittest.TestLoader() + +@@ -811,6 +812,7 @@ class Test_TestLoader(unittest2.TestCase): + # TestCase or TestSuite instance." + # + # What happens when presented with an impossible module name? ++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here") + def test_loadTestsFromNames__malformed_name(self): + loader = unittest2.TestLoader() + +@@ -918,6 +920,7 @@ class Test_TestLoader(unittest2.TestCase): + # "The method optionally resolves name relative to the given module" + # + # What happens when presented with an impossible attribute name? ++ @unittest.skipIf(sys.version_info[:2] == (3, 5), "python 3.5 has problems here") + def test_loadTestsFromNames__relative_malformed_name(self): + loader = unittest.TestLoader() + diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild index 7c7f4e382366..3e7d5fe9eab9 100644 --- a/dev-python/unittest2/unittest2-1.1.0.ebuild +++ b/dev-python/unittest2/unittest2-1.1.0.ebuild @@ -9,12 +9,12 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit distutils-r1 DESCRIPTION="The new features in unittest backported to Python 2.4+" -HOMEPAGE="https://pypi.python.org/pypi/unittest2" +HOMEPAGE="https://pypi.python.org/pypi/unittest2 https://github.com/testing-cabal/unittest-ext" SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" CDEPEND=" @@ -26,8 +26,11 @@ CDEPEND=" DEPEND="${CDEPEND}" RDEPEND="${CDEPEND}" -PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch ) +PATCHES=( + "${FILESDIR}"/remove-argparse-dependence.patch + "${FILESDIR}"/${P}-python3.5-test.patch +) python_test() { - "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}" + "${PYTHON}" -m unittest2 discover --verbose || die "tests failed under ${EPYTHON}" } diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild index b32c0d9bb498..c11671be2714 100644 --- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild +++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT="0" IUSE="doc test" diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest new file mode 100644 index 000000000000..0b93ebbab68d --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/Manifest @@ -0,0 +1 @@ +DIST depthimage_to_laserscan-1.0.7.tar.gz 12121 SHA256 3aa236f81cfd26e55718edfb50ef837a59b57169cb20a5b24f9a4e99602a09e8 SHA512 4da5fa446d574dbb44c2924dd760f160e527e68d7df119e5d9e74d85efd3473ee31845e8565b0d023d2cf22c945b3b5c56b12a04facd4e38dc3dd1235dad73e9 WHIRLPOOL a6c848acefa9ce95612167911d2f67afa0ae3e208559648939d4bcd7813a6ebd79e287dae46140c6b080a6b036cfff3bf2e70c494f248fd23d3f61d60fe825cd diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild new file mode 100644 index 000000000000..98afcc8f62b6 --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/image_geometry + dev-ros/nodelet + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild new file mode 100644 index 000000000000..98afcc8f62b6 --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Converts a depth image to a laser scan for use with navigation and localization" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/image_geometry + dev-ros/nodelet + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/depthimage_to_laserscan/metadata.xml b/dev-ros/depthimage_to_laserscan/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/depthimage_to_laserscan/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/image_view/image_view-1.12.14.ebuild b/dev-ros/image_view/image_view-1.12.14-r1.ebuild index c2b859bfd9c6..c46214b1fba4 100644 --- a/dev-ros/image_view/image_view-1.12.14.ebuild +++ b/dev-ros/image_view/image_view-1.12.14-r1.ebuild @@ -26,5 +26,7 @@ RDEPEND=" dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp + dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/dev-ros/image_view/image_view-9999.ebuild b/dev-ros/image_view/image_view-9999.ebuild index c2b859bfd9c6..c46214b1fba4 100644 --- a/dev-ros/image_view/image_view-9999.ebuild +++ b/dev-ros/image_view/image_view-9999.ebuild @@ -26,5 +26,7 @@ RDEPEND=" dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp + dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] " DEPEND="${RDEPEND}" diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest new file mode 100644 index 000000000000..6c0734fcb95a --- /dev/null +++ b/dev-ros/laser_proc/Manifest @@ -0,0 +1 @@ +DIST laser_proc-0.1.4.tar.gz 6865 SHA256 9dde874a6ae9de30ea59e37aa0d962a35e4da3ebed7e5a639225b901fe4523bd SHA512 0a9ae28d9ad213f7227027c24b951d0a68799edc662e98e593090a7d01ab0a33671a2a26eeb3fdaf2f77a3d639a2274641c11e478c2f0689327a1fa66601b95a WHIRLPOOL ee36c6bb699c18d3a6118997f275bd0c7c8b9543ddad6517f53606d061bea9ed6e2b1497cdb1f6c6e47634037429832f055135e68baf2021df31d4779cc4c4b7 diff --git a/dev-ros/laser_proc/laser_proc-0.1.4.ebuild b/dev-ros/laser_proc/laser_proc-0.1.4.ebuild new file mode 100644 index 000000000000..5917940777da --- /dev/null +++ b/dev-ros/laser_proc/laser_proc-0.1.4.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/laser_proc" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/rosconsole + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/pluginlib + dev-ros/nodelet +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/laser_proc/laser_proc-9999.ebuild b/dev-ros/laser_proc/laser_proc-9999.ebuild new file mode 100644 index 000000000000..5917940777da --- /dev/null +++ b/dev-ros/laser_proc/laser_proc-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/laser_proc" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/rosconsole + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/pluginlib + dev-ros/nodelet +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/laser_proc/metadata.xml b/dev-ros/laser_proc/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/laser_proc/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/libmavconn/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/libmavconn/libmavconn-0.15.0.ebuild b/dev-ros/libmavconn/libmavconn-0.15.0.ebuild new file mode 100644 index 000000000000..b355f3bf65a3 --- /dev/null +++ b/dev-ros/libmavconn/libmavconn-0.15.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink communication library" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-ros/mavlink-gbp-release-2015 + dev-libs/boost:= + dev-libs/console_bridge +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/libmavconn/libmavconn-9999.ebuild b/dev-ros/libmavconn/libmavconn-9999.ebuild new file mode 100644 index 000000000000..b355f3bf65a3 --- /dev/null +++ b/dev-ros/libmavconn/libmavconn-9999.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink communication library" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + >=dev-ros/mavlink-gbp-release-2015 + dev-libs/boost:= + dev-libs/console_bridge +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/libmavconn/metadata.xml b/dev-ros/libmavconn/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/libmavconn/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest new file mode 100644 index 000000000000..4a312e40b924 --- /dev/null +++ b/dev-ros/mavlink-gbp-release/Manifest @@ -0,0 +1 @@ +DIST mavlink-gbp-release-2015.10.10.tar.gz 472939 SHA256 a9b6c80a0e8b1df4623e22d83b1e7cebf5242e843f0c83faa699687e2d03d0fd SHA512 9686513a28ec4942da292c0ecf8c8ad84f0e79538272ce4ef353da76bc8ce2f34c20d1d74085b086f7fee315abd64948fe462e40036addfd167b579f86ea5393 WHIRLPOOL 59316cfa5ba2c003dec9299c6e6f2f2920a12cf9379c58ee64ddb2aeca3112915934b67cd1be04370e3571e674c9f6c1010cf8f1d0480121682c8ac3570a15ab diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild new file mode 100644 index 000000000000..97f60dd91739 --- /dev/null +++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2015.10.10.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release" +VER_PREFIX=release/jade/mavlink/ +VER_SUFFIX=-${PV#*_p} +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +EGIT_BRANCH="release/jade/mavlink" +DESCRIPTION="MAVLink message marshaling library" +LICENSE="LGPL-3" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" +S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}" diff --git a/dev-ros/mavlink-gbp-release/metadata.xml b/dev-ros/mavlink-gbp-release/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavlink-gbp-release/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/mavros/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/mavros/mavros-0.15.0.ebuild b/dev-ros/mavros/mavros-0.15.0.ebuild new file mode 100644 index 000000000000..00414b533c24 --- /dev/null +++ b/dev-ros/mavros/mavros-0.15.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink extendable communication node for ROS" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/diagnostic_updater + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/tf + dev-ros/angles + dev-ros/libmavconn + dev-ros/rosconsole_bridge + dev-libs/boost:= + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild new file mode 100644 index 000000000000..00414b533c24 --- /dev/null +++ b/dev-ros/mavros/mavros-9999.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="MAVLink extendable communication node for ROS" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/diagnostic_updater + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/tf + dev-ros/angles + dev-ros/libmavconn + dev-ros/rosconsole_bridge + dev-libs/boost:= + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros/metadata.xml b/dev-ros/mavros/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavros/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/mavros_extras/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild b/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild new file mode 100644 index 000000000000..562281398552 --- /dev/null +++ b/dev-ros/mavros_extras/mavros_extras-0.15.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Extra nodes and plugins for mavros" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/cv_bridge + dev-ros/mavros + dev-ros/roscpp + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/urdf + dev-cpp/eigen:3 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_extras/mavros_extras-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild new file mode 100644 index 000000000000..562281398552 --- /dev/null +++ b/dev-ros/mavros_extras/mavros_extras-9999.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Extra nodes and plugins for mavros" +LICENSE="GPL-3 LGPL-3 BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/cv_bridge + dev-ros/mavros + dev-ros/roscpp + dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/urdf + dev-cpp/eigen:3 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_extras/metadata.xml b/dev-ros/mavros_extras/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavros_extras/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/mavros_msgs/Manifest b/dev-ros/mavros_msgs/Manifest new file mode 100644 index 000000000000..77358be640d8 --- /dev/null +++ b/dev-ros/mavros_msgs/Manifest @@ -0,0 +1 @@ +DIST mavros-0.15.0.tar.gz 189901 SHA256 f03d5f5968108d43a95d6774f2a76f56131d7d408481ea10f391ab7dc757af1d SHA512 bfd73130e2aa00b4d17f0558d5554d616546909c8a43ceff96623ad78faa77a426229da6c3bce296801014822bf1c61e27b4740c0b2d82d53a7094c892a03306 WHIRLPOOL 3bebdd948d9ab2923a98cc2bca0c845de198292a4013bc03dd5d96bc573d10fd5a6148643a2778358552836043f849375773b4b6dfc430dea965310eab668bd2 diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild new file mode 100644 index 000000000000..7c9f450664e1 --- /dev/null +++ b/dev-ros/mavros_msgs/mavros_msgs-0.15.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=${PN} +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs" + +inherit ros-catkin + +DESCRIPTION="Messages for MAVROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild new file mode 100644 index 000000000000..7c9f450664e1 --- /dev/null +++ b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/mavlink/mavros" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=${PN} +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs" + +inherit ros-catkin + +DESCRIPTION="Messages for MAVROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/mavros_msgs/metadata.xml b/dev-ros/mavros_msgs/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/mavros_msgs/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest index 6e83d7512541..e1e4d56c9fb3 100644 --- a/dev-ros/navfn/Manifest +++ b/dev-ros/navfn/Manifest @@ -1,2 +1 @@ -DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb diff --git a/dev-ros/navfn/navfn-1.13.0.ebuild b/dev-ros/navfn/navfn-1.13.1-r1.ebuild index bea902da7af6..134e9c8c59f5 100644 --- a/dev-ros/navfn/navfn-1.13.0.ebuild +++ b/dev-ros/navfn/navfn-1.13.1-r1.ebuild @@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-planning/navigation" ROS_SUBDIR=${PN} KEYWORDS="~amd64 ~arm" CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) inherit ros-catkin diff --git a/dev-ros/navfn/navfn-1.13.1.ebuild b/dev-ros/navfn/navfn-1.13.1.ebuild deleted file mode 100644 index bea902da7af6..000000000000 --- a/dev-ros/navfn/navfn-1.13.1.ebuild +++ /dev/null @@ -1,36 +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-planning/navigation" -ROS_SUBDIR=${PN} -KEYWORDS="~amd64 ~arm" -CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs" - -inherit ros-catkin - -DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base" -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-ros/costmap_2d - dev-ros/nav_core - dev-ros/pcl_conversions - dev-ros/pcl_ros - dev-ros/pluginlib - dev-ros/roscpp - dev-ros/tf - dev-ros/visualization_msgs - dev-cpp/eigen:3 - sci-libs/pcl - x11-libs/fltk - media-libs/netpbm -" -DEPEND="${RDEPEND} - test? ( dev-cpp/gtest ) - dev-ros/cmake_modules" - -PATCHES=( "${FILESDIR}/pgm_h_location.patch" ) diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild index bea902da7af6..134e9c8c59f5 100644 --- a/dev-ros/navfn/navfn-9999.ebuild +++ b/dev-ros/navfn/navfn-9999.ebuild @@ -7,6 +7,8 @@ ROS_REPO_URI="https://github.com/ros-planning/navigation" ROS_SUBDIR=${PN} KEYWORDS="~amd64 ~arm" CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) inherit ros-catkin diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest new file mode 100644 index 000000000000..f667b8d3ee46 --- /dev/null +++ b/dev-ros/openni2_camera/Manifest @@ -0,0 +1 @@ +DIST openni2_camera-0.2.5.tar.gz 22450 SHA256 dc642789e51869fc99ae507ab02d970778485d9c8c7d7cf32d01e46f62e2ceee SHA512 3b19475785d50e9157f61ca91a55fbf7f9fbbc3006f44d44925ec8f23f77068d26d8c7afb00f886b9699b147e8ddb01700539c0d91432cebee0de2b926fa627b WHIRLPOOL ebcb1949c3235be0f734ecb19773f26d562bd7d6453d0ed44630ca394fbd06c795b53fbf8e6e43a013ef6f7bf1352de80c8536dcf1399ddccc6653060d940887 diff --git a/dev-ros/openni2_camera/metadata.xml b/dev-ros/openni2_camera/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/openni2_camera/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild b/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild new file mode 100644 index 000000000000..1ba2b9822efd --- /dev/null +++ b/dev-ros/openni2_camera/openni2_camera-0.2.5.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera" +CATKIN_HAS_MESSAGES=yes +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/camera_info_manager + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/roscpp + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/OpenNI2 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/openni2_camera/openni2_camera-9999.ebuild b/dev-ros/openni2_camera/openni2_camera-9999.ebuild new file mode 100644 index 000000000000..1ba2b9822efd --- /dev/null +++ b/dev-ros/openni2_camera/openni2_camera-9999.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera" +CATKIN_HAS_MESSAGES=yes +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/image_transport + dev-ros/camera_info_manager + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/roscpp + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/OpenNI2 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest new file mode 100644 index 000000000000..5121f1bca50b --- /dev/null +++ b/dev-ros/openni2_launch/Manifest @@ -0,0 +1 @@ +DIST openni2_launch-0.2.2.tar.gz 3754 SHA256 a8b7b28b82bb5d58accb96e4710e257547324a1f9131cf425d792b6f20535810 SHA512 1bdbccb6b29f1f3a1909faf959e0a2faca48c8229f5c7469b2b279d962f161940ef0d5b879d1c915d725e8c8cab3173c76aabe67bdacce970727cdfd6cb4073e WHIRLPOOL 56b862f859459543140947c8c0d43972c8c709dbb1f72aa2e8b6aa1878c64dcb149385d56c9c5c2b6b92e4422f34d0d2e88b5d81aabbaba74c5ed0729dc0e034 diff --git a/dev-ros/openni2_launch/metadata.xml b/dev-ros/openni2_launch/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/openni2_launch/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild b/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild new file mode 100644 index 000000000000..8448a4920dfc --- /dev/null +++ b/dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rgbd_launch + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/openni2_camera + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild new file mode 100644 index 000000000000..8448a4920dfc --- /dev/null +++ b/dev-ros/openni2_launch/openni2_launch-9999.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/openni2_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rgbd_launch + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/openni2_camera + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild index 1e355523dc13..e48032773cc7 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.2.29-r1.ebuild @@ -18,6 +18,7 @@ IUSE="" RDEPEND=" dev-qt/qtcore:4 + dev-qt/qtgui:4 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}] dev-libs/tinyxml diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild index 1e355523dc13..e48032773cc7 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild @@ -18,6 +18,7 @@ IUSE="" RDEPEND=" dev-qt/qtcore:4 + dev-qt/qtgui:4 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.2.18[${PYTHON_USEDEP}] dev-libs/tinyxml diff --git a/dev-ros/rgbd_launch/Manifest b/dev-ros/rgbd_launch/Manifest new file mode 100644 index 000000000000..34420f22d309 --- /dev/null +++ b/dev-ros/rgbd_launch/Manifest @@ -0,0 +1 @@ +DIST rgbd_launch-2.1.0.tar.gz 4537 SHA256 74c1973c10b687339094fa14a6979359beafded55b81362a0861964dd0964b6e SHA512 aa4339f3ef711ea01e2184a5e3d642188d4c31ff3629e07044deb4ef3a3a4f74edda9997fc6fb7d44ab873158ab0b383e004eaa2f9b06e7f4a722541974dc8bd WHIRLPOOL 574eb3c36af5a27f1b8af0adddb1f676459d92d045626037953b6c26fe9925829c7b3809a15dce141696bd618905ed10e9a4e7134dede5d5d96e66512fae250e diff --git a/dev-ros/rgbd_launch/metadata.xml b/dev-ros/rgbd_launch/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/rgbd_launch/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild b/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild new file mode 100644 index 000000000000..4fa6e4250b89 --- /dev/null +++ b/dev-ros/rgbd_launch/rgbd_launch-2.1.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to open an RGBD device" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild new file mode 100644 index 000000000000..4fa6e4250b89 --- /dev/null +++ b/dev-ros/rgbd_launch/rgbd_launch-9999.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-drivers/rgbd_launch" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Launch files to open an RGBD device" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/depth_image_proc + dev-ros/image_proc + dev-ros/nodelet + dev-ros/tf +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/robot_pose_publisher/Manifest b/dev-ros/robot_pose_publisher/Manifest new file mode 100644 index 000000000000..872de2f98e03 --- /dev/null +++ b/dev-ros/robot_pose_publisher/Manifest @@ -0,0 +1 @@ +DIST robot_pose_publisher-0.2.3.tar.gz 4225 SHA256 b8e1f7e8957a89a929e66a3222261431e227639100f21a184e22dbd4226a467f SHA512 393c906754015161643a3047e8ab6690292d4446fc89fb1caa6e1a8fd25e6d880bcd23ea9780eea7c2fe7eb83331455894c93a90fdce01d0f483cae90b653314 WHIRLPOOL 4395b4a4395725eb1ff74768f92f0b39c42163b1c5a237d6776c01ec747e80e4fef3ce51ce632877f586e8219e6a9ea97ebfe3c591d1a807d4989239aa3675a6 diff --git a/dev-ros/robot_pose_publisher/metadata.xml b/dev-ros/robot_pose_publisher/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/robot_pose_publisher/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> 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.3.ebuild new file mode 100644 index 000000000000..ae81a9889c3c --- /dev/null +++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-0.2.3.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild new file mode 100644 index 000000000000..ae81a9889c3c --- /dev/null +++ b/dev-ros/robot_pose_publisher/robot_pose_publisher-9999.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/WPI-RAIL/robot_pose_publisher" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="A Simple Node to Publish the Robot's Position Relative to the Map using TFs" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/tf + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/shape_tools/Manifest b/dev-ros/shape_tools/Manifest new file mode 100644 index 000000000000..fb4b451adf1a --- /dev/null +++ b/dev-ros/shape_tools/Manifest @@ -0,0 +1 @@ +DIST shape_tools-0.2.1.tar.gz 3684 SHA256 19a11713c78e409a466bca5168a7710e096a92f92fcafef4fa485bc7606eaf3e SHA512 4d6da49528518776cb51ace908f0f0326b31b2928f0cb8ae0b12bcb0c1fdac99cbcd71f6bd3324d6aecc38a68a10012535b914a2349925eab1487eed8e1bede3 WHIRLPOOL 01a59f454e70c218c033d8af10612ab8897fe523f806a565f397876015b6a293cebd20f66511723d40034dbf33a29c1fbe68635e0b0569ddf100ed5c99efb2b4 diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/shape_tools/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/shape_tools/shape_tools-0.2.1.ebuild b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild new file mode 100644 index 000000000000..55a402976188 --- /dev/null +++ b/dev-ros/shape_tools/shape_tools-0.2.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-planning/shape_tools" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Tools for operating on shape messages" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ + -i CMakeLists.txt \ + || die +} diff --git a/dev-ros/shape_tools/shape_tools-9999.ebuild b/dev-ros/shape_tools/shape_tools-9999.ebuild new file mode 100644 index 000000000000..55a402976188 --- /dev/null +++ b/dev-ros/shape_tools/shape_tools-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-planning/shape_tools" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Tools for operating on shape messages" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \ + -i CMakeLists.txt \ + || die +} diff --git a/dev-ros/urg_c/Manifest b/dev-ros/urg_c/Manifest new file mode 100644 index 000000000000..ae3bde5164a8 --- /dev/null +++ b/dev-ros/urg_c/Manifest @@ -0,0 +1 @@ +DIST urg_c-1.0.404.tar.gz 105987 SHA256 cb51032301515297b3839f6dec0c7124bc533936da1e7bbd28989dcb51fa1da4 SHA512 5a0e19a0f73dc99ce63dbf0417ad29647465691b8e0dbc869f96381d68cf2b3a7f0b3989635848fa6f0f3344ae7ca769d6d964ff591e198b445ce49eb31393d1 WHIRLPOOL 2431d32622e604c305d88510e376bf29475f9ba35e9ea9bdf1505103cbefbfd0285201a8671798e751cd62a6c40909fbbe43a89e6abe619fbd73d510d022ec82 diff --git a/dev-ros/urg_c/metadata.xml b/dev-ros/urg_c/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/urg_c/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/urg_c/urg_c-1.0.404.ebuild b/dev-ros/urg_c/urg_c-1.0.404.ebuild new file mode 100644 index 000000000000..30e0accb3395 --- /dev/null +++ b/dev-ros/urg_c/urg_c-1.0.404.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_c" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c" +LICENSE="BSD" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="" diff --git a/dev-ros/urg_c/urg_c-9999.ebuild b/dev-ros/urg_c/urg_c-9999.ebuild new file mode 100644 index 000000000000..30e0accb3395 --- /dev/null +++ b/dev-ros/urg_c/urg_c-9999.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_c" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="URG Helper / URG Widget / URG Library / urg_c" +LICENSE="BSD" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="" diff --git a/dev-ros/urg_node/Manifest b/dev-ros/urg_node/Manifest new file mode 100644 index 000000000000..1ad784195282 --- /dev/null +++ b/dev-ros/urg_node/Manifest @@ -0,0 +1 @@ +DIST urg_node-0.1.9.tar.gz 13159 SHA256 b4691da54db803fb7f9d0bd2e2008a58de4a36fa7082dc69a1938c1702994387 SHA512 5b9493363406e80780909c68db50277a8629a6fdad7b012d63431a8e62de35532630e141e7b6664586f18e84915e6d2c6e5183911755a0e0cf13991158a05a97 WHIRLPOOL a0d622d21f7b9234a4c6083bfbcbf7c15a8f5b4e9d5b7a1c7f8217eb944a75e3d7aa997a04bc7d567b183ad7b37275367bc3680a21a79e043a7e1064039fdd32 diff --git a/dev-ros/urg_node/metadata.xml b/dev-ros/urg_node/metadata.xml new file mode 100644 index 000000000000..c42ea5b15cf6 --- /dev/null +++ b/dev-ros/urg_node/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ros</herd> +</pkgmetadata> diff --git a/dev-ros/urg_node/urg_node-0.1.9.ebuild b/dev-ros/urg_node/urg_node-0.1.9.ebuild new file mode 100644 index 000000000000..e70e01112a0d --- /dev/null +++ b/dev-ros/urg_node/urg_node-0.1.9.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_node" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/urg_c + dev-ros/tf + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/diagnostic_updater + dev-ros/laser_proc + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/urg_node/urg_node-9999.ebuild b/dev-ros/urg_node/urg_node-9999.ebuild new file mode 100644 index 000000000000..e70e01112a0d --- /dev/null +++ b/dev-ros/urg_node/urg_node-9999.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-drivers/urg_node" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="ROS wrapper for the Hokuyo urg_c library" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/urg_c + dev-ros/tf + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/nodelet + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/diagnostic_updater + dev-ros/laser_proc + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/xmlrpcpp/files/headers.patch b/dev-ros/xmlrpcpp/files/headers.patch new file mode 100644 index 000000000000..ed0cea6f0f4e --- /dev/null +++ b/dev-ros/xmlrpcpp/files/headers.patch @@ -0,0 +1,15 @@ +Index: ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt +=================================================================== +--- ros_comm-1.11.15.orig/utilities/xmlrpcpp/CMakeLists.txt ++++ ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt +@@ -30,9 +30,8 @@ if(WIN32) + target_link_libraries(xmlrpcpp ws2_32) + endif() + +-# FIXME the headers should be in a package-specific subfolder but can not be for backward compatibility + install(DIRECTORY include/ +- DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} ++ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h") + + install(TARGETS xmlrpcpp diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild index a0ae0fd21c51..b4772f1846dc 100644 --- a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild +++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild @@ -17,3 +17,11 @@ IUSE="" RDEPEND="dev-ros/cpp_common" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/headers.patch" ) + +src_configure() { + ros-catkin_src_configure + # Hack so that proper -I are added + sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \ + -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die +} diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild index a0ae0fd21c51..b4772f1846dc 100644 --- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild +++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild @@ -17,3 +17,11 @@ IUSE="" RDEPEND="dev-ros/cpp_common" DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/headers.patch" ) + +src_configure() { + ros-catkin_src_configure + # Hack so that proper -I are added + sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \ + -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die +} diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest index 2e9770e2d7fb..29f1195cc0ac 100644 --- a/dev-ruby/gettext_i18n_rails/Manifest +++ b/dev-ruby/gettext_i18n_rails/Manifest @@ -1,3 +1,4 @@ DIST gettext_i18n_rails-1.2.2.tar.gz 20254 SHA256 4bdaff360864211ee8739155f881cbe505d36ae8ec0d592c8180779f6f84a35e SHA512 c2a02a2aaa118581e81b3ff375ebfb8b4e58fc2313e8d7f321d881370b546d906eec51f848d27f2996ca16938bc7580ed6c27d780d1531a251578ce9260bcb40 WHIRLPOOL c674993506104a8475b7a2be422f11558aa001f362cdc7786fc27cf3b44368ce5855a0ecdc555e28345ad81cd14c70d785c5952cd8bbf6506a0720534c658d38 DIST gettext_i18n_rails-1.2.3.tar.gz 20252 SHA256 48af9946c8165ece5c1c94c01045596e25f00bc679e3eb835e45992663444fd7 SHA512 b28bea0100ca5dd307ead1b77f4e71b491eb12899d772394c6e3ea73150ef4277c7305de0dfd2429ccc635af462f0b0f4f42280cdb666ebc7cee2cf9a43a04a2 WHIRLPOOL f54222b9940b58e16a2e1e27eb36d044ae42fe4b9ed1e06edeb57f5ea1e1ebc727de1cd564cd3679f0851b47fc5ebe93d3913a2ef90de8ebd56917a08ba19913 DIST gettext_i18n_rails-1.3.0.tar.gz 20218 SHA256 b52a90e45d6bcdfac828cebbf52892ccadb320d148bb14a8267f8545b4347877 SHA512 90136a441aad8c5b26fe39454b675b444ff5cdfa87c4d6ec1738583ea5b6db793b1d05db94e9084905249a75f19239acf5812e6e8350d3ee2537aed76387c2d2 WHIRLPOOL b8503ad978faeeaff0a966be62392bbc0ef4361f28575e50afb799431fb311368b656a4c702749d4dd12f2e342f4c79abe5fe1cd56f64aa41441c073e53449e6 +DIST gettext_i18n_rails-1.3.1.tar.gz 20261 SHA256 d50193878e7b8eee61ba48fe33c10f7eed28afdcb7e500dd135743cbc9ffd72f SHA512 761c941aa4d4a746067b84c703b7ca661af3229a2886113a0c5beb1872efd5e74dae7bcf0c6bb476078e636835d19a66e93c8c9c7850024c4ca025e153f1b708 WHIRLPOOL 0b865211641224a5dfc6e76e88297fc2cc8576789a099ca65bc3deefb95318313ec8bae24070fde65c0cd219402cc928265b7ef626435836d3fa8e908ad4ece4 diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild new file mode 100644 index 000000000000..459fe13b2dd7 --- /dev/null +++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +USE_RUBY="ruby20 ruby21" + +RUBY_FAKEGEM_TASK_DOC="" +RUBY_FAKEGEM_EXTRADOC="Readme.md" + +RUBY_FAKEGEM_RECIPE_TEST="rspec3" + +inherit ruby-fakegem + +DESCRIPTION="FastGettext / Rails integration" +HOMEPAGE="https://github.com/grosser/gettext_i18n_rails" +SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_bdepend "test? ( dev-ruby/rails:4.0 dev-ruby/activerecord:4.0[sqlite] dev-ruby/temple )" +ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0" + +all_ruby_prepare() { + rm Gemfile Gemfile.lock || die + + # Remove specs for slim and hamlet, template engines we don't package. + rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die + + # Test against Rails 4.0 (newer versions don't work and we don't use + # appraisals for now). + sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die +} diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest index ac298865c57e..f567097bbe80 100644 --- a/dev-vcs/mercurial/Manifest +++ b/dev-vcs/mercurial/Manifest @@ -1,5 +1,5 @@ DIST mercurial-3.3.2.tar.gz 4165131 SHA256 67c617c740ac706f923371a26f02339b27cd6c36e5d3fb2ccad0dc02361527fa SHA512 f151ea3187b70d70a82f643aaacd2742d0ce5f996590eab008332a7f28df5a19e99634ff33b0509ad38d2b6b411627413a457255df8a8e45025246beebb6fcc1 WHIRLPOOL 740b1ebb68f7c8baf3e6a9b023be2423677e3189221dc302c0601b514193e27eaaf73985c9536c6aa03fa0c5b9be8c092cd7b3eaca5f77ee24bfa276bbb6109c DIST mercurial-3.3.3.tar.gz 4167447 SHA256 a445367f0dcbaf3a6279bfa743b364e729be0d1f0c852cb6d37f297916ffae13 SHA512 bea215b0bd9e8603ade019f01ae0600dd1d1ad77675b38b5e13d86c43dd2c58b6c86c252517f0fcab6444c171e9f53537e4e170739c991ac08a1111169fe545d WHIRLPOOL e5fd41c6d27d7fce8559a2d15b33e24cf702d9497326e2c1062fe2acd22e7ad16cd6981d3dadb5a7458f12dcd35cc98583f53bc3188d99a9638daddb7d95657b DIST mercurial-3.4.2.tar.gz 4296407 SHA256 dcc90e4a8476149ecc8af13c08202860b4c9c987a94c4f3c18b28294b6fd8ecd SHA512 f5ef7064a1ac4189fe4db91fec283cdead257b132674d0869f075b80ba5707e0163e28f18545a9d867336ebc6b1cbb8bcf794b6881b8f23f6c067e68c7ae584b WHIRLPOOL db7389c92680f6058efda6fa4cb7747ff3cd78bc361c43464a938c213b9ce46e8a040a57c68975f02342beb35522c27c3ab6250b2fc6e54777ddd20b0bda5443 -DIST mercurial-3.5.1.tar.gz 4414284 SHA256 997da45da303e399678c5bccd7be39b0fabf29c7e02fd3c8751c2ff88c8a259d SHA512 2435b3c50753e787577a847c96d3e4515015e02bc7ecdd21848530834d210831bb0690d31d4940626bbbe84cfccb1d245f8c4e1156317cda9469e7b870c042d5 WHIRLPOOL 97a0e6762657c2f560041f30e513fe8d5377bf654e39bf8a218d132952f60b59db63a6c078cdac6b529a8cb49ee766054daad9192951987b3a288e3b43e70ba7 DIST mercurial-3.5.2.tar.gz 4415307 SHA256 23fdc038503911b21dc9e556118803f7b1d4150eb14933d2ea3d0ff0dc60ab5d SHA512 d0a4007763186ab72e7ef6e6f6fa84719fcdc2d16208bc99cc32f44cecdc0ccdf5719e18fbc8a5d0735f6441acc0d82bcac05d7c75fee15966c88ee75e7b6bdd WHIRLPOOL 10ec5dd3d1d2e3487f4a290bc0d32fe2237cc450b54774503e7e9e25b12e895c8065f1c2e27dcaa03deac82d1e10e58dd8ea18e9bacf4f24f58a52a3d5c0fea4 +DIST mercurial-3.6.tar.gz 4516703 SHA256 85b5574f3694373e981926374a758dab2128d6f3c593a72a7c9d2cb371054f39 SHA512 5e3fa99f6cb5a4f5867233946714222c53f05d95b791fd0855afc9d5f3dfade8aeae08b3581ea700ae64516f304a120843b4187d1e309c5cf0c15af798889664 WHIRLPOOL 732a938ff2d5064619d55da84f1c718ac149a9236e9631054c9852b359c80e5420f0b020641a2d0d35c32ca4b5771693c0537313b240f80f275aa6b24fc70ccd diff --git a/dev-vcs/mercurial/mercurial-3.5.1.ebuild b/dev-vcs/mercurial/mercurial-3.6.ebuild index 1f57c1ef8c43..1f57c1ef8c43 100644 --- a/dev-vcs/mercurial/mercurial-3.5.1.ebuild +++ b/dev-vcs/mercurial/mercurial-3.6.ebuild diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest index b414d753b1ac..f6df919be2b2 100644 --- a/games-engines/gemrb/Manifest +++ b/games-engines/gemrb/Manifest @@ -1 +1,2 @@ DIST gemrb-0.8.2.tar.gz 12302710 SHA256 57cc267f730d205774fa5a6db1f0dd88b97a8193dbece905d70cb50e433774ee SHA512 2a666537ca540f041122bcd1117cf591c5a223480a5c4c18eebaef6b446fc355c6078d54fcbc3a89b8ba35d7ecbaf53648394e383f0479e84da999fccea1f496 WHIRLPOOL 4ad8a39b937467e7e7a28dbae1d3d449789259124bb0be6dc916ef1396da9b3027ded802d906311ff53785288f423ae7d6fd4d3f339782fa259d6bb3de1c4a31 +DIST gemrb-0.8.3.tar.gz 12370971 SHA256 4996d4d66e60d9ec0c63b94f687c4a6d54f4fbbfb80304245e8ff0fa886f5664 SHA512 6f091ba54d129c47b6ad7c3b1da898c7ef79b80629b373527963a0b35096ccbf91650087c4884081d306da4be7b4cfa1dc2f6d931d7140d7eccb380d9806db1c WHIRLPOOL 4f0da79423dbe9bc0c5438dc0df148005e1c2981e545f7a0649162af1b32384ff9a398eabbcfaea477cec31ee65cc5b3586d7cfa82155a234e21dd4ff8e8bc5e diff --git a/games-engines/gemrb/gemrb-0.8.3.ebuild b/games-engines/gemrb/gemrb-0.8.3.ebuild new file mode 100644 index 000000000000..7898a016ea94 --- /dev/null +++ b/games-engines/gemrb/gemrb-0.8.3.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) +WANT_CMAKE=always +inherit eutils python-any-r1 cmake-utils gnome2-utils games + +DESCRIPTION="Reimplementation of the Infinity engine" +HOMEPAGE="http://gemrb.sourceforge.net/" +SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="media-libs/freetype + media-libs/libpng:0 + >=media-libs/libsdl-1.2[video] + media-libs/libvorbis + media-libs/openal + media-libs/sdl-mixer + sys-libs/zlib + ${PYTHON_DEPS}" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +pkg_setup() { + python-any-r1_pkg_setup + games_pkg_setup +} + +src_prepare() { + sed -i \ + -e '/COPYING/d' \ + CMakeLists.txt || die +} + +src_configure() { + mycmakeargs=( + -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}" + -DBIN_DIR="${GAMES_BINDIR}" + -DDATA_DIR="${GAMES_DATADIR}/gemrb" + -DSYSCONF_DIR="${GAMES_SYSCONFDIR}/gemrb" + -DLIB_DIR="$(games_get_libdir)" + -DMAN_DIR=/usr/share/man/man6 + -DICON_DIR=/usr/share/pixmaps + -DMENU_DIR=/usr/share/applications + -DDOC_DIR="/usr/share/doc/${PF}" + -DSVG_DIR=/usr/share/icons/hicolor/scalable/apps + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile +} + +src_install() { + DOCS="README NEWS AUTHORS" \ + cmake-utils_src_install + prepgamesdirs +} + +pkg_preinst() { + games_pkg_preinst + gnome2_icon_savelist +} + +pkg_postinst() { + games_pkg_postinst + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest index 75a1c4c9ee32..6f4d053a8598 100644 --- a/games-util/antimicro/Manifest +++ b/games-util/antimicro/Manifest @@ -1,2 +1,3 @@ DIST antimicro-2.10.1.tar.gz 662670 SHA256 9a65127dc415017dd2c84f06a4c803d6353a1c6a129a2f9a30791cffce0378b4 SHA512 0601ae0ea2bb7249e0bb7fdf12a9d023058bf37fde2f7dc350676d3a0b757ad29e43b5f1c8fd0c4600207338a755f12640ea8b5c8e762f01d528364048326ddf WHIRLPOOL 2e5d32a9bf2e05838111786ceb0f7646b457f4e9042cc99a6aaa79cdcacefacdd9d4698ab42870c6eb97f735f2bb99d904e45d168a34acf87bc0f97524b3eeb0 DIST antimicro-2.19.2.tar.gz 1028594 SHA256 039dd006aa8f8b2f4162ec6e03599aaf2d52523620542915aa7baabe74b8959d SHA512 1e68b2cde2c60765af81ae4eed25787698dc18c699e19371bceaf805fcb97f0166dc5345c70f695f5488f872de28f43bf664f238640eff2343e1d19231ff7df1 WHIRLPOOL e358d8eb7fcffe1e54b1ade0dadbb69b8d2bbad0ec22e25cfbd3c38975a2f46002a4da3f7ee06ee066646c1992c0bd5ebcd6da5a7c1a1a26ea7c5bf729305e7d +DIST antimicro-2.20.2.tar.gz 1069469 SHA256 9e845debb4629cdbc3deedd02821196e27e177724492d937aa966a09f99b70ac SHA512 09847c804b6a1d022f2990d269c9124cfdfab821e0fd1cb1ab5e27e4c6a3bd250fab5977ca614f03c46456ca6e1c7111135b9b4d8f75e54c435e0b712653e282 WHIRLPOOL 6c5f7029c87e5bcf94d39de83fec2e1923d714288d59bd227819c0817a20d46f98673189781a266ec85430ec05a4b5d496ea1892f6a37e8c8c6455090f5831b5 diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild new file mode 100644 index 000000000000..5ef14410a095 --- /dev/null +++ b/games-util/antimicro/antimicro-2.20.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils cmake-utils + +DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons" +HOMEPAGE="https://github.com/Ryochan7/antimicro" +SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtnetwork:5 + media-libs/libsdl2[X,joystick] + x11-libs/libX11 + x11-libs/libXtst" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + -DUSE_SDL_2=ON + ) + + QT_SELECT=5 cmake-utils_src_configure +} diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index 86937900092d..71000610f8b2 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -1,2 +1,3 @@ DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c +DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711 DIST sane-backends-git20150628.tar.gz 5765552 SHA256 4cfd1245df8ade75cbfaedec91b1daaea6d30e0736e5d2f9afcd0a56fc357711 SHA512 8e8160b2337502a0b77724ffaa5bd65a6daaa3fa5587f1b72e2714c9253e8130e96170d7f1de38210e17c5524cbe0953ff0464d29db194354d4e9b7249782eaf WHIRLPOOL d9b9a4f44cb3fcda9c8099d5ed3a9764e0a961f80ae1a89dda4e0ec8e6c24c830ad0feebd13c28af848c133a99e50d21c2f01269e434af31b17164a377edbbff diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch new file mode 100644 index 000000000000..217a4408e2ff --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.25-disable-usb-tests.patch @@ -0,0 +1,14 @@ +do not let the tests try reading/locking usb hardware. we also disable +this because the test will abort() if no usb support is found at all. + +--- a/testsuite/sanei/sanei_usb_test.c ++++ b/testsuite/sanei/sanei_usb_test.c +@@ -832,6 +832,8 @@ main (int argc, char **argv) + int detected, opened, i; + SANE_Int dn[MAX_DEVICES]; + ++ return 77; ++ + #ifdef HAVE_LIBUSB + printf ("\n%s built with old libusb\n\n", argv[0]); + #endif diff --git a/media-gfx/sane-backends/sane-backends-1.0.25.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild new file mode 100644 index 000000000000..9604d38a5827 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.0.25.ebuild @@ -0,0 +1,347 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +IUSE_SANE_BACKENDS=" + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpljm1005 + hpsj5s + hs2p + ibm + kodak + kodakaio + kvs1025 + kvs20xx + kvs40xx + leo + lexmark + ma1509 + magicolor + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + mustek_usb2 + nec + net + niash + p5 + pie + pixma + plustek + plustek_pp + pnm + qcam + ricoh + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax1220u + umax_pp + xerox_mfp" + +IUSE="avahi doc gphoto2 ipv6 nls snmp systemd threads usb v4l xinetd" + +for backend in ${IUSE_SANE_BACKENDS}; do + case ${backend} in + # Disable backends that require parallel ports as no one has those anymore. + canon_pp|hpsj5s|mustek_pp|\ + pnm) + IUSE+=" -sane_backends_${backend}" + ;; + mustek_usb2|kvs40xx) + IUSE+=" sane_backends_${backend}" + ;; + *) + IUSE+=" +sane_backends_${backend}" + esac +done + +REQUIRED_USE=" + sane_backends_mustek_usb2? ( threads ) + sane_backends_kvs40xx? ( threads ) +" + +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +case ${PV} in +9999) + EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git" + inherit git-r3 autotools + ;; +*_pre*) + MY_P="${PN}-git${PV#*_pre}" + SRC_URI="http://www.sane-project.org/snapshots/${MY_P}.tar.gz + mirror://gentoo/${MY_P}.tar.gz" + S=${WORKDIR}/${MY_P} + ;; +*) + MY_P=${P} + FRS_ID="4146" + SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" + ;; +esac + +LICENSE="GPL-2 public-domain" +SLOT="0" +if [[ ${PV} != "9999" ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +fi + +RDEPEND=" + sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}] + ) + avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + ) + v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + xinetd? ( sys-apps/xinetd ) + snmp? ( net-analyzer/net-snmp ) + systemd? ( sys-apps/systemd:0= ) +" + +DEPEND="${RDEPEND} + v4l? ( sys-kernel/linux-headers ) + doc? ( + virtual/latex-base + dev-texlive/texlive-latexextra + ) + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]" + +# We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) +RDEPEND="${RDEPEND} + !<sys-fs/udev-114" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +pkg_setup() { + enewgroup scanner + enewuser saned -1 -1 -1 scanner +} + +src_prepare() { + cat >> backend/dll.conf.in <<-EOF + # Add support for the HP-specific backend. Needs net-print/hplip installed. + hpaio + # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. + epkowa + EOF + epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch + if [[ ${PV} == "9999" ]] ; then + mv configure.{in,ac} || die + AT_NOELIBTOOLIZE=yes eautoreconf + fi + + # Fix for "make check". Upstream sometimes forgets to update this. + local ver=$(./configure --version | awk '{print $NF; exit 0}') + sed -i \ + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ + testsuite/tools/data/html* || die +} + +src_configure() { + append-flags -fno-strict-aliasing + + # if LINGUAS is set, just use the listed and supported localizations. + if [[ ${LINGUAS+set} == "set" ]]; then + mkdir -p po || die + strip-linguas -u po + printf '%s\n' ${LINGUAS} > po/LINGUAS + fi + + multilib-minimal_src_configure +} + +multilib_src_configure() { + # the blank is intended - an empty string would result in building ALL backends. + local BACKENDS=" " + + use gphoto2 && BACKENDS="gphoto2" + use v4l && BACKENDS="${BACKENDS} v4l" + for backend in ${IUSE_SANE_BACKENDS}; do + if use "sane_backends_${backend}" && [ ${backend} != pnm ]; then + BACKENDS="${BACKENDS} ${backend}" + fi + done + + local myconf=( + $(use_enable usb libusb_1_0) + $(multilib_native_use_with snmp) + ) + + # you can only enable this backend, not disable it... + if use sane_backends_pnm; then + myconf+=( --enable-pnm-backend ) + fi + if ! use doc; then + myconf+=( --disable-latex ) + fi + if use sane_backends_mustek_pp; then + myconf+=( --enable-parport-directio ) + fi + if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp; }; then + myconf+=( sane_cv_use_libieee1284=no ) + fi + + # relative path must be used for tests to work properly + ECONF_SOURCE=${S} \ + SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${BACKENDS}" \ + econf \ + $(use_with gphoto2) \ + $(multilib_native_use_with systemd) \ + $(use_with v4l) \ + $(use_enable avahi) \ + $(use_enable ipv6) \ + $(use_enable nls translations) \ + $(use_enable threads pthread) \ + "${myconf[@]}" +} + +multilib_src_compile() { + emake VARTEXFONTS="${T}/fonts" + + if tc-is-cross-compiler; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + + # The build system sucks and doesn't handle this properly. + # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ + "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ + "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die + local dirs=( hal hotplug hotplug-ng udev ) + local targets=( + hal/libsane.fdi + hotplug/libsane.usermap + hotplug-ng/libsane.db + udev/libsane.rules + ) + mkdir -p "${dirs[@]}" || die + emake "${targets[@]}" + + popd >/dev/null + fi + + if use usb; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die + fi +} + +multilib_src_install() { + emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir="${EPREFIX}"/usr/share/doc/${PF} + + if multilib_is_native_abi; then + if use usb; then + insinto /etc/hotplug/usb + doins tools/hotplug/libsane.usermap + fi + + udev_newrules tools/udev/libsane.rules 41-libsane.rules + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + fi +} + +multilib_src_install_all() { + keepdir /var/lib/lock/sane + fowners root:scanner /var/lib/lock/sane + fperms g+w /var/lib/lock/sane + dodir /etc/env.d + + if use usb; then + exeinto /etc/hotplug/usb + doexe tools/hotplug/libusbscanner + newdoc tools/hotplug/README README.hotplug + fi + + dodoc NEWS AUTHORS ChangeLog* PROBLEMS README README.linux + prune_libtool_files --all + if use xinetd; then + insinto /etc/xinetd.d + doins "${FILESDIR}"/saned + fi + + newinitd "${FILESDIR}"/saned.initd saned + newconfd "${FILESDIR}"/saned.confd saned +} + +pkg_postinst() { + if use xinetd; then + elog "If you want remote clients to connect, edit" + elog "/etc/sane.d/saned.conf and /etc/hosts.allow" + fi + + elog "If you are using a USB scanner, add all users who want" + elog "to access your scanner to the \"scanner\" group." +} diff --git a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild index 190f4f7973e2..61a6e8fc0f35 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.25_pre20150628.ebuild @@ -197,9 +197,10 @@ src_prepare() { "${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \ "${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \ "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch \ - "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch + "${FILESDIR}"/${PN}-1.0.24-cross-compile.patch \ + "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch # Fix for "make check". - sed -i -e 's/sane-backends 1.0.24git/sane-backends 1.0.24/' testsuite/tools/data/html* + sed -i -e 's/sane-backends 1.0.24/sane-backends 1.0.25git/' testsuite/tools/data/html* mv configure.{in,ac} || die AT_NOELIBTOOLIZE=yes eautoreconf } diff --git a/media-gfx/sane-backends/sane-backends-9999.ebuild b/media-gfx/sane-backends/sane-backends-9999.ebuild index b7c69fcecba7..9604d38a5827 100644 --- a/media-gfx/sane-backends/sane-backends-9999.ebuild +++ b/media-gfx/sane-backends/sane-backends-9999.ebuild @@ -4,7 +4,7 @@ EAPI="5" -inherit autotools eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs +inherit eutils flag-o-matic multilib multilib-minimal udev user toolchain-funcs # gphoto and v4l are handled by their usual USE flags. # The pint backend was disabled because I could not get it to compile. @@ -121,7 +121,7 @@ HOMEPAGE="http://www.sane-project.org/" case ${PV} in 9999) EGIT_REPO_URI="git://anonscm.debian.org/sane/sane-backends.git" - inherit git-r3 + inherit git-r3 autotools ;; *_pre*) MY_P="${PN}-git${PV#*_pre}" @@ -131,7 +131,8 @@ case ${PV} in ;; *) MY_P=${P} - SRC_URI="https://alioth.debian.org/frs/download.php/file/3958/${P}.tar.gz" + FRS_ID="4146" + SRC_URI="https://alioth.debian.org/frs/download.php/file/${FRS_ID}/${P}.tar.gz" ;; esac @@ -142,18 +143,20 @@ if [[ ${PV} != "9999" ]] ; then fi RDEPEND=" - sane_backends_dc210? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) - sane_backends_dc240? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] ) - sane_backends_dell1600n_net? ( >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] - >=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}] ) + sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] + >=media-libs/tiff-3.9.7-r1:0=[${MULTILIB_USEDEP}] + ) avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) - usb? ( >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] - >=virtual/jpeg-0-r2[${MULTILIB_USEDEP}] + >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) xinetd? ( sys-apps/xinetd ) @@ -171,11 +174,7 @@ DEPEND="${RDEPEND} # We now use new syntax construct (SUBSYSTEMS!="usb|usb_device) RDEPEND="${RDEPEND} - !<sys-fs/udev-114 - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-medialibs-20140508 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - )" + !<sys-fs/udev-114" MULTILIB_CHOST_TOOLS=( /usr/bin/sane-config @@ -193,12 +192,18 @@ src_prepare() { # Add support for the Epson-specific backend. Needs media-gfx/iscan installed. epkowa EOF - epatch "${FILESDIR}"/niash_array_index.patch \ - "${FILESDIR}"/${PN}-1.0.24-automagic_systemd.patch \ - "${FILESDIR}"/${PN}-1.0.24-systemd_pkgconfig.patch \ - "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch - mv configure.{in,ac} || die - AT_NOELIBTOOLIZE=yes eautoreconf + epatch "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + epatch "${FILESDIR}"/${PN}-1.0.25-disable-usb-tests.patch + if [[ ${PV} == "9999" ]] ; then + mv configure.{in,ac} || die + AT_NOELIBTOOLIZE=yes eautoreconf + fi + + # Fix for "make check". Upstream sometimes forgets to update this. + local ver=$(./configure --version | awk '{print $NF; exit 0}') + sed -i \ + -e "/by sane-desc 3.5 from sane-backends/s:sane-backends .*:sane-backends ${ver}:" \ + testsuite/tools/data/html* || die } src_configure() { diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest index 8fbbf6e4548f..f78cfbefe7d8 100644 --- a/media-libs/freeverb3/Manifest +++ b/media-libs/freeverb3/Manifest @@ -1,3 +1,4 @@ DIST freeverb3-2.5.13.tar.gz 6143981 SHA256 9c29adc15a94e6140e52f0b1a5a60923a8e9a3beb21ada4182363c60b25126dd SHA512 9ebe020790fdc41fb1d766757b7ea8a2e93e6112e97ada620698fd36f8f471b6ea52e423371490a2b24328354e6b4d2f2f35f345a3bec68a4d55de929199dfb9 WHIRLPOOL 4bf2f6f634492a621eb541064bec6dc2c5afa8b303311c34402b46f5ca82ee7d6162430414f92e11042fbc77e990a25b150d67e6352207d29b1bca5163aeb5bb DIST freeverb3-2.6.6.tar.gz 6208119 SHA256 55c0585c8d53df1bcc5dcb6ffd26fc123583a239c3f064229af71e5f8dca6816 SHA512 755c95ef184487af7e01ea32765b77eba6ffc9738aece3d64f9da019f720075fb7907341689a8adbe81d6fd265a82436da578df2d98ff2e82803a064df4c5dc1 WHIRLPOOL 77795333dc30f3aca514a3a16d8760373bf1ac34fdcc1f3feef3d3bd3071fedf1dcb73ca85b3bf27666c0fba176d86607d68d4c0d5d37a2cfa42a5417d282bb4 DIST freeverb3-3.1.1.tar.xz 6067288 SHA256 6327b6809f4c15dfc74331f0b88af8d92f593d1bf8eabee15ec2a98217aa8d93 SHA512 83feb43a6c178b82958089a3527788f1426bc76e5a86d353df5818a0ebeb1656742e225d4e3eb3187b768169af1a6f2716215408fdb30869452d10d64a967516 WHIRLPOOL e2ac3bec3f2ba90bfc8f25d9c09290dcdc5e43e4528182cbf112614f9d86e97f27beb13a4869cfe5ac10a29af47e4ed9ab64a064189d57ac1d4282a38442b935 +DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 SHA256 759ba987a6d696a34ce9a5a69ba87687bf678a93de3f49af3ad19df638379ae0 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536 WHIRLPOOL a61cc9d301ddbbede0b9100219d93523ff7cece133f4402b1d82c2c9008d9cd7b2f89a1b94f8f638a298efd5bdc12eed3296618bcd9ab2cee9332cec733c8ea4 diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild new file mode 100644 index 000000000000..afddc6d502f8 --- /dev/null +++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils multilib versionator + +MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b +DESCRIPTION="High Quality Reverb and Impulse Response Convolution library including XMMS/Audacious Effect plugins" +HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3" +SRC_URI="http://git.savannah.gnu.org/cgit/${PN}.git/snapshot/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" +IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads" + +_GTK_DEPEND=">=dev-libs/glib-2.4.7:2 + >=x11-libs/gtk+-3.0.0:3 + x11-libs/pango + x11-libs/cairo" + +RDEPEND=">=sci-libs/fftw-3.0.1 + audacious? ( >=media-sound/audacious-3.6 + ${_GTK_DEPEND} + media-libs/libsndfile ) + jack? ( media-sound/jack-audio-connection-kit + ${_GTK_DEPEND} + media-libs/libsndfile )" +DEPEND=${RDEPEND} + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf \ + --disable-profile \ + --enable-release \ + --disable-autocflags \ + --enable-undenormal \ + $(use_enable threads pthread) \ + $(use_enable forcefpu) \ + --disable-force3dnow \ + $(use_enable cpu_flags_x86_3dnow 3dnow) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable cpu_flags_x86_sse2 sse2) \ + $(use_enable cpu_flags_x86_sse3 sse3) \ + $(use_enable cpu_flags_x86_sse4_1 sse4) \ + $(use_enable cpu_flags_x86_avx avx) \ + --disable-fma \ + --disable-fma4 \ + $(use_enable openmp omp) \ + --disable-sample \ + $(use_enable jack) \ + $(use_enable audacious) \ + --disable-srcnewcoeffs \ + $(use_enable plugdouble) \ + --disable-pluginit \ + || die "econf failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + dodoc ChangeLog README || die 'dodoc failed' + + if use audacious ; then + find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die + fi + + insinto /usr/share/${PN}/samples/IR + doins samples/IR/*.wav || die +} diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest index 90cf5f2c1a22..e33eadb6b476 100644 --- a/media-libs/imlib2/Manifest +++ b/media-libs/imlib2/Manifest @@ -1,3 +1,2 @@ -DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c DIST imlib2-1.4.6.tar.gz 971792 SHA256 17cc128c0e61974d59c423b59d0fb5cb85c97169adf5b05184cc58f7c87b4f4e SHA512 8c49f2c9a4b997b536ab7553ffd80b764eccf95c6926a90c10390463e353df27c0e52345bdea9ac8fbefae3e29274022e6a8c0944f406a449293a06192a95fe5 WHIRLPOOL 98ff99fb216a867f60287b369a0b05bf5eea2da23ee8bec14f105f1805f12b035f3ff03ede0bc5909eec178b09e285b5bb0ab0c394487502aa893a94a34da90c DIST imlib2-1.4.7.tar.gz 1027716 SHA256 48e98337a560d8904f685447f41c43914fec1f8cd3745a9fd86cba9fd24a6563 SHA512 24728586bf0d2a289fdaa7d05385a059b10092f3f777691881f01d6c9e4aa8f893ebb7bc04933644a9f62163cc649272851f1189f72aee83035816caca3a73a2 WHIRLPOOL 662c671b723f4df8267d84607b74bc76b6790d2a694a2e7b3bef084403ae8f41761813455a404c4886dbf3b7b7782534c17677b1ac81bdccf24120a3d07714e1 diff --git a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild b/media-libs/imlib2/imlib2-1.4.5-r1.ebuild deleted file mode 100644 index 38aa8de88904..000000000000 --- a/media-libs/imlib2/imlib2-1.4.5-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -EGIT_SUB_PROJECT="legacy" -EGIT_URI_APPEND=${PN} - -if [[ ${PV} != "9999" ]] ; then - EKEY_STATE="release" -fi - -inherit enlightenment toolchain-funcs - -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="https://www.enlightenment.org/" - -IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib" - -RDEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - mp3? ( media-libs/libid3tag )" -DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894 - epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634 -} - -src_configure() { - # imlib2 has diff configure options for x86/amd64 mmx - if [[ $(tc-arch) == amd64 ]]; then - E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx ) - else - E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) ) - fi - - [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) - - E_ECONF+=( - $(use_enable static-libs static) - $(use_with X x) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - $(use_with gif) - $(use_with zlib) - $(use_with bzip2) - $(use_with mp3 id3) - ) - - enlightenment_src_configure -} - -src_install() { - enlightenment_src_install - - # enlightenment_src_install should take care of this for us, but it doesn't - find "${ED}" -name '*.la' -delete -} diff --git a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild b/media-libs/imlib2/imlib2-1.4.6-r1.ebuild deleted file mode 100644 index 9cedb2f06ac7..000000000000 --- a/media-libs/imlib2/imlib2-1.4.6-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -EGIT_SUB_PROJECT="legacy" -EGIT_URI_APPEND=${PN} - -if [[ ${PV} != "9999" ]] ; then - EKEY_STATE="snap" -fi - -inherit enlightenment toolchain-funcs - -DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" -HOMEPAGE="https://www.enlightenment.org/" - -IUSE="bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib" - -RDEPEND="=media-libs/freetype-2* - bzip2? ( app-arch/bzip2 ) - zlib? ( sys-libs/zlib ) - gif? ( >=media-libs/giflib-4.1.0 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg:0 ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - mp3? ( media-libs/libid3tag )" -DEPEND="${RDEPEND} - png? ( virtual/pkgconfig ) - X? ( - x11-proto/xextproto - x11-proto/xproto - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.4.5-no-my-libs.patch #497894 - epatch "${FILESDIR}"/${PN}-1.4.5-giflib-5.patch #457634 -} - -src_configure() { - # imlib2 has diff configure options for x86/amd64 mmx - if [[ $(tc-arch) == amd64 ]]; then - E_ECONF+=( $(use_enable cpu_flags_x86_mmx amd64) --disable-mmx ) - else - E_ECONF+=( --disable-amd64 $(use_enable cpu_flags_x86_mmx mmx) ) - fi - - [[ $(gcc-major-version) -ge 4 ]] && E_ECONF+=( --enable-visibility-hiding ) - - E_ECONF+=( - $(use_enable static-libs static) - $(use_with X x) - $(use_with jpeg) - $(use_with png) - $(use_with tiff) - $(use_with gif) - $(use_with zlib) - $(use_with bzip2) - $(use_with mp3 id3) - ) - - enlightenment_src_configure -} - -src_install() { - enlightenment_src_install - - # enlightenment_src_install should take care of this for us, but it doesn't - find "${ED}" -name '*.la' -delete -} diff --git a/media-sound/forked-daapd/metadata.xml b/media-sound/forked-daapd/metadata.xml index d38687d58122..33014c8049bf 100644 --- a/media-sound/forked-daapd/metadata.xml +++ b/media-sound/forked-daapd/metadata.xml @@ -2,13 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer> - <email>erikmack@gmail.com</email> + <email>stasibear@gentoo.org</email> <name>Erik Mackdanz</name> </maintainer> - <maintainer> - <email>alunduil@gentoo.org</email> - <name>Alex Brandt</name> - </maintainer> <longdescription> This is a much updated version of the original forked-daapd 0.19 (non-gcd), a Linux/FreeBSD DAAP diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml index 2add8b921044..03a5f55256a6 100644 --- a/media-video/aegisub/metadata.xml +++ b/media-video/aegisub/metadata.xml @@ -7,7 +7,7 @@ <name>Nikoli</name> </maintainer> <maintainer> - <email>itumaykin@gmail.com</email> + <email>itumaykin+gentoo@gmail.com</email> <name>Coacher</name> </maintainer> <maintainer> diff --git a/net-firewall/nftables/files/libexec/nftables.sh b/net-firewall/nftables/files/libexec/nftables.sh new file mode 100755 index 000000000000..0d7c091d07f4 --- /dev/null +++ b/net-firewall/nftables/files/libexec/nftables.sh @@ -0,0 +1,150 @@ +#! /bin/sh + +main() { + local NFTABLES_SAVE=${2:-'/var/lib/nftables/rules-save'} + local retval + case "$1" in + "clear") + if ! use_legacy; then + nft flush ruleset + else + clear_legacy + fi + retval=$? + ;; + "list") + if ! use_legacy; then + nft list ruleset + else + list_legacy + fi + retval=$? + ;; + "load") + nft -f ${NFTABLES_SAVE} + retval=$? + ;; + "store") + local tmp_save="${NFTABLES_SAVE}.tmp" + if ! use_legacy; then + nft list ruleset > ${tmp_save} + else + save_legacy ${tmp_save} + fi + retval=$? + if [ ${retval} ]; then + mv ${tmp_save} ${NFTABLES_SAVE} + fi + ;; + esac + return ${retval} +} + +clear_legacy() { + local l3f line table chain first_line + + first_line=1 + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + table=$(echo ${line} | sed "s/table[ \t]*//") + deletetable ${l3f} ${table} + done + done + else + nft list tables | while read line; do + l3f=$(echo ${line} | cut -d ' ' -f2) + table=$(echo ${line} | cut -d ' ' -f3) + deletetable ${l3f} ${table} + done + fi +} + +list_legacy() { + local l3f + + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + line=$(echo ${line} | sed "s/table/table ${l3f}/") + echo "$(nft list ${line})" + done + done + else + nft list tables | while read line; do + echo "$(nft list ${line})" + done + fi +} + +save_legacy() { + tmp_save=$1 + touch "${tmp_save}" + if manualwalk; then + for l3f in $(getfamilies); do + nft list tables ${l3f} | while read line; do + line=$(echo ${line} | sed "s/table/table ${l3f}/") + nft ${SAVE_OPTIONS} list ${line} >> ${tmp_save} + done + done + else + nft list tables | while read line; do + nft ${SAVE_OPTIONS} list ${line} >> "${tmp_save}" + done + fi +} + +use_legacy() { + local major_ver minor_ver + + major_ver=$(uname -r | cut -d '.' -f1) + minor_ver=$(uname -r | cut -d '.' -f2) + + [[ $major_ver -ge 4 || $major_ver -eq 3 && $minor_ver -ge 18 ]] && return 1 + return 0 +} + +CHECK_TABLE_NAME="GENTOO_CHECK_TABLE" + +getfamilies() { + local l3f families + + for l3f in ip arp ip6 bridge inet; do + if nft create table ${l3f} ${CHECK_TABLE_NAME} > /dev/null 2>&1; then + families="${families}${l3f} " + nft delete table ${l3f} ${CHECK_TABLE_NAME} + fi + done + echo ${families} +} + +manualwalk() { + local result l3f=`getfamilies | cut -d ' ' -f1` + + nft create table ${l3f} ${CHECK_TABLE_NAME} + nft list tables | read line + if [ $(echo $line | wc -w) -lt 3 ]; then + result=0 + fi + result=1 + nft delete table ${l3f} ${CHECK_TABLE_NAME} + + return $result +} + +deletetable() { + # family is $1 + # table name is $2 + nft flush table $1 $2 + nft list table $1 $2 | while read l; do + chain=$(echo $l | grep -o 'chain [^[:space:]]\+' | cut -d ' ' -f2) + if [ -n "${chain}" ]; then + nft flush chain $1 $2 ${chain} + nft delete chain $1 $2 ${chain} + fi + done + nft delete table $1 $2 +} + +main "$@" +exit $? diff --git a/net-firewall/nftables/files/nftables.init-r2 b/net-firewall/nftables/files/nftables.init-r2 new file mode 100644 index 000000000000..c86d2e3c995f --- /dev/null +++ b/net-firewall/nftables/files/nftables.init-r2 @@ -0,0 +1,123 @@ +#!/sbin/runscript +# Copyright 2014 Nicholas Vinson +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="clear list panic save" +extra_started_commands="reload" +depend() { + need localmount #434774 + before net +} + +start_pre() { + checkkernel || return 1 + checkconfig || return 1 + return 0 +} + +clear() { + /usr/libexec/nftables/nftables.sh clear || return 1 + return 0 +} + +list() { + /usr/libexec/nftables/nftables.sh list || return 1 + return 0 +} + +panic() { + checkkernel || return 1 + if service_started ${RC_SVCNAME}; then + rc-service ${RC_SVCNAME} stop + fi + + ebegin "Dropping all packets" + clear + if nft create table ip filter >/dev/null 2>&1; then + nft -f /dev/stdin <<-EOF + table ip filter { + chain input { + type filter hook input priority 0; + drop + } + chain forward { + type filter hook forward priority 0; + drop + } + chain output { + type filter hook output priority 0; + drop + } + } + EOF + fi + if nft create table ip6 filter >/dev/null 2>&1; then + nft -f /dev/stdin <<-EOF + table ip6 filter { + chain input { + type filter hook input priority 0; + drop + } + chain forward { + type filter hook forward priority 0; + drop + } + chain output { + type filter hook output priority 0; + drop + } + } + EOF + fi +} + +reload() { + checkkernel || return 1 + ebegin "Flushing firewall" + clear + start +} + +save() { + ebegin "Saving nftables state" + checkpath -q -d "$(dirname "${NFTABLES_SAVE}")" + checkpath -q -m 0600 -f "${NFTABLES_SAVE}" + /usr/libexec/nftables/nftables.sh store ${NFTABLES_SAVE} + return $? +} + +start() { + ebegin "Loading nftables state and starting firewall" + clear + /usr/libexec/nftables/nftables.sh load ${NFTABLES_SAVE} + eend $? +} + +stop() { + if yesno ${SAVE_ON_STOP:-yes}; then + save || return 1 + fi + + ebegin "Stopping firewall" + clear + eend $? +} + +checkconfig() { + if [ ! -f ${NFTABLES_SAVE} ]; then + eerror "Not starting nftables. First create some rules then run:" + eerror "rc-service nftables save" + return 1 + fi + return 0 +} + +checkkernel() { + if ! nft list tables >/dev/null 2>&1; then + eerror "Your kernel lacks nftables support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} diff --git a/net-firewall/nftables/files/systemd/nftables-restore.service b/net-firewall/nftables/files/systemd/nftables-restore.service new file mode 100644 index 000000000000..7a7eacfee9f3 --- /dev/null +++ b/net-firewall/nftables/files/systemd/nftables-restore.service @@ -0,0 +1,14 @@ +[Unit] +Description=Restore nftables firewall rules +# if both are queued for some reason, don't store before restoring :) +Before=nftables-store.service +# sounds reasonable to have firewall up before any of the services go up +Before=network.target +Conflicts=shutdown.target + +[Service] +Type=oneshot +ExecStart=/usr/libexec/nftables/nftables.sh load /var/lib/nftables/rules-save + +[Install] +WantedBy=basic.target diff --git a/net-firewall/nftables/files/systemd/nftables-store.service b/net-firewall/nftables/files/systemd/nftables-store.service new file mode 100644 index 000000000000..373f8b947d7d --- /dev/null +++ b/net-firewall/nftables/files/systemd/nftables-store.service @@ -0,0 +1,11 @@ +[Unit] +Description=Store nftables firewall rules +Before=shutdown.target +DefaultDependencies=No + +[Service] +Type=oneshot +ExecStart=/usr/libexec/nftables/nftables.sh store /var/lib/nftables/rules-save + +[Install] +WantedBy=shutdown.target diff --git a/net-firewall/nftables/files/systemd/nftables.service b/net-firewall/nftables/files/systemd/nftables.service new file mode 100644 index 000000000000..d6f05c7cf467 --- /dev/null +++ b/net-firewall/nftables/files/systemd/nftables.service @@ -0,0 +1,6 @@ +[Unit] +Description=Store and restore nftables firewall rules + +[Install] +Also=nftables-store.service +Also=nftables-restore.service diff --git a/net-firewall/nftables/nftables-0.5-r2.ebuild b/net-firewall/nftables/nftables-0.5-r2.ebuild new file mode 100644 index 000000000000..a495588efb8f --- /dev/null +++ b/net-firewall/nftables/nftables-0.5-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools linux-info eutils systemd + +DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools" +HOMEPAGE="http://netfilter.org/projects/nftables/" +SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug gmp +readline" + +RDEPEND=">=net-libs/libmnl-1.0.3 + >=net-libs/libnftnl-1.0.5 + gmp? ( dev-libs/gmp:0= ) + readline? ( sys-libs/readline:0= )" +DEPEND="${RDEPEND} + >=app-text/docbook2X-0.8.8-r4 + sys-devel/bison + sys-devel/flex" + +S="${WORKDIR}"/v${PV} + +pkg_setup() { + if kernel_is ge 3 13; then + CONFIG_CHECK="~NF_TABLES" + linux-info_pkg_setup + else + eerror "This package requires kernel version 3.13 or newer to work properly." + fi +} + +src_prepare() { + epatch_user + eautoreconf +} + +src_configure() { + econf \ + --sbindir="${EPREFIX}"/sbin \ + $(use_enable debug) \ + $(use_with readline cli) \ + $(use_with !gmp mini_gmp) +} + +src_install() { + default + + dodir /usr/libexec/${PN} + cp -p "${FILESDIR}"/libexec/${PN}.sh "${D}"/usr/libexec/${PN}/${PN}.sh + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.init-r2 ${PN} + keepdir /var/lib/nftables + + systemd_dounit "${FILESDIR}"/systemd/${PN}{,-{re,}store}.service +} diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest index 2d8af53de859..10f268ef3121 100644 --- a/net-libs/http-parser/Manifest +++ b/net-libs/http-parser/Manifest @@ -2,3 +2,4 @@ DIST http-parser-2.3.tar.gz 42538 SHA256 3bfe6b4ab7656c86e48b4a43a7a08aee7fd72c1 DIST http-parser-2.4.1.tar.gz 44724 SHA256 4a2597c37b874ce46b30764960d158d18cae2b4cd46458ce3cad98aa106427c9 SHA512 f56b84f0af57cefa46daa10ac2e7b3015c185fa4c55615efa33f9131871a980b5c06ffad1699302ebe847c9325b41403520e0ef4d34bf5f6c48c6edabf1f4cb8 WHIRLPOOL 1873e97df046b10ed7a7da9ad3ba43055634af230b0b4391a8a814bb00455f8864ead809ba2555715e63b9a74202287b2a3c68ced884edf152e794bf70a0cfeb DIST http-parser-2.4.2.tar.gz 44814 SHA256 d93d6cd4d587355bc714d6a79f4e5676d7dd2ccd2fafb21606c87268ea440cbf SHA512 fa2ac6a27807252a8e2ca61e307b92fa7004424dbea69d9ffbd2297f47e0c2af740033126aeb6b11ea172e03c2fbf957c0ab0387836647920c3a9304d07f68ab WHIRLPOOL cbf45915f622ad07ee095f3a592c565847f427575ab0a062ce7d8dbfe3b8b92d4ec97787c3dec4710b7dec4f5b4cde49ece80063b29399c2f44acc14816c08ff DIST http-parser-2.5.0.tar.gz 46070 SHA256 e3b4ba58f4e6ee5fbec781df020e5cb74c3a799a07f059e1e125127a0b801481 SHA512 da94b21f313d09f0557e61574e1187d06ef3bc4e8115c6f8120eac8d26ba6db51469ee5ddb6da5a0c05f49279838e5028afff6a15790708cdca147b3bc66e18f WHIRLPOOL 933ab2f8065fd2e7734d61284a042579edea40f0a0dea6b339a1ba07d9e50f2cd5e14f081d9889b728024171f2faeff7aab97b43c531fbd6badd882026261254 +DIST http-parser-2.6.0.tar.gz 47598 SHA256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 SHA512 e7bd34ed8270192e55f5e7495972afc9fe2adc36d85df4f09be4958bbf7f93872a056bb8db268cdc1068a9eb79ad9aefc2a8502bda92bac8a2490e08435f09e1 WHIRLPOOL 2bef86db5140c04a2d7e2191e5669c905368a1180c357c512a66a65907b23b317bd2466aa9b1a47c1287e9def7aecdab48c151343b1700d99514b47915df7bf5 diff --git a/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch new file mode 100644 index 000000000000..a819cf441d32 --- /dev/null +++ b/net-libs/http-parser/files/0001-makefile-fix-DESTDIR-usage.patch @@ -0,0 +1,64 @@ +From 7fbc87986baa09c342abb21e34613e8bbdc3c9c7 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:24:43 +0100 +Subject: [PATCH 1/4] makefile: fix DESTDIR usage + +DESTDIR is not supposed to be set inside other variables. It is +standard to have this variable in install/uninstall rules, so it +can be reliably set separately no matter what other variables are set +to. +This also avoids potential bugs with setting SONAME or seds on +installed files (like pkgconfig) which then might include the +temporary DESTDIR directory. + +DESTDIR is really just for installing into a temporary directory or +a chroot, mostly used by package managers. +--- + Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Makefile b/Makefile +index 33c8ba0..76153a0 100644 +--- a/Makefile ++++ b/Makefile +@@ -55,7 +55,7 @@ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC + LDFLAGS_LIB = $(LDFLAGS) -shared + + INSTALL ?= install +-PREFIX ?= $(DESTDIR)/usr/local ++PREFIX ?= /usr/local + LIBDIR = $(PREFIX)/lib + INCLUDEDIR = $(PREFIX)/include + +@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c + ctags $^ + + install: library +- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) + + install-strip: library +- $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) ++ ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) + + uninstall: +- rm $(INCLUDEDIR)/http_parser.h +- rm $(LIBDIR)/$(SONAME) +- rm $(LIBDIR)/libhttp_parser.so ++ rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h ++ rm $(DESTDIR)$(LIBDIR)/$(SONAME) ++ rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so + + clean: + rm -f *.o *.a tags test test_fast test_g \ +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0002-makefile-quote-variables.patch b/net-libs/http-parser/files/0002-makefile-quote-variables.patch new file mode 100644 index 000000000000..096ac6b6bd69 --- /dev/null +++ b/net-libs/http-parser/files/0002-makefile-quote-variables.patch @@ -0,0 +1,50 @@ +From 9bce473ba7417b45bfdb59d4151a8857dcfff4ad Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:27:06 +0100 +Subject: [PATCH 2/4] makefile: quote variables + +Make does not take care of this in make rules. If any of the variables +DESTDIR, INCLUDEDIR or LIBDIR contain whitespaces, then the related +install command will fail. + +This is even more important for the uninstall rule. +--- + Makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index 76153a0..8c4a9d7 100644 +--- a/Makefile ++++ b/Makefile +@@ -123,19 +123,19 @@ tags: http_parser.c http_parser.h test.c + ctags $^ + + install: library +- $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" ++ $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" ++ ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + install-strip: library +- $(INSTALL) -D http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h +- $(INSTALL) -D -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SONAME) +- ln -s $(LIBDIR)/$(SONAME) $(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT) ++ $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" ++ $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" ++ ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + uninstall: +- rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h +- rm $(DESTDIR)$(LIBDIR)/$(SONAME) +- rm $(DESTDIR)$(LIBDIR)/libhttp_parser.so ++ rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" ++ rm "$(DESTDIR)$(LIBDIR)/$(SONAME)" ++ rm "$(DESTDIR)$(LIBDIR)/libhttp_parser.so" + + clean: + rm -f *.o *.a tags test test_fast test_g \ +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch new file mode 100644 index 000000000000..cafe68d220c9 --- /dev/null +++ b/net-libs/http-parser/files/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch @@ -0,0 +1,35 @@ +From f45b38c42e7e92a5d0215c44dcf306616536011e Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:32:11 +0100 +Subject: [PATCH 3/4] makefile: fix SONAME symlink, it should not be a full + path + +The symlink destination being a full path doesn't give any benefit and +may break a few use cases of copying these files to a different +destination, while preserving the symlink. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 8c4a9d7..cbe93e8 100644 +--- a/Makefile ++++ b/Makefile +@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c + install: library + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" +- ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" ++ ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + install-strip: library + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" +- ln -s $(LIBDIR)/$(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" ++ ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + + uninstall: + rm "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch new file mode 100644 index 000000000000..e21cd715499b --- /dev/null +++ b/net-libs/http-parser/files/0004-makefile-add-CFLAGS-to-linking-command.patch @@ -0,0 +1,31 @@ +From 62b1450cfe2e0df2d912279d38edf1b916020101 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:39:31 +0100 +Subject: [PATCH 4/4] makefile: add CFLAGS to linking command + +Although we compile the objects explicitly there are some CFLAGS +that may also affect linking, which is not always obvious. + +This can also be a problem for toolchains that support multiple ABIs +and need to set CFLAGS=<abi selector>, which will cause linking +to either fail or produce an unusable executable/library. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index cbe93e8..ae16f08 100644 +--- a/Makefile ++++ b/Makefile +@@ -102,7 +102,7 @@ libhttp_parser.o: http_parser.c http_parser.h Makefile + $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o + + library: libhttp_parser.o +- $(CC) $(LDFLAGS_LIB) -o $(SONAME) $< ++ $(CC) $(CFLAGS_LIB) $(LDFLAGS_LIB) -o $(SONAME) $< + + package: http_parser.o + $(AR) rcs libhttp_parser.a http_parser.o +-- +2.6.1 + diff --git a/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch new file mode 100644 index 000000000000..da966373063f --- /dev/null +++ b/net-libs/http-parser/files/0005-makefile-fix-install-rule-dependency.patch @@ -0,0 +1,33 @@ +From b67bfbe6a07529dd82e2ee83b6848d017e6e422f Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@hasufell.de> +Date: Mon, 2 Nov 2015 16:51:28 +0100 +Subject: [PATCH 5/5] makefile: fix install rule dependency + +Otherwise the install rule will recompile the library, no matter +if it has already been compiled. +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index ae16f08..df0b59f 100644 +--- a/Makefile ++++ b/Makefile +@@ -122,12 +122,12 @@ parsertrace_g: http_parser_g.o contrib/parsertrace.c + tags: http_parser.c http_parser.h test.c + ctags $^ + +-install: library ++install: $(SONAME) + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" + ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" + +-install-strip: library ++install-strip: $(SONAME) + $(INSTALL) -D http_parser.h "$(DESTDIR)$(INCLUDEDIR)/http_parser.h" + $(INSTALL) -D -s $(SONAME) "$(DESTDIR)$(LIBDIR)/$(SONAME)" + ln -s $(SONAME) "$(DESTDIR)$(LIBDIR)/libhttp_parser.$(SOEXT)" +-- +2.6.1 + diff --git a/net-libs/http-parser/http-parser-2.6.0.ebuild b/net-libs/http-parser/http-parser-2.6.0.ebuild new file mode 100644 index 000000000000..186c88065131 --- /dev/null +++ b/net-libs/http-parser/http-parser-2.6.0.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 toolchain-funcs multilib multilib-minimal + +DESCRIPTION="Http request/response parser for C" +HOMEPAGE="https://github.com/joyent/http-parser" +SRC_URI="https://github.com/joyent/http-parser/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="static-libs" + +# https://github.com/nodejs/http-parser/pull/272 +PATCHES=( + "${FILESDIR}"/0001-makefile-fix-DESTDIR-usage.patch + "${FILESDIR}"/0002-makefile-quote-variables.patch + "${FILESDIR}"/0003-makefile-fix-SONAME-symlink-it-should-not-be-a-full-.patch + "${FILESDIR}"/0004-makefile-add-CFLAGS-to-linking-command.patch + "${FILESDIR}"/0005-makefile-fix-install-rule-dependency.patch +) + +src_prepare() { + tc-export CC AR + epatch ${PATCHES[@]} + multilib_copy_sources +} + +multilib_src_compile() { + emake CFLAGS_FAST="${CFLAGS}" library + use static-libs && emake CFLAGS_FAST="${CFLAGS}" package +} + +multilib_src_test() { + emake CFLAGS_DEBUG="${CFLAGS}" test +} + +multilib_src_install() { + emake DESTDIR="${D}" PREFIX="/usr" LIBDIR="/usr/$(get_libdir)" install + use static-libs && dolib.a libhttp_parser.a +} diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest index 4409f48578cd..d1476aea0052 100644 --- a/net-misc/curl/Manifest +++ b/net-misc/curl/Manifest @@ -1,4 +1,3 @@ -DIST curl-7.42.1.tar.bz2 3327304 SHA256 e2905973391ec2dfd7743a8034ad10eeb58dab8b3a297e7892a41a7999cac887 SHA512 846c2d2bc73d39240686bf54e4c02553a1ca1640123fef30538cfc8a6317650f4cb9f1cc882016b7826ef9c84cb92adbfa24e55d59d2e7203bdcb12835fb474f WHIRLPOOL ff826e11812334ebca650c54788bf1b81b2927f7b9607b10e79cc70f6d1f9b893aebc816914158243510ffaead3b15a21ce10e7180eeb175b0b503e9ac8b0c6e DIST curl-7.43.0.tar.bz2 3363770 SHA256 baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9 SHA512 0b06ec078680619f56a458ac115142546134917331b71b73ed2c0371c480034dac7ed848814be0dd1e752154c53e48b9e0276b83f75a690df6cfb480ab331272 WHIRLPOOL e5c97b3cbf0f9915f62a100ce2972e6cffcabae753770c2f0a1fc3bcef3a66c0a2d4d7e361b00f442d62eca3b0d9526eb34f6b043fb655648180e81ef630a527 DIST curl-7.44.0.tar.bz2 3398814 SHA256 1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814 SHA512 250a0aa6ba9917cd7666ff180efb02d994d1040759b94370b8c3bb215467d632b867f111b555228ab7f9a7ecd1e5d205204b29cbc003797dd315f628376a376d WHIRLPOOL 6725c44667016365f6c83a75cae1fc1f4d310256194a7f6b2738f642250b5229a565047c9f4882f07dd2daf0a4b5149e22ce91d62c26a52d73c087e50c64f6cd DIST curl-7.45.0.tar.bz2 3473632 SHA256 65154e66b9f8a442b57c436904639507b4ac37ec13d6f8a48248f1b4012b98ea SHA512 71c557c69eb8d160f74a9b76ef83a46ce33ef4e8a66a261699329583dadf10205b4ba4783f92d4e6c8724f6610ffade5b0a9f189b0a7b9169ff839dfc8980481 WHIRLPOOL afc1627cebb64c9111f943fe63d95c8a998934fd02e3b8d12f061d23b174b7475c48451ecc1713ce54771455a6465238aa3b818b0eb9ba5c86ffd06eb1f2bc76 diff --git a/net-misc/curl/curl-7.42.1-r1.ebuild b/net-misc/curl/curl-7.42.1-r1.ebuild deleted file mode 100644 index 91232b6c0f95..000000000000 --- a/net-misc/curl/curl-7.42.1-r1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" -IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" -IUSE+=" elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_axtls? ( - >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_gnutls? ( - || ( - ( - >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}] - ) - ) - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_polarssl? ( - >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] ) - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_axtls - curl_ssl_gnutls - curl_ssl_openssl - curl_ssl_nss - curl_ssl_polarssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ - "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - epatch_user - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - einfo "\033[1;32m**************************************************\033[00m" - - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - local myconf=() - myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - einfo "NOTE: axtls is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-axtls ) - fi - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then - einfo "gnutls compiled with dev-libs/nettle" - myconf+=( --with-gnutls --with-nettle ) - else - einfo "gnutls compiled with dev-libs/libgcrypt" - myconf+=( --with-gnutls --without-nettle ) - fi - fi - if use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - fi - if use curl_ssl_polarssl; then - einfo "SSL provided by polarssl" - einfo "NOTE: polarssl is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-polarssl ) - fi - if use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi - else - einfo "SSL disabled" - fi - einfo "\033[1;32m**************************************************\033[00m" - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - ECONF_SOURCE="${S}" \ - econf \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --enable-pop3 \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --enable-manual \ - --enable-proxy \ - --disable-soname-bump \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - --disable-versioned-symbols \ - --without-cyassl \ - --without-darwinssl \ - $(use_with idn libidn) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - --without-krb4 \ - $(use_with metalink libmetalink) \ - --without-nghttp2 \ - $(use_with rtmp librtmp) \ - --without-spnego \ - --without-winidn \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - rm -rf "${ED}"/etc/ - - # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 - insinto /usr/share/aclocal - doins docs/libcurl/libcurl.m4 -} diff --git a/net-misc/curl/curl-7.42.1.ebuild b/net-misc/curl/curl-7.42.1.ebuild deleted file mode 100644 index 93e5bc53d5b9..000000000000 --- a/net-misc/curl/curl-7.42.1.ebuild +++ /dev/null @@ -1,243 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils prefix multilib-minimal - -DESCRIPTION="A Client that groks URLs" -HOMEPAGE="http://curl.haxx.se/" -SRC_URI="http://curl.haxx.se/download/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="adns idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads" -IUSE="${IUSE} curl_ssl_axtls curl_ssl_gnutls curl_ssl_nss +curl_ssl_openssl curl_ssl_polarssl curl_ssl_winssl" -IUSE="${IUSE} elibc_Winnt" - -#lead to lots of false negatives, bug #285669 -RESTRICT="test" - -RDEPEND="ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) - ssl? ( - curl_ssl_axtls? ( - >=net-libs/axtls-1.4.9-r1[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_gnutls? ( - || ( - ( - >=net-libs/gnutls-3.2.15[static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/nettle-2.6[${MULTILIB_USEDEP}] - ) - ( - =net-libs/gnutls-2.12*[-nettle,static-libs?,${MULTILIB_USEDEP}] - >=dev-libs/libgcrypt-1.5.3[static-libs?,${MULTILIB_USEDEP}] - ) - ) - app-misc/ca-certificates - ) - curl_ssl_openssl? ( - >=dev-libs/openssl-1.0.1h-r2[static-libs?,${MULTILIB_USEDEP}] - ) - curl_ssl_nss? ( - >=dev-libs/nss-3.15.4[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - curl_ssl_polarssl? ( - >=net-libs/polarssl-1.3.4:=[${MULTILIB_USEDEP}] - app-misc/ca-certificates - ) - ) - idn? ( >=net-dns/libidn-1.28[static-libs?,${MULTILIB_USEDEP}] ) - adns? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] ) - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) - metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] ) - rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) - ssh? ( >=net-libs/libssh2-1.4.3[static-libs?,${MULTILIB_USEDEP}] ) - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - )" - -# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303 -# rtmp? ( -# media-video/rtmpdump -# curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] ) -# curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] ) -# ) - -# ssl providers to be added: -# fbopenssl $(use_with spnego) - -# krb4 http://web.mit.edu/kerberos/www/krb4-end-of-life.html - -DEPEND="${RDEPEND} - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - test? ( - sys-apps/diffutils - dev-lang/perl - )" - -# c-ares must be disabled for threads -# only one ssl provider can be enabled -REQUIRED_USE=" - curl_ssl_winssl? ( elibc_Winnt ) - threads? ( !adns ) - ssl? ( - ^^ ( - curl_ssl_axtls - curl_ssl_gnutls - curl_ssl_openssl - curl_ssl_nss - curl_ssl_polarssl - curl_ssl_winssl - ) - )" - -DOCS=( CHANGES README docs/FEATURES docs/INTERNALS \ - docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/curl/curlbuild.h -) - -MULTILIB_CHOST_TOOLS=( - /usr/bin/curl-config -) - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-7.30.0-prefix.patch \ - "${FILESDIR}"/${PN}-respect-cflags-3.patch \ - "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch - - sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241 - - epatch_user - eprefixify curl-config.in - eautoreconf -} - -multilib_src_configure() { - einfo "\033[1;32m**************************************************\033[00m" - - # We make use of the fact that later flags override earlier ones - # So start with all ssl providers off until proven otherwise - local myconf=() - myconf+=( --without-axtls --without-gnutls --without-nss --without-polarssl --without-ssl --without-winssl ) - myconf+=( --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt ) - if use ssl ; then - if use curl_ssl_axtls; then - einfo "SSL provided by axtls" - einfo "NOTE: axtls is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-axtls ) - fi - if use curl_ssl_gnutls; then - einfo "SSL provided by gnutls" - if has_version ">=net-libs/gnutls-3.2.15[${MULTILIB_USEDEP}]" || has_version "=net-libs/gnutls-2.12*[nettle,${MULTILIB_USEDEP}]"; then - einfo "gnutls compiled with dev-libs/nettle" - myconf+=( --with-gnutls --with-nettle ) - else - einfo "gnutls compiled with dev-libs/libgcrypt" - myconf+=( --with-gnutls --without-nettle ) - fi - fi - if use curl_ssl_nss; then - einfo "SSL provided by nss" - myconf+=( --with-nss ) - fi - if use curl_ssl_polarssl; then - einfo "SSL provided by polarssl" - einfo "NOTE: polarssl is meant for embedded systems and" - einfo "may not be the best choice as an ssl provider" - myconf+=( --with-polarssl ) - fi - if use curl_ssl_openssl; then - einfo "SSL provided by openssl" - myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs ) - fi - if use curl_ssl_winssl; then - einfo "SSL provided by Windows" - myconf+=( --with-winssl ) - fi - else - einfo "SSL disabled" - fi - einfo "\033[1;32m**************************************************\033[00m" - - # These configuration options are organized alphabetically - # within each category. This should make it easier if we - # ever decide to make any of them contingent on USE flags: - # 1) protocols first. To see them all do - # 'grep SUPPORT_PROTOCOLS configure.ac' - # 2) --enable/disable options second. - # 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort - # 3) --with/without options third. - # grep -- --with configure | grep Check | awk '{ print $4 }' | sort - ECONF_SOURCE="${S}" \ - econf \ - --enable-dict \ - --enable-file \ - --enable-ftp \ - --enable-gopher \ - --enable-http \ - --enable-imap \ - $(use_enable ldap) \ - $(use_enable ldap ldaps) \ - --enable-pop3 \ - --enable-rtsp \ - $(use_enable samba smb) \ - $(use_with ssh libssh2) \ - --enable-smtp \ - --enable-telnet \ - --enable-tftp \ - $(use_enable adns ares) \ - --enable-cookies \ - --enable-hidden-symbols \ - $(use_enable ipv6) \ - --enable-largefile \ - --enable-manual \ - --enable-proxy \ - --disable-soname-bump \ - --disable-sspi \ - $(use_enable static-libs static) \ - $(use_enable threads threaded-resolver) \ - --disable-versioned-symbols \ - --without-cyassl \ - --without-darwinssl \ - $(use_with idn libidn) \ - $(use_with kerberos gssapi "${EPREFIX}"/usr) \ - --without-krb4 \ - $(use_with metalink libmetalink) \ - --without-nghttp2 \ - $(use_with rtmp librtmp) \ - --without-spnego \ - --without-winidn \ - --with-zlib \ - "${myconf[@]}" - - if ! multilib_is_native_abi; then - # avoid building the client - sed -i -e '/SUBDIRS/s:src::' Makefile || die - fi -} - -multilib_src_install_all() { - einstalldocs - prune_libtool_files --all - - rm -rf "${ED}"/etc/ - - # https://sourceforge.net/tracker/index.php?func=detail&aid=1705197&group_id=976&atid=350976 - insinto /usr/share/aclocal - doins docs/libcurl/libcurl.m4 -} diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest index 7ab66d5021ad..d20b0d549fc3 100644 --- a/net-misc/grive/Manifest +++ b/net-misc/grive/Manifest @@ -1 +1,2 @@ DIST grive-0.4.0_pre20150905.tar.gz 158858 SHA256 c488e9956a48fa5416e1f6082ede649ae9d541b57a5170a4f6ff555e9e92e2aa SHA512 2a6842c742d79345ff805f92e74990de624d656c1f16fd98b2611e2359b051d6dfebef07590390eee3ea07e60143ca9e66ceecd675a3a75d6a099dcb0070ab46 WHIRLPOOL 22d25ea2913568d5132247f3472ca09ee5d291028b8303bd2f6784f1930e3308219f72e7a15b95a5e5a19637fb73e3d60181925afaa21e15f4fdaacc6d7769d4 +DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb0198728f6c67bf1e588a66a6d68bb39cff573 SHA512 c5b59a8740ee0886d95f64278c1dd8e0c80df8c53b982f0720fd3a9caa82503ce0ef75987afeafa8735b4e88ef6fea6b5266671516165b288156b1ab543dc3f7 WHIRLPOOL 8c888a218732c9be77d5ae407074f59e0c61d4facb70a8caee97f25e1f46fc5c618aeb09510e23ad18e7604cc17f645df9a9245fac96e1f3dff7279b8f0d2626 diff --git a/net-misc/grive/grive-0.4.0_pre20151011.ebuild b/net-misc/grive/grive-0.4.0_pre20151011.ebuild new file mode 100644 index 000000000000..e85fe95e1153 --- /dev/null +++ b/net-misc/grive/grive-0.4.0_pre20151011.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit cmake-utils + +if [[ ${PV} = *9999 ]]; then + inherit git-2 + EGIT_REPO_URI="git://github.com/vitalif/${PN}2.git" +else + inherit vcs-snapshot + COMMIT="44cb91f94e67bcdad77ca564b4d8083cedf72251" + SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="An open source Linux client for Google Drive" +HOMEPAGE="https://github.com/vitalif/grive2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + dev-libs/boost:= + dev-libs/expat + >=dev-libs/json-c-0.11-r1:= + dev-libs/libgcrypt:0= + net-misc/curl + sys-libs/binutils-libs:0= + sys-libs/glibc + dev-libs/yajl +" +DEPEND="${RDEPEND}" diff --git a/net-misc/openconnect/metadata.xml b/net-misc/openconnect/metadata.xml index 7030dec29348..f07fd2d9cea1 100644 --- a/net-misc/openconnect/metadata.xml +++ b/net-misc/openconnect/metadata.xml @@ -6,6 +6,10 @@ <name>Mike Gilbert</name> </maintainer> <maintainer> + <email>williamh@gentoo.org</email> + <name>William Hubbs</name> + </maintainer> + <maintainer> <email>mattsch@gmail.com</email> <name>Matthew Schultz</name> <description>Proxied maintainer. Copy on bugs.</description> diff --git a/net-misc/openconnect/openconnect-7.06-r1.ebuild b/net-misc/openconnect/openconnect-7.06-r1.ebuild index ec6630a4f6a2..4654f98e15a9 100644 --- a/net-misc/openconnect/openconnect-7.06-r1.ebuild +++ b/net-misc/openconnect/openconnect-7.06-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" KEYWORDS="amd64 arm ~arm64 ppc64 x86" -IUSE="doc +gnutls gssapi java libproxy nls static-libs" +IUSE="doc +gnutls gssapi java libproxy nls smartcard static-libs" ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW" for lang in $ILINGUAS; do IUSE="${IUSE} linguas_${lang}" @@ -35,7 +35,8 @@ DEPEND="dev-libs/libxml2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= )" RDEPEND="${DEPEND} sys-apps/iproute2 !<sys-apps/openrc-0.13" @@ -77,6 +78,7 @@ src_configure() { $(use_with libproxy) \ --without-stoken \ $(use_with gssapi) \ + $(use_with smartcard libpcsclite) \ $(use_with java) } diff --git a/net-misc/openconnect/openconnect-7.06-r2.ebuild b/net-misc/openconnect/openconnect-7.06-r2.ebuild index 2a7516896e4b..5a2a4a736fd8 100644 --- a/net-misc/openconnect/openconnect-7.06-r2.ebuild +++ b/net-misc/openconnect/openconnect-7.06-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.infradead.org/pub/${PN}/${P}.tar.gz LICENSE="LGPL-2.1 GPL-2" SLOT="0/5" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="doc +gnutls gssapi java libressl libproxy nls static-libs" +IUSE="doc +gnutls gssapi java libressl libproxy nls smartcard static-libs" ILINGUAS="ar cs de el en_GB en_US es eu fi fr gl id lt nl pa pl pt pt_BR sk sl tg ug uk zh_CN zh_TW" for lang in $ILINGUAS; do IUSE="${IUSE} linguas_${lang}" @@ -36,7 +36,8 @@ DEPEND="dev-libs/libxml2 ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) + smartcard? ( sys-apps/pcsc-lite:0= )" RDEPEND="${DEPEND} sys-apps/iproute2 !<sys-apps/openrc-0.13" @@ -78,6 +79,7 @@ src_configure() { $(use_with libproxy) \ --without-stoken \ $(use_with gssapi) \ + $(use_with smartcard libpcsclite) \ $(use_with java) } diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest index 512fc7c49136..5768e4c384c4 100644 --- a/net-misc/stunnel/Manifest +++ b/net-misc/stunnel/Manifest @@ -1,3 +1,4 @@ DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26 DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819 DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64 +DIST stunnel-5.25.tar.gz 635456 SHA256 1fb2209f1e006cc01813e1688599c4d0fb0adde4434c31ab95745b1db97484b7 SHA512 85fc9ab6da4d8a0dd10e1d4f459194a6da3e1245588b7bf4a49855370006da3a43b954f47ddcee542cdefd8da0089940f1abbb88d0c5868be0c5b82d3cb203f8 WHIRLPOOL 852ee95706d4e2ce98173d17b873207c3febb7a1cfddf29328b6934a0058999b588a05d0c71cab7e0fa800755e538ed0c8e59f8642b57fadcc4130a88cd8c18d diff --git a/net-misc/stunnel/stunnel-5.25.ebuild b/net-misc/stunnel/stunnel-5.25.ebuild new file mode 100644 index 000000000000..d75157cf5747 --- /dev/null +++ b/net-misc/stunnel/stunnel-5.25.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit ssl-cert eutils multilib systemd user + +DESCRIPTION="TLS/SSL - Port Wrapper" +HOMEPAGE="http://www.stunnel.org/index.html" +SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.usenix.org.uk/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://ftp.nluug.nl/pub/networking/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://www.namesdir.com/mirrors/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + http://stunnel.cybermirror.org/archive/${PV%%.*}.x/${P}.tar.gz + http://mirrors.zerg.biz/stunnel/archive/${PV%%.*}.x/${P}.tar.gz + ftp://mirrors.go-parts.com/stunnel/archive/${PV%%.*}.x/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="ipv6 libressl selinux stunnel3 tcpd" + +DEPEND="tcpd? ( sys-apps/tcp-wrappers ) + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl )" +RDEPEND="${DEPEND} + stunnel3? ( dev-lang/perl ) + selinux? ( sec-policy/selinux-stunnel )" + +RESTRICT="test" + +pkg_setup() { + enewgroup stunnel + enewuser stunnel -1 -1 -1 stunnel +} + +src_prepare() { + # Hack away generation of certificate + sed -i -e "s/^install-data-local:/do-not-run-this:/" \ + tools/Makefile.in || die "sed failed" + + echo "CONFIG_PROTECT=\"/etc/stunnel/stunnel.conf\"" > "${T}"/20stunnel +} + +src_configure() { + econf \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + $(use_enable ipv6) \ + $(use_enable tcpd libwrap) \ + --with-ssl="${EPREFIX}"/usr \ + --disable-fips +} + +src_install() { + emake DESTDIR="${D}" install + rm -rf "${ED}"/usr/share/doc/${PN} + rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \ + "${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8 + use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3 + + # The binary was moved to /usr/bin with 4.21, + # symlink for backwards compatibility + dosym ../bin/stunnel /usr/sbin/stunnel + + dodoc AUTHORS BUGS CREDITS PORTS README TODO ChangeLog + dohtml doc/stunnel.html doc/en/VNC_StunnelHOWTO.html tools/ca.html \ + tools/importCA.html + + insinto /etc/stunnel + doins "${FILESDIR}"/stunnel.conf + doinitd "${FILESDIR}"/stunnel + + doenvd "${T}"/20stunnel + + systemd_dounit "${S}/tools/stunnel.service" + systemd_newtmpfilesd "${FILESDIR}"/stunnel.tmpfiles.conf stunnel.conf +} + +pkg_postinst() { + if [ ! -f "${EROOT}"/etc/stunnel/stunnel.key ]; then + install_cert /etc/stunnel/stunnel + chown stunnel:stunnel "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + chmod 0640 "${EROOT}"/etc/stunnel/stunnel.{crt,csr,key,pem} + fi + + einfo "If you want to run multiple instances of stunnel, create a new config" + einfo "file ending with .conf in /etc/stunnel/. **Make sure** you change " + einfo "\'pid= \' with a unique filename." +} diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest index c4fa4ee73bcf..4e6922d46456 100644 --- a/net-misc/youtube-dl/Manifest +++ b/net-misc/youtube-dl/Manifest @@ -1,3 +1,3 @@ DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae -DIST youtube-dl-2015.10.24.tar.gz 1771159 SHA256 fa151e925b51f6b5ee154f25089d287832a9387e59561810fd5eac8d00ce3ae1 SHA512 ed2a1633f5c4fb8eacaa2b0ef63e968dd8a90fbef57fafbfcb6889e3d0508794695b1edd89b2121c8efaf0222fd1d66cf43902b9c3d217bbe8a63ae3b92a93bd WHIRLPOOL 0dedb4bafaa03c997f89d52eb334bc1e9492b40d6bbaa7429a62ee78b45712de955f39f13ec995cd10051333117c1dc4bb119270f53fece5da686eceb7e06895 DIST youtube-dl-2015.11.01.tar.gz 1779098 SHA256 58a981cd708f30567382b97d6db336b25ca2279b759aea3a79e4d39a68351f3a SHA512 954f1ede1bdbe821c1f2696739bd0a1e6e5bbf4ee7cf122e2baa4da1c9561a8db733e6972d28d0f8556ac22308924fd2b8342bb634fe008beec1debfd8e5567c WHIRLPOOL 37ea642eeec688ac72f88a35a31a2bc5a1aa511555b48e41d2b8c5991ec58fc1e440581ecca9f03ff74f210ae5c9eeec47f7f95745fd5888ce7569720282dddc +DIST youtube-dl-2015.11.02.tar.gz 1779176 SHA256 5c5bc5a7fec405ed353bd7052a4a83e8782742d246b24af73393fe70c7b28d8c SHA512 99425739bf8802e50e5d4e11acd9915cb558f735918f145e78bb3e2d587c0b978882ac339ecbb0c8570510ea5843e19017fd40b5b4a2fbc44e5806ebb14bbaf2 WHIRLPOOL e80a4245cfa845cf3e27f19d04ba29af27d11ce5f5f69269633ea3200dbfbbee3afc7410aa7a34dcb03645568a96e1c1cc1ce285de768b1d6eb244a52251aa4f diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.24.ebuild b/net-misc/youtube-dl/youtube-dl-2015.11.02.ebuild index db29af284def..7c5ab5b4b433 100644 --- a/net-misc/youtube-dl/youtube-dl-2015.10.24.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2015.11.02.ebuild @@ -4,7 +4,7 @@ EAPI=5 -PYTHON_COMPAT=(python{2_7,3_3,3_4}) +PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5}) DISTUTILS_SINGLE_IMPL=true inherit bash-completion-r1 distutils-r1 eutils diff --git a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild index bf18fdad0613..a0fe86a7c5d5 100644 --- a/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271.ebuild +++ b/net-wireless/broadcom-sta/broadcom-sta-6.30.223.271-r1.ebuild @@ -59,10 +59,10 @@ pkg_setup() { src_prepare() { epatch \ - "${FILESDIR}/${PN}-6.30.223.141-license.patch" \ "${FILESDIR}/${PN}-6.30.223.141-makefile.patch" \ "${FILESDIR}/${PN}-6.30.223.141-eth-to-wlan.patch" \ "${FILESDIR}/${PN}-6.30.223.141-gcc.patch" \ + "${FILESDIR}/${PN}-6.30.223.271-r1-linux-3.18.patch" \ "${FILESDIR}/${PN}-6.30.223.248-r3-Wno-date-time.patch" epatch_user diff --git a/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch new file mode 100644 index 000000000000..9a0e7136c53b --- /dev/null +++ b/net-wireless/broadcom-sta/files/broadcom-sta-6.30.223.271-r1-linux-3.18.patch @@ -0,0 +1,12 @@ +--- a/src/wl/sys/wl_linux.c 2014-06-26 12:42:08.000000000 +0200 ++++ b/src/wl/sys/wl_linux.c 2015-01-22 01:44:58.580453805 +0100 +@@ -2157,8 +2159,8 @@ + wlif = WL_DEV_IF(dev); + wl = WL_INFO(dev); + ++ skb->prev = NULL; + if (WL_ALL_PASSIVE_ENAB(wl) || (WL_RTR() && WL_CONFIG_SMP())) { +- skb->prev = NULL; + + TXQ_LOCK(wl); + diff --git a/profiles/package.mask b/profiles/package.mask index 64b25983b6cd..6b975bde2a87 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -138,11 +138,6 @@ dev-java/commons-grant =sys-kernel/vanilla-sources-4.1.9 =sys-kernel/gentoo-sources-4.1.9 -# Patrice Clement <monsieurp@gentoo.org> (1 Oct 2015) -# Project is over 10 years old and seems to have stalled. -# Masked for removal in 30 days. See bug 561954. -dev-java/xmlc - # Andreas K. Huettel <dilfridge@gentoo.org> (27 Sep 2015) # Dead upstream, buggy, effectively unmaintained. Removal # in 30 days. @@ -231,10 +226,6 @@ dev-lang/gpc # app-forensics/afl instead. Bug #544794 dev-util/bunny -# Michael Orlitzky <mjo@gentoo.org> (21 Sep 2015) -# Mask for removal in 30 days. Obsolete. Bug #561040. -dev-php/smarty-docs - # Andreas K. Huettel <dilfridge@gentoo.org> (19 Sep 2015) # Masked for security reasons, bugs 516044, 552644 # Keeping it in the tree for now for users who cannot upgrade @@ -355,11 +346,17 @@ app-emulation/emul-linux-x86-jna # Justin Lecher <jlec@gentoo.org> (28 Feb 2015) # Unfixed security problems +# No upstream support anymore # CVE-2015-{0219,0220,0221,0222,5145} # #536586 # #554864 +=dev-python/django-1.4* =dev-python/django-1.5* =dev-python/django-1.6* +# Not supported by any django version upstream supports +dev-python/south +dev-python/Djblets +dev-util/reviewboard # Michał Górny <mgorny@gentoo.org> (11 Feb 2015) # Potentially destructive to @world, bug #539746. diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors index 343584d418cf..07378815c58f 100644 --- a/profiles/thirdpartymirrors +++ b/profiles/thirdpartymirrors @@ -12,7 +12,7 @@ gimp http://de-mirror.gimper.net/pub/gimp/ http://gimp.afri.cc/pub/gimp/ http:/ github https://github.com/downloads gmt ftp://mirror.geosci.usyd.edu.au/pub/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ftp.soest.hawaii.edu/gmt/ ftp://ibis.grdl.noaa.gov/pub/gmt/ ftp://ftp.iris.washington.edu/pub/gmt/ ftp://ftp.iag.usp.br/pub/gmt/ ftp://ftp.geologi.uio.no/pub/gmt/ gnome http://download.gnome.org/ -gnu http://ftp.gnu.org/gnu/ ftp://ftp.gnu.org/gnu/ ftp://gnu.mirror.iweb.com http://gnu.mirror.iweb.com ftp://mirror.vexxhost.com/gnu/ http://gnu.mirror.vexxhost.com/ ftp://gnu.opencube.ca/ http://gnu.opencube.ca/ http://mirror.sdunix.com/gnu/ ftp://mirrors.kernel.org/gnu/ http://mirrors.kernel.org/gnu/ http://open-source-box.org/ ftp://open-source-box.org/gnu/ http://gnu.mirrors.hoobly.com/gnu/ http://mirror.easthsia.com/gnu http://mirror.keystealth.org/gnu/ ftp://mirror.keystealth.org/gnu/ http://gnu.mirrorcatalogs.com/ ftp://gnu.mirrorcatalogs.com/gnu/ http://mirrors.axint.net/repos/gnu.org/ http://mirrors.syringanetworks.net/gnu/ ftp://mirrors.syringanetworks.net/gnu/ http://mirror.team-cymru.org/gnu/ ftp://mirror.team-cymru.org/gnu/ ftp://mirror.anl.gov/pub/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.thecodefactory.org/gnu/ http://gnu.askapache.com/ ftp://aeneas.mit.edu/pub/gnu/ http://ftp.wayne.edu/gnu/ http://mirror.nexcess.net/gnu/ http://psg.mtu.edu/pub/gnu/ ftp://psg.mtu.edu/pub/gnu/ http://gnu.mirror.constant.com/ ftp://spinellicreations.com/gnu/ http://mirror.clarkson.edu/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.zerg.biz/gnu/ http://reflection.oss.ou.edu/gnu/gnu/ ftp://reflection.oss.ou.edu/gnu/gnu/ http://gnu.mirrors.pair.com/gnu/ ftp://gnu.mirrors.pair.com/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://mirror.nbtelecom.com.br/gnu/ http://mirror.cedia.org.ec/gnu/ ftp://mirror.cedia.org.ec/gnu http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://mirror.is.co.za/mirror/ftp.gnu.org/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu/ http://gnu.afri.cc/ http://mirrors.ispros.com.bd/gnu http://mirror.bjtu.edu.cn/gnu/ http://mirrors.ustc.edu.cn/gnu/ ftp://mirrors.ustc.edu.cn/gnu/ http://mirror.hust.edu.cn/gnu/ http://infinity.kmeacollege.ac.in/gnu/ ftp://infinity.kmeacollege.ac.in/gnu/ http://gnumirror.nkn.in/ http://ftp.jaist.ac.jp/pub/GNU/ http://mirror.jre655.com/GNU ftp://mirror.jre655.com/GNU http://public.p-knowledge.co.jp/gnu-mirror/gnu/ http://ftp.kaist.ac.kr/gnu/gnu/ http://ossm.utm.my/gnu/ http://mirror.squ.edu.om/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.yzu.edu.tw/gnu/ ftp://ftp.yzu.edu.tw/gnu/ http://mirror.aarnet.edu.au/pub/gnu/ ftp://mirror.aarnet.edu.au/pub/gnu/ http://gnu.mirror.uber.com.au/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ http://gd.tuwien.ac.at/gnu/gnusrc/ http://tweedo.com/mirror/gnu/ http://gnu.cu.be/ http://ftp.download-by.net/gnu/gnu/ http://mirrors.dotsrc.org/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://mirror.bbln.org/gnu ftp://mirror.bbln.org/gnu http://mirror.ibcp.fr/pub/gnu/ ftp://ftp.igh.cnrs.fr/pub/gnu/ http://ftp.igh.cnrs.fr/pub/gnu/ http://gnu.cardse.net/ ftp://www.artfiles.org/gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ http://ftp.halifax.rwth-aachen.de/gnu/ ftp://ftp.halifax.rwth-aachen.de/gnu/ http://ftp.u-tx.net/gnu/ ftp://ftp.u-tx.net/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://mirror.checkdomain.de/gnu ftp://mirror.checkdomain.de/gnu http://mirror3.layerjet.com/gnu/ http://ftp.hawo.stw.uni-erlangen.de/gnu ftp://ftp.hawo.stw.uni-erlangen.de/gnu http://mirror.netcologne.de/gnu ftp://mirror.netcologne.de/gnu ftp://ftp.cc.uoc.gr/mirrors/gnu/ http://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.heanet.ie/pub/gnu/ http://ftp.heanet.ie/mirrors/gnu/ http://mirror2.mirror.garr.it/mirrors/gnuftp/gnu/ http://mirrors.muzzy.it/gnu ftp://mirrors.muzzy.it/gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ http://gnu.xl-mirror.nl/ http://mirror.arbitrary.nl/gnu/ http://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.uninett.no/pub/gnu/ http://gnuftp.uib.no/ ftp://gnuftp.uib.no/pub/gnuftp/ http://ftp.task.gda.pl/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ http://mirrors.nfsi.pt/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://gnu.mirrors.linux.ro/ ftp://gnu.mirrors.linux.ro/gnu/ http://mirror.tochlab.net/pub/gnu/ ftp://mirror.tochlab.net/pub/gnu/ http://mirror.sbb.rs/gnu/ ftp://mirror.sbb.rs/gnu/ http://gnu.prunk.si http://mirror.lihnidos.org/GNU/ftp/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.rediris.es/mirror/GNU/gnu/ ftp://ftp.rediris.es/mirror/GNU/gnu/ http://217.160.6.133/Asturies/GNU/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://mirror.switch.ch/ftp/mirror/gnu/ ftp://mirror.switch.ch/mirror/gnu/ http://mirror.rackdc.com/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org.ua/gnu/ ftp://ftp.gnu.org.ua/gnu/ http://ftp-gnu-org.ip-connect.vn.ua/ ftp://ftp-gnu-org.ip-connect.vn.ua/mirror/ftp.gnu.org/ http://mirror.lagoon.nc/pub/gnu/ ftp://mirror.lagoon.nc/pub/gnu/ +gnu http://ftp.gnu.org/gnu/ ftp://ftp.gnu.org/gnu/ ftp://gnu.mirror.iweb.com http://gnu.mirror.iweb.com ftp://mirror.vexxhost.com/gnu/ http://gnu.mirror.vexxhost.com/ ftp://gnu.opencube.ca/ http://gnu.opencube.ca/ http://mirror.sdunix.com/gnu/ ftp://mirrors.kernel.org/gnu/ http://mirrors.kernel.org/gnu/ http://open-source-box.org/ ftp://open-source-box.org/gnu/ http://gnu.mirrors.hoobly.com/gnu/ http://mirror.easthsia.com/gnu http://mirror.keystealth.org/gnu/ ftp://mirror.keystealth.org/gnu/ http://gnu.mirrorcatalogs.com/ ftp://gnu.mirrorcatalogs.com/gnu/ http://mirrors.axint.net/repos/gnu.org/ http://mirrors.syringanetworks.net/gnu/ ftp://mirrors.syringanetworks.net/gnu/ http://mirror.team-cymru.org/gnu/ ftp://mirror.team-cymru.org/gnu/ ftp://mirror.anl.gov/pub/gnu/ http://mirror.anl.gov/pub/gnu/ http://mirror.thecodefactory.org/gnu/ http://gnu.askapache.com/ ftp://aeneas.mit.edu/pub/gnu/ http://ftp.wayne.edu/gnu/ http://mirror.nexcess.net/gnu/ http://psg.mtu.edu/pub/gnu/ ftp://psg.mtu.edu/pub/gnu/ http://gnu.mirror.constant.com/ ftp://spinellicreations.com/gnu/ http://mirror.clarkson.edu/gnu/ http://mirrors.ibiblio.org/pub/mirrors/gnu/ftp/gnu/ http://mirrors.zerg.biz/gnu/ http://reflection.oss.ou.edu/gnu/gnu/ ftp://reflection.oss.ou.edu/gnu/gnu/ http://gnu.mirrors.pair.com/gnu/ ftp://gnu.mirrors.pair.com/gnu/gnu/ ftp://ftp.unicamp.br/pub/gnu/ http://gnu.c3sl.ufpr.br/ftp/ http://mirror.nbtelecom.com.br/gnu/ http://mirror.cedia.org.ec/gnu/ ftp://mirror.cedia.org.ec/gnu http://download.polytechnic.edu.na/pub/ftp.gnu.org/gnu/ http://mirror.is.co.za/mirror/ftp.gnu.org/gnu/ ftp://ftp.is.co.za/mirror/ftp.gnu.org/gnu/ http://gnu.afri.cc/ http://mirrors.ispros.com.bd/gnu http://mirror.bjtu.edu.cn/gnu/ http://mirrors.ustc.edu.cn/gnu/ ftp://mirrors.ustc.edu.cn/gnu/ http://mirror.hust.edu.cn/gnu/ http://infinity.kmeacollege.ac.in/gnu/ ftp://infinity.kmeacollege.ac.in/gnu/ http://gnumirror.nkn.in/ http://ftp.jaist.ac.jp/pub/GNU/ http://mirror.jre655.com/GNU ftp://mirror.jre655.com/GNU http://public.p-knowledge.co.jp/gnu-mirror/gnu/ http://ftp.kaist.ac.kr/gnu/gnu/ http://ossm.utm.my/gnu/ http://mirror.squ.edu.om/gnu/ http://ftp.twaren.net/Unix/GNU/gnu/ ftp://ftp.twaren.net/Unix/GNU/gnu/ http://ftp.yzu.edu.tw/gnu/ ftp://ftp.yzu.edu.tw/gnu/ http://mirror.aarnet.edu.au/pub/gnu/ ftp://mirror.aarnet.edu.au/pub/gnu/ http://gnu.mirror.uber.com.au/ ftp://gd.tuwien.ac.at/gnu/gnusrc/ http://gd.tuwien.ac.at/gnu/gnusrc/ http://tweedo.com/mirror/gnu/ http://gnu.cu.be/ http://ftp.download-by.net/gnu/gnu/ http://mirrors.dotsrc.org/gnu/ ftp://mirrors.dotsrc.org/gnu/ ftp://ftp.funet.fi/pub/gnu/prep/ http://www.nic.funet.fi/pub/gnu/ftp.gnu.org/pub/gnu/ http://mirror.bbln.org/gnu ftp://mirror.bbln.org/gnu http://mirror.ibcp.fr/pub/gnu/ ftp://ftp.igh.cnrs.fr/pub/gnu/ http://ftp.igh.cnrs.fr/pub/gnu/ http://gnu.cardse.net/ ftp://www.artfiles.org/gnu.org/ ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.gnu.org/ ftp://ftp.cs.tu-berlin.de/pub/gnu/ http://ftp.halifax.rwth-aachen.de/gnu/ ftp://ftp.halifax.rwth-aachen.de/gnu/ http://ftp.u-tx.net/gnu/ ftp://ftp.u-tx.net/gnu/ ftp://ftp.informatik.rwth-aachen.de/pub/gnu/ http://ftp.hosteurope.de/mirror/ftp.gnu.org/gnu/ http://mirror.checkdomain.de/gnu ftp://mirror.checkdomain.de/gnu http://mirror3.layerjet.com/gnu/ http://ftp.hawo.stw.uni-erlangen.de/gnu ftp://ftp.hawo.stw.uni-erlangen.de/gnu http://mirror.netcologne.de/gnu ftp://mirror.netcologne.de/gnu ftp://ftp.cc.uoc.gr/mirrors/gnu/ http://ftp.cc.uoc.gr/mirrors/gnu/ ftp://ftp.ntua.gr/pub/gnu/ ftp://ftp.heanet.ie/pub/gnu/ http://ftp.heanet.ie/mirrors/gnu/ http://mirror2.mirror.garr.it/mirrors/gnuftp/gnu/ http://mirrors.muzzy.it/gnu ftp://mirrors.muzzy.it/gnu ftp://ftp.mirror.nl/pub/mirror/gnu/ ftp://ftp.nluug.nl/pub/gnu/ http://mirror.arbitrary.nl/gnu/ http://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.snt.utwente.nl/pub/software/gnu/ ftp://ftp.uninett.no/pub/gnu/ http://gnuftp.uib.no/ ftp://gnuftp.uib.no/pub/gnuftp/ http://ftp.task.gda.pl/pub/gnu/ ftp://ftp.task.gda.pl/pub/gnu/ ftp://sunsite.icm.edu.pl/pub/gnu/ ftp://mirrors.nfsi.pt/pub/gnu/ http://mirrors.nfsi.pt/gnu/ ftp://mirrors.fe.up.pt/pub/gnu/ http://mirrors.fe.up.pt/pub/gnu/ http://gnu.mirrors.linux.ro/ ftp://gnu.mirrors.linux.ro/gnu/ http://mirror.tochlab.net/pub/gnu/ ftp://mirror.tochlab.net/pub/gnu/ http://mirror.sbb.rs/gnu/ ftp://mirror.sbb.rs/gnu/ http://gnu.prunk.si http://mirror.lihnidos.org/GNU/ftp/gnu/ http://ftp.gul.es/gnu/ftp.gnu.org/gnu/ ftp://ftp.gul.es/gnu/ftp.gnu.org/gnu/ http://ftp.rediris.es/mirror/GNU/gnu/ ftp://ftp.rediris.es/mirror/GNU/gnu/ http://217.160.6.133/Asturies/GNU/gnu/ ftp://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://ftp.df.lth.se/pub/ftp.gnu.org/pub/gnu/ http://mirror.switch.ch/ftp/mirror/gnu/ ftp://mirror.switch.ch/mirror/gnu/ http://mirror.rackdc.com/gnu/ ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/ http://ftp.gnu.org.ua/gnu/ ftp://ftp.gnu.org.ua/gnu/ http://ftp-gnu-org.ip-connect.vn.ua/ ftp://ftp-gnu-org.ip-connect.vn.ua/mirror/ftp.gnu.org/ http://mirror.lagoon.nc/pub/gnu/ ftp://mirror.lagoon.nc/pub/gnu/ gnu-alpha ftp://alpha.gnu.org/gnu/ http://alpha.gnu.org/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ http://gnualpha.uib.no/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/ http://gnualpha.spinellicreations.com/gnu/ http://gnu.c3sl.ufpr.br/alpha/gnu/ gnupg ftp://ftp.gnupg.org/gcrypt/ http://gnupg.unixmexico.org/ftp/ http://ftp.linux.it/pub/mirrors/gnupg/ ftp://ftp.surfnet.nl/pub/security/gnupg/ ftp://sunsite.icm.edu.pl/pub/security/gnupg/ ftp://ftp.iasi.roedu.net/pub/mirrors/ftp.gnupg.org/ ftp://ftp.hi.is/pub/mirrors/gnupg/ ftp://gd.tuwien.ac.at/privacy/gnupg/ http://www.ring.gr.jp/pub/net/gnupg/ ftp://ftp.ring.gr.jp/pub/net/gnupg/ http://public.planetmirror.com/pub/ hackage http://hackage.haskell.org/ http://dev.gentoo.org/~qnikst/hdiff.luite.com/ diff --git a/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild b/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild index 7750cbd59842..38b4b2299741 100644 --- a/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild +++ b/sci-electronics/kicad/kicad-4.0.0_rc1.ebuild @@ -42,7 +42,7 @@ CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?] dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}] ${PYTHON_DEPS} ) - >=dev-libs/boost-1.56[context,threads,python?] + >=dev-libs/boost-1.56[context,nls,threads,python?] github? ( dev-libs/openssl:0 ) media-libs/glew media-libs/freeglut @@ -154,7 +154,6 @@ src_install() { cmake-utils_src_install use python && python_optimize if use doc ; then - insinto /usr/share/doc/${PF} dodoc uncrustify.cfg cd Documentation || die "cd failed" dodoc -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/. diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest index 8d17e7b63417..1cab6fb7beec 100644 --- a/sci-libs/rtabmap/Manifest +++ b/sci-libs/rtabmap/Manifest @@ -1 +1,2 @@ +DIST rtabmap-0.10.10.tar.gz 17111390 SHA256 9c0a2c31b56f9e7162ae032da6c55b8781788b00ffdb2f474d8fd6fa870d7ffc SHA512 3267d60d0ad3554ebd543304c782f09f363dd0e77280e6ccbf459c569a5037efe41f7d981f4e64263329dd777f8ec6d9a3d56bfc8b94b48c11d008cc6c695aef WHIRLPOOL e12f0b3c7f9c22b07d3ba56860ec25e4b47a13bae3ebc2793243d17a0e11e2053515efb0cd37a2f7e4eb959aeba7f3ce2fa4a39e26ecb5349f0d4dbe3dd7be25 DIST rtabmap-0.10.5.tar.gz 16975400 SHA256 2c783d7a3c872b084bde18466863fda6d8c8247ff279dbee40f1d3da69b1667a SHA512 a144387d6cbe4ad9b656216c269505768a60408ae9486b41d85c8ed0f8a1212b8f598d392c147d042f8b3ade57974b2b8ae6e5ec8c47e6a18f11d53ce8a086e9 WHIRLPOOL 76faf97da79a5c7693b6ca41422c92d5bb47b6c1cc6ccec6658df2721ad1219ba41be3a6c15bf3c9f9d7c7b9e384141d04c1c996fe604edab2b3e03506c7f8c5 diff --git a/sci-libs/rtabmap/rtabmap-0.10.10.ebuild b/sci-libs/rtabmap/rtabmap-0.10.10.ebuild new file mode 100644 index 000000000000..8fdd4089e4cf --- /dev/null +++ b/sci-libs/rtabmap/rtabmap-0.10.10.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_REPO_URI="https://github.com/introlab/rtabmap" +fi + +inherit ${SCM} cmake-utils multilib + +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" + SRC_URI="" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)" +HOMEPAGE="http://introlab.github.io/rtabmap/" +LICENSE="BSD" +SLOT="0" +IUSE="ieee1394 openni2 qt4 qt5" + +RDEPEND=" + media-libs/opencv:= + sci-libs/pcl[openni,vtk] + sci-libs/vtk + sys-libs/zlib + ieee1394? ( media-libs/libdc1394 ) + openni2? ( dev-libs/OpenNI2 ) + !qt5? ( + qt4? ( + dev-qt/qtgui:4 + dev-qt/qtsvg:4 + dev-qt/qtcore:4 + media-libs/opencv[-qt5(-)] + ) + ) + qt5? ( + dev-qt/qtwidgets:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + media-libs/opencv[qt5(-)] + ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_configure() { + local mycmakeargs=( + "-DWITH_QT=$(usex qt4 ON "$(usex qt5 ON OFF)")" + "-DRTABMAP_QT_VERSION=$(usex qt5 5 4)" + "-DWITH_DC1394=$(usex ieee1394 ON OFF)" + "-DWITH_OPENNI2=$(usex openni2 ON OFF)" + ) + cmake-utils_src_configure +} diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest index 9bd956abcea4..416d1e37ea7f 100644 --- a/sys-apps/grep/Manifest +++ b/sys-apps/grep/Manifest @@ -1,2 +1,3 @@ DIST grep-2.21-heap_buffer_overrun.patch 3302 SHA256 4bc7e744fd34b268a798daf6a5aa85f55c141747149fa7b015eefbf9318ed478 SHA512 eaea33238f179b17dd152ed27a07c211646d9572be250eb7997c25ea0c8de232d21d8bc1b1e865b26545e6817e5c116e18d9115fb497d39426ac8212839f0f82 WHIRLPOOL 5ead7c22c8fe98289322a03685e9fc04e834a01144c55c9ea3b1970fa61b400ce669e6947cb3564fbbba5c7ddf079fd30e66352e4f6eed888e8fe883e369e601 DIST grep-2.21.tar.xz 1261548 SHA256 5244a11c00dee8e7e5e714b9aaa053ac6cbfa27e104abee20d3c778e4bb0e5de SHA512 bc894325f89d37413c773d4812cb24180560037ccc8d72c015462043ef3479ea7eefd62557e3a9d191d6d94c68262563d3c68e634acd4e77ba56e96c92805dfd WHIRLPOOL 2272286c10695a51eecafcc5ca8986adb5486d4494b284904f588717c6fb06de37933faa5f62eabf0ecc856334b3a1179b864dedc06f223047471168d2d86bb0 +DIST grep-2.22.tar.xz 1297864 SHA256 ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb SHA512 c0756e4aa360cc29b3123384eef654743df108cc606372142c79893a09a0c8053b03d048768e972221e0ed96f378b8564f848f9acc180fca499f0494fbe9113c WHIRLPOOL 612c72fd61605a4f4e6052980db72ff2e6dfa6d0a975186ebd8f9101ab4b62caf31c5a634318156df6407e44456edf74ea1070d489da0625fee1dc029b978404 diff --git a/sys-apps/grep/grep-2.22.ebuild b/sys-apps/grep/grep-2.22.ebuild new file mode 100644 index 000000000000..c1392f6ec08b --- /dev/null +++ b/sys-apps/grep/grep-2.22.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="GNU regular expression matcher" +HOMEPAGE="https://www.gnu.org/software/grep/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls pcre static" + +LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + nls? ( virtual/libintl ) + virtual/libiconv" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + static? ( ${LIB_DEPEND} )" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + sed -i \ + -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ + src/egrep.sh || die #523898 +} + +src_configure() { + use static && append-ldflags -static + # Always use pkg-config to get lib info for pcre. + export ac_cv_search_pcre_compile=$( + usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' + ) + econf \ + --bindir="${EPREFIX}"/bin \ + $(use_enable nls) \ + $(use_enable pcre perl-regexp) +} diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest index 435eed7bf2af..888f6a4ac807 100644 --- a/sys-apps/util-linux/Manifest +++ b/sys-apps/util-linux/Manifest @@ -2,4 +2,5 @@ DIST util-linux-2.24.1.tar.xz 3543692 SHA256 835eb6232cfab0118ef2e4fd649de0ba9f5 DIST util-linux-2.24.2.tar.xz 3586580 SHA256 1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 SHA512 a0c03876ef19fa09e434e3e5362fb3f3e0a254b3b39a623ac7a9a207d06afce00366792244ed0fac86931f8340c046620660f33c3444a07a12037182fc191240 WHIRLPOOL 4b8185e1832145c050a8aa0761ae017d846ed58cd7e07710e4c32bf92a8f6e530bddb56dab70c8025eddb4cafafed79e658b0aced3a190b61b508078a438a9ed DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed +DIST util-linux-2.27.1.tar.xz 3964512 SHA256 0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290 SHA512 a450a0c2d26a6deaf5e53b8f6bddf59409aefb1f0aaf07393f68a418408fbc62c5da353c8ba53c7cac8ea6e3dddfad59161753d888c31f5ccea445e81accbad8 WHIRLPOOL b0641f013762a667efcb2fabe6e3e09dd09252835d841e25cde506aca3a74876ad34f8130f3227683c7e8f19359205c4014dfcd9055d860ae6e3e54621478639 DIST util-linux-2.27.tar.xz 3968872 SHA256 fcbf04e3ef8377fc8369af7f9afee341c5eef9b02dd5a7ce71532d0957e86dc7 SHA512 06ee17f4801fd3e35fb4cf3717722ea3f709e3dd9f9153510c399742a5cfca341e3a3a400d35a091b74f0de3636e62c7a14b7dd91d63482b7b98b1991aa6fa3c WHIRLPOOL da19c56dfe424c59bc982096f08c02d864718f030bbad79661968f1da972ea10e0eacaa2477cda45ec9a3c688d220740ca2c8823918dae5139a943f6c9d8e2a4 diff --git a/sys-apps/util-linux/util-linux-2.27.1.ebuild b/sys-apps/util-linux/util-linux-2.27.1.ebuild new file mode 100644 index 000000000000..95c5785af85e --- /dev/null +++ b/sys-apps/util-linux/util-linux-2.27.1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 python3_{3,4} ) + +inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ + python-single-r1 multilib-minimal systemd + +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} + +if [[ ${PV} == 9999 ]] ; then + inherit git-2 autotools + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" +fi + +DESCRIPTION="Various useful Linux utilities" +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/" + +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain" +SLOT="0" +IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid systemd test tty-helpers udev unicode" + +RDEPEND="!sys-process/schedutils + !sys-apps/setarch + !<sys-apps/sysvinit-2.88-r7 + !sys-block/eject + !<sys-libs/e2fsprogs-libs-1.41.8 + !<sys-fs/e2fsprogs-1.41.8 + !<app-shells/bash-completion-1.3-r2 + caps? ( sys-libs/libcap-ng ) + cramfs? ( sys-libs/zlib ) + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) + pam? ( sys-libs/pam ) + python? ( ${PYTHON_DEPS} ) + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] ) + slang? ( sys-libs/slang ) + systemd? ( sys-apps/systemd ) + udev? ( virtual/libudev:= ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20150406-r2 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] + )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext ) + test? ( sys-devel/bc ) + virtual/os-headers" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} == 9999 ]] ; then + po/update-potfiles + eautoreconf + fi + elibtoolize +} + +lfs_fallocate_test() { + # Make sure we can use fallocate with LFS #300307 + cat <<-EOF > "${T}"/fallocate.${ABI}.c + #define _GNU_SOURCE + #include <fcntl.h> + main() { return fallocate(0, 0, 0, 0); } + EOF + append-lfs-flags + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \ + || export ac_cv_func_fallocate=no + rm -f "${T}"/fallocate.${ABI}.c +} + +multilib_src_configure() { + lfs_fallocate_test + # The scanf test in a run-time test which fails while cross-compiling. + # Blindly assume a POSIX setup since we require libmount, and libmount + # itself fails when the scanf test fails. #531856 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 + ECONF_SOURCE=${S} \ + econf \ + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ + --docdir='${datarootdir}'/doc/${PF} \ + $(multilib_native_use_enable nls) \ + --enable-agetty \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + --enable-bash-completion \ + $(multilib_native_use_enable caps setpriv) \ + --disable-chfn-chsh \ + $(multilib_native_use_enable cramfs) \ + $(multilib_native_use_enable fdformat) \ + --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \ + --disable-kill \ + --disable-login \ + $(multilib_native_use_enable tty-helpers mesg) \ + --disable-nologin \ + --enable-partx \ + $(multilib_native_use_with python) \ + --enable-raw \ + --enable-rename \ + --disable-reset \ + --enable-schedutils \ + --disable-su \ + $(multilib_native_use_enable tty-helpers wall) \ + $(multilib_native_use_enable tty-helpers write) \ + $(multilib_native_use_enable suid makeinstall-chown) \ + $(multilib_native_use_enable suid makeinstall-setuid) \ + $(use_with selinux) \ + $(multilib_native_use_with slang) \ + $(use_enable static-libs static) \ + $(multilib_native_use_with systemd) \ + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \ + $(multilib_native_use_with udev) \ + $(tc-has-tls || echo --disable-tls) +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # build libraries only + emake -f Makefile -f - mylibs \ + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)' + fi +} + +multilib_src_test() { + multilib_is_native_abi && emake check +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \ + install-pkgconfigDATA install-uuidincHEADERS \ + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \ + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS + fi + + if multilib_is_native_abi; then + # need the libs in / + gen_usr_ldscript -a blkid mount smartcols uuid + + use python && python_optimize + fi +} + +multilib_src_install_all() { + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*} + + # e2fsprogs-libs didnt install .la files, and .pc work fine + prune_libtool_files +} + +pkg_postinst() { + if ! use tty-helpers; then + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers." + fi + + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "The agetty util now clears the terminal by default. You" + elog "might want to add --noclear to your /etc/inittab lines." + fi +} diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild index ee2ab6a9764f..95c5785af85e 100644 --- a/sys-apps/util-linux/util-linux-9999.ebuild +++ b/sys-apps/util-linux/util-linux-9999.ebuild @@ -90,13 +90,9 @@ multilib_src_configure() { tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486 export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 - # We manually set --libdir to the default since on prefix, econf will set it to - # a value which the configure script does not recognize. This makes it set the - # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25 ECONF_SOURCE=${S} \ econf \ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \ - --libdir='${prefix}/'"$(get_libdir)" \ --docdir='${datarootdir}'/doc/${PF} \ $(multilib_native_use_enable nls) \ --enable-agetty \ diff --git a/sys-fs/cloudfuse/metadata.xml b/sys-fs/cloudfuse/metadata.xml index a60ef5cec63b..59186a95942a 100644 --- a/sys-fs/cloudfuse/metadata.xml +++ b/sys-fs/cloudfuse/metadata.xml @@ -2,12 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer status="active"> - <email>erikmack@gmail.com</email> + <email>stasibear@gentoo.org</email> <name>Erik Mackdanz</name> </maintainer> - <maintainer status="active"> - <email>alunduil@gentoo.org</email> - </maintainer> <longdescription> Cloudfuse is a FUSE application which provides access to Rackspace's Cloud Files. The README claims that diff --git a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild new file mode 100644 index 000000000000..e3eb6e5d4a01 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic + +DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" +HOMEPAGE="https://sources.redhat.com/lvm2/" +SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz + ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) + systemd? ( udev ) + clvm? ( !systemd )" + +DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) + readline? ( sys-libs/readline:0= ) + udev? ( >=virtual/libudev-208:=[static-libs?] )" +# /run is now required for locking during early boot. /var cannot be assumed to +# be available -- thus, pull in recent enough baselayout for /run. +# This version of LVM is incompatible with cryptsetup <1.1.2. +RDEPEND="${DEPEND_COMMON} + >=sys-apps/baselayout-2.2 + !<sys-apps/openrc-0.11 + !<sys-fs/cryptsetup-1.1.2 + !!sys-fs/clvm + !!sys-fs/lvm-user + >=sys-apps/util-linux-2.16 + lvm2create_initrd? ( sys-apps/makedev ) + thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" +# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check +# USE 'static' currently only works with eudev, bug 520450 +DEPEND="${DEPEND_COMMON} + virtual/pkgconfig + >=sys-devel/binutils-2.20.1-r1 + static? ( + selinux? ( sys-libs/libselinux[static-libs] ) + udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) + >=sys-apps/util-linux-2.16[static-libs] + )" + +S=${WORKDIR}/${PN/lvm/LVM}.${PV} + +pkg_setup() { + local CONFIG_CHECK="~SYSVIPC" + + if use udev; then + local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + fi + fi + + check_extra_config + + # 1. Genkernel no longer copies /sbin/lvm blindly. + if use static; then + elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" + elog "their static versions. If you need the static binaries," + elog "you must append .static to the filename!" + fi +} + +src_prepare() { + # Gentoo specific modification(s): + epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch + + sed -i \ + -e "1iAR = $(tc-getAR)" \ + -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ + make.tmpl.in || die #444082 + + sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 + + if use udev && ! use device-mapper-only; then + sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 + elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" + elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" + elog "if it was previously disabled." + fi + + sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 + + # For upstream -- review and forward: + epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch + epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch + epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 + epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 + epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed + epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 + epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid + epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 + + # Without thin-privision-tools, there is nothing to install for target install_man7: + use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } + + eautoreconf +} + +src_configure() { + filter-flags -flto + local myconf + local buildmode + + myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" + myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" + myconf="${myconf} $(use_enable !device-mapper-only applib)" + myconf="${myconf} $(use_enable !device-mapper-only fsadm)" + myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" + use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" + + # Most of this package does weird stuff. + # The build options are tristate, and --without is NOT supported + # options: 'none', 'internal', 'shared' + if use static; then + buildmode="internal" + # This only causes the .static versions to become available + myconf="${myconf} --enable-static_link" + else + buildmode="shared" + fi + dmbuildmode=$(use !device-mapper-only && echo internal || echo none) + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + myconf="${myconf} --with-mirrors=${dmbuildmode}" + myconf="${myconf} --with-snapshots=${dmbuildmode}" + if use thin; then + myconf="${myconf} --with-thin=internal --with-cache=internal" + local texec + for texec in check dump repair restore; do + myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}" + myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}" + done + else + myconf="${myconf} --with-thin=none --with-cache=none" + fi + + if use lvm1; then + myconf="${myconf} --with-lvm1=${buildmode}" + else + myconf="${myconf} --with-lvm1=none" + fi + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + use hppa && myconf="${myconf} --disable-o_direct" + + if use clvm; then + myconf="${myconf} --with-cluster=${buildmode}" + # 4-state! Make sure we get it right, per bug 210879 + # Valid options are: none, cman, gulm, all + # + # 2009/02: + # gulm is removed now, now dual-state: + # cman, none + # all still exists, but is not needed + # + # 2009/07: + # TODO: add corosync and re-enable ALL + local clvmd="" + use cman && clvmd="cman" + #clvmd="${clvmd/cmangulm/all}" + [ -z "${clvmd}" ] && clvmd="none" + myconf="${myconf} --with-clvmd=${clvmd}" + myconf="${myconf} --with-pool=${buildmode}" + else + myconf="${myconf} --with-clvmd=none --with-cluster=none" + fi + + econf \ + $(use_enable readline) \ + $(use_enable selinux) \ + --enable-pkgconfig \ + --with-confdir="${EPREFIX}"/etc \ + --exec-prefix="${EPREFIX}" \ + --sbindir="${EPREFIX}/sbin" \ + --with-staticdir="${EPREFIX}"/sbin \ + --libdir="${EPREFIX}/$(get_libdir)" \ + --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-default-dm-run-dir=/run \ + --with-default-run-dir=/run/lvm \ + --with-default-locking-dir=/run/lock/lvm \ + --with-default-pid-dir=/run \ + $(use_enable udev udev_rules) \ + $(use_enable udev udev_sync) \ + $(use_with udev udevdir "$(get_udevdir)"/rules.d) \ + $(use_enable systemd udev-systemd-background-jobs) \ + "$(systemd_with_unitdir)" \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" +} + +src_compile() { + pushd include >/dev/null + emake + popd >/dev/null + + if use device-mapper-only ; then + emake device-mapper + else + emake + emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat + fi +} + +src_install() { + local inst + INSTALL_TARGETS="install install_tmpfiles_configuration" + # install systemd related files only when requested, bug #522430 + use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators" + use device-mapper-only && INSTALL_TARGETS="install_device-mapper" + for inst in ${INSTALL_TARGETS}; do + emake DESTDIR="${D}" ${inst} + done + + newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper + newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper + + if use !device-mapper-only ; then + newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd + newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm + + newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring + newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad + fi + + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd + newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd + fi + + if use static-libs; then + dolib.a libdm/ioctl/libdevmapper.a + dolib.a libdaemon/client/libdaemonclient.a #462908 + #gen_usr_ldscript libdevmapper.so + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + else + rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a + fi + + if use lvm2create_initrd; then + dosbin scripts/lvm2create_initrd/lvm2create_initrd + doman scripts/lvm2create_initrd/lvm2create_initrd.8 + newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd + fi + + insinto /etc + doins "${FILESDIR}"/dmtab + + dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf +} + +pkg_postinst() { + ewarn "Make sure the \"lvm\" init script is in the runlevels:" + ewarn "# rc-update add lvm boot" + ewarn + ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" + ewarn "to enable lvm autoactivation and metadata caching." +} + +src_test() { + einfo "Tests are disabled because of device-node mucking, if you want to" + einfo "run tests, compile the package and see ${S}/tests" +} diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest index 7f8c6527a860..0b1945a6aa27 100644 --- a/sys-kernel/linux-headers/Manifest +++ b/sys-kernel/linux-headers/Manifest @@ -5,11 +5,13 @@ DIST gentoo-headers-3.19-1.tar.xz 3848 SHA256 f66fedf95b99130b3b43dababe40b22695 DIST gentoo-headers-4.0-2.tar.xz 5368 SHA256 ac090b3ced9f1a4b046795402ef919a756570b33f605a8a963af421d5a86af5e SHA512 2c7687c460bba24c8ed6e1df6f55ae79acbdc9f0f5b83074ec062226208fa0384b9660850ebe699bf72eeb8d44716f71115d802858bdf3147fa91c2f85eed85e WHIRLPOOL fcc530b2b973817cd5a16a34e26b1f817b67d622ab6cdcf0398ced6b73a6a626d7d1179b30895e2a33eb044d304fc98ed313e0353cf55fe4d791cd8959b202a8 DIST gentoo-headers-4.1-1.tar.xz 5616 SHA256 c66e0f023fb786ed4c041e0643e7a778bcc868528ee902b0228cf71986d30dbc SHA512 fa1ebc03e5a3a15b25e037d566ace812a451830c0a05454524e6e3021a6a77dd048ae79b85f2d2aeb4cff414f4bfabe93bfb42ec18a3a8a9c80ed7d6b5352832 WHIRLPOOL 93ecfac69c93500c5f2d3734d2a8a260821032a549b119bb554688ddc725b800e2c0c37612c2cc4f217452d0b2887dd1e1d2bb3f0a3774f3395a72a7cf307445 DIST gentoo-headers-4.2-1.tar.xz 5624 SHA256 1ec257e2cb9d79068d563868a08bfd13bdd0f4c053c368d97d7d40c24dece4f9 SHA512 a022f0af952956d330bc05f86868953de86a736395658bbedb91cd7db16401795a6f556978d1c1c5fc584479e00a042c43b90dd0d3f80e8c231fe980dfbfbdfe WHIRLPOOL c957b99005f5f16dafee216ec7afc293acb6cdc963b3f1ddadeeb8e1550afbe0b4188a038e80598fc1f1c67080a3db79aa77ba4c3f19afeb41cd17b8fe4c4dbb +DIST gentoo-headers-4.3-1.tar.xz 6336 SHA256 dbe99afe8b96b181f1b065b4d91969913eb23750c1fdf5c05f86667a314ca726 SHA512 55310299ccf6fc013b26b28df52740188ea68547617141af45a1278d0028c8db47e43e230f08fff399793e420028ed1602438a73bad6f4ffb6f3c43f9f28002d WHIRLPOOL a87198b9f868d913c14a2578c5cd452fd0f041576141fc8089d4a3eef0840929923d95de188fac8a6f1115d588f2a17dd51ddcaae90871131d39458c90afe956 DIST gentoo-headers-base-3.18.tar.xz 3776668 SHA256 12a44590e505525509556f6e973464f124f172565d3a4b29a3ff4627aa24f9a7 SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 WHIRLPOOL 5cdd500aaac3589d6672ea365f5b29ccef207db36cbc34052f0bf1bbe35b5dbfedf3b1675079c1ec05daf1a136d2da3018b2ca91bcaeda1fe8d23e3246fda25e DIST gentoo-headers-base-3.19.tar.xz 3807516 SHA256 e614ab947a7d0bd5064c49aeaac43507a7a322c43fdcca9a0858855137193b1d SHA512 3ba9b5e442e53d82e5af7fced55b173cacc7edc99157eb430dad81f95d48594bc18a8d5f54cd15ba2221bad4098c7732b9ba24780fc0964ea34377933ba36333 WHIRLPOOL 6ca7f201272202e6e2bc1d36c6e62e47d85163546e317fee5e4e31af98722aa6de81c4c0c54635acd4386a515f28376517aa84eec7ae4cd17220fb549e5f51c1 DIST gentoo-headers-base-4.0.tar.xz 3815288 SHA256 96c4ff8acc80fe6c401e0452212cd49fec50c7eccceb5b1e79e9b3a70d309318 SHA512 42e158532181dd225009a4b564cbd1d7ae00485ec4a3d56ab7cd54b6816e171b6a6a9217b9db460ceb701b473a4082f1f4f9cd7a7da6fde2bba5591d95d03fc9 WHIRLPOOL 5a9d29237f1729109dee4b9990efa339b1e953e5663a2774dac17a463d8c7f5934f4a0627a7b46496fa2127e9d9b205f673a1b32c4c77bb5b849078a39a5db5c DIST gentoo-headers-base-4.1.tar.xz 3832284 SHA256 7abef9c950ebbc5da3f11c6b7883f1417ba429cd4d39aa7776c13c50f5c68e83 SHA512 e91ee80d31a0205f8d835931c39b4b4c085e338a3dddaf1fc179ae95a566148ba7b8a28e73e661700b834c7b2ca9b25e0a0645403d13330fd2fd887695898111 WHIRLPOOL 7cfb035b6d4cc330bce89d2025ee927758fcf20addbd8100503ccecd9e3b0be057603da96412cc1cc564698a6ffdf961a4a35f24b1a3bb822c8be1370a0751ae DIST gentoo-headers-base-4.2.tar.xz 3866404 SHA256 b0787b40c865988b2f934f60291c5cb0df861f6eadf747b1efb85add6fafd6cd SHA512 3f75ff4dcfed72f1b2e8c6833a8e84dadbf5085114c9704499a0e75022ebffb12881260567eda01a7f08c729c72c320e6cde165385b7e943d7b3d69d80621b89 WHIRLPOOL 40993e689b37645e92c121fba68546f7c3734ba5eab004ce48236ea487b886c5638f7b7d8a01d7b25669812658e0004f3dd39f6d45bc6359183248e15d82136c +DIST gentoo-headers-base-4.3.tar.xz 3892104 SHA256 5add8ce264a85ced6222060d962c079821bb15b4dc015091425f609fd8db4629 SHA512 fed69490e15b2add489fe55225b98641135d4d7f10b4a8fa716ab039c79e74172168b90a4c3c154bbac14abddbde1dfb901e35527a76c898afba32a2d76b6f48 WHIRLPOOL b1193f24ae4a31c12e5fcddfb62ce73d1434e18048a6ae67dbeb4e0bb6b514c7350faaafe6d9b5ecd4cdd43468ec88e1ba8109da6f1eb83c26a9d1e360bff565 DIST linux-2.4.33.tar.xz 25725956 SHA256 f5e58cc4b85cfc84accb284b9b65eec24ba637d6bacddc734948a8ca3ca75d4b SHA512 cc5b6ba5824471a81b80e973378a706882b10951ff4ff6c888e849fb5efff88cce20d2265ba5c8161605cbf87d1759851f9e4703720dd0ac339ec129985d4b0e WHIRLPOOL 7389d6adbaed5731d4f58fa6e1c3e58c65b326329c91a40ab75d50d8c5dc3c18f04aa90d30ff04bd9db90ed94079cd7efcef600bb4e000595446722bdfbf642d DIST linux-2.4.36.tar.xz 25535188 SHA256 7850a814e5be336214b9e4b68cfcf3d03c8061b4d7b9926aac65b968435fcfbd SHA512 e203ceebf97bd4228bb680ded39d6ebc801dd77eb82bafc63802e548849f5922b5c80462ba7e0564c04d40cc777414c2cefe57d3c0024b811277d6c2dddd38d2 WHIRLPOOL ba1452d09e97a52ff2b9003a46680beba399ac6d77f690c1b19c262903018f7933b8d048106a2cd1a626c1293e4a515651ca2608365f73d14befc8faf45f7090 DIST patch-2.4.33.3.xz 5796 SHA256 89fe1dbf5cb9513b73f9825328765c342f6054186f0b41c08b8612a6a4ad7a90 SHA512 9f6b9118f4888b34b7b20ba0d6c9ffaba547dea0f7cc93019117ad94411d9008e5513367e7da23a19e347f63ef823a493972850edd69b140d528454fa65124c9 WHIRLPOOL 75a06efb368fe5268fc0e6a625a4144dacf0e4ad3d4b6a4128e6e483dd809d294f406d96314b60138365d35397799f3d2c507f3e4eefdce17f7732eac565e55f diff --git a/sys-kernel/linux-headers/linux-headers-4.3.ebuild b/sys-kernel/linux-headers/linux-headers-4.3.ebuild new file mode 100644 index 000000000000..f0e395419fbc --- /dev/null +++ b/sys-kernel/linux-headers/linux-headers-4.3.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="4" + +ETYPE="headers" +H_SUPPORTEDARCH="alpha amd64 arc arm arm64 avr32 bfin cris frv hexagon hppa ia64 m32r m68k metag microblaze mips mn10300 nios2 openrisc ppc ppc64 s390 score sh sparc tile x86 xtensa" +inherit kernel-2 +detect_version + +PATCH_VER="1" +SRC_URI="mirror://gentoo/gentoo-headers-base-${PV}.tar.xz + ${PATCH_VER:+mirror://gentoo/gentoo-headers-${PV}-${PATCH_VER}.tar.xz}" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" + +DEPEND="app-arch/xz-utils + dev-lang/perl" +RDEPEND="!!media-sound/alsa-headers" + +S=${WORKDIR}/gentoo-headers-base-${PV} + +src_unpack() { + unpack ${A} +} + +src_prepare() { + [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PV} +} + +src_install() { + kernel-2_src_install + + # hrm, build system sucks + find "${ED}" '(' -name '.install' -o -name '*.cmd' ')' -delete + find "${ED}" -depth -type d -delete 2>/dev/null +} + +src_test() { + # Make sure no uapi/ include paths are used by accident. + egrep -r \ + -e '# *include.*["<]uapi/' \ + "${D}" && die "#include uapi/xxx detected" + + einfo "Possible unescaped attribute/type usage" + egrep -r \ + -e '(^|[[:space:](])(asm|volatile|inline)[[:space:](]' \ + -e '\<([us](8|16|32|64))\>' \ + . + + einfo "Missing linux/types.h include" + egrep -l -r -e '__[us](8|16|32|64)' "${ED}" | xargs grep -L linux/types.h + + emake ARCH=$(tc-arch-kernel) headers_check +} diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest index 0658f3382a3f..8ca117d19424 100644 --- a/sys-kernel/tuxonice-sources/Manifest +++ b/sys-kernel/tuxonice-sources/Manifest @@ -4,28 +4,42 @@ DIST genpatches-3.10-93.extras.tar.xz 17836 SHA256 d879d631a860c5d88b8c796ee0520 DIST genpatches-3.10-95.base.tar.xz 1284756 SHA256 aef21ca9662ab60728b05f028346cdbc7fc9ed0d07ad7e9c8f5d8d341242859a SHA512 308c97eb8f196e136cbdca5ee22fd9538048b0c7b5b3a75ee465be95f77046bac24fadeb78f4181b58f8c441a220a1d77c95ac281ba2dfcce047274475353a1e WHIRLPOOL dcc971cad6eefb922aa2479f9461817ec881666971bfadeec8f61ea724939a89a3a8379ce2b440f7993eeb40ad369d5fe2be9bc7a1d2ee4a5b842458cb65aa82 DIST genpatches-3.10-95.experimental.tar.xz 60180 SHA256 480f41bd269bfa73cdf1ce325d5723fa1e4c0cdf5fd81f3b39de388d73df4e37 SHA512 3fe8eb14736ba06247f9eee9b17493e4099054f2d9608b80d22b25f7e6e2dbb480bccfd78447ec699f46236cb1ff079aa5b50cdc81ba261174783f06a569d7cb WHIRLPOOL fb94803708fd183c045764bf317a2cb5acbd5e6d28b279d2909b166cd7136b7d126374afe497968e97c3aa76b35310c9e7f1705f1465e17cd9ecd7188fe0ce00 DIST genpatches-3.10-95.extras.tar.xz 17840 SHA256 ad5b28336aabad8e933d7ceffdbfe6c5f420ebaa299f541e41ee17e945cdb082 SHA512 59abf2f8445f4c40b0f29dee7ef5be45ffe18923b6d168506ca6211ed4c2fbb344240305052f253c86d6d48bef1cf5b076e676192158b7bf05b98590cc4ea80a WHIRLPOOL d6c34e0eb46c66400337c96bf015f321867265055337ac7f9cb32b5777df3807ad5adc219bc621a8f5d30c16c5695da83869796fbb934020aa5f6dedac6f638d +DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c0353333035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359 +DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306 +DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975f1670c385a21cfa41226454ea4b4f03036c SHA512 240549a6ea1d6f119a563de6676628d8c0a3207f7be685a8a7903a04d0bfce639d02858896b4dda95cf0fba48bb22d0feadbc176c5f00bbaebdd5edc68c0b87c WHIRLPOOL 19ff955983a322086feaeeecb3c664f13b6ee1faaecb6745bbff0e6f2acb1937ea7212cd23869146e0a5c59ca83370a61437b691fc5ba8224d2d2cc69cb70a39 DIST genpatches-3.12-44.base.tar.xz 1444756 SHA256 b7ee32a2439bfa7318b1b42ceb2590098a061fe0eff563ad84126a3f672699f8 SHA512 74c929166b1399b80e3b00ee7573f8808c9abdf401b9c9d2a20565f82ac70e176d05dfb2127a2baab87a244f9783603defb6f19a2ec36c9aeab109456c5d3a97 WHIRLPOOL 58924c96b06194c90f09cad60221488e28b74977ed2713d6e29736102a8e90f70e6c3f29094317c66d2f08a077c1b7c5d109dac195b79cdfcc220042e04b5021 DIST genpatches-3.12-44.experimental.tar.xz 46524 SHA256 58ecdc367450ffd0b6e7efecf0d98e292916fa92db079c46c27308e4b76f8e83 SHA512 61611fec8d4b9b25c7f9538f29d332b550ac47c708beb3083459c1b519d8198fa40091fccee529c1819dea3186104006264ca34ba2d9cd755302ea4394a0ebd6 WHIRLPOOL 19eac3c35333dfd33fa26b15ab8904ae116dae37e15ad43cb5be635ab77f929fac614365804d30655188e53b3899565985e358fccf8211406650876fc7257541 DIST genpatches-3.12-44.extras.tar.xz 18232 SHA256 b1007266063f8a9d2e15877a440cf32b023d24f0db7dbf6cd4283e57363fd717 SHA512 bb62811238a0e43f46871f76d32ec28eb9aed6b47d3a72dd4efdf16b81a7bf350dd5b2965e71cac224d222a1a5e55eb46cd66e3f9de91d90d92f43235be99eca WHIRLPOOL 21e9c4c9c023d4cf2aa56245df600a6ba173a8ca842a1f8eb3e9a08b285fbe3a8fc315c04556c2cebbf6ebba09d6144e9e6239b6c32848199d8785263da26d6f DIST genpatches-3.12-45.base.tar.xz 1453664 SHA256 ec4d9bcce9b1210e68a0bb24af280eb1e969e8b0179138647fcbdf44a3572fab SHA512 a18cbd4359fb410b10ec3bf579ff77f931f6f86b1d29d7be61204ef0984d34870810942ff395456578efba76d73ab8416d51e7eb2edf3ced4be5a00d8a4967ab WHIRLPOOL c3795f46cee61c54f46a66b7e3dd1d1232035ad6d745f19598bfa4a69aef297b89b11bd7d845fa75247bcc723d7f52d5501a3281c95c8a4b80dee6104b72dd61 DIST genpatches-3.12-45.experimental.tar.xz 46536 SHA256 10a2fad4f699cfed49f8a5e3b0e5685a12328ffe06cd90c97fdf92d7bf7f33a3 SHA512 6dd0e76110fcdd50e48c85f6e777ffc63a55a434be59c92c33318fe331a4f04561c9e526dd015bae84ab5b5df0101389e764b3f77b164a59b8b46f22fa2a3ae9 WHIRLPOOL 59f60478fea7af16e373cc3e4166391d97cd1c5198d736844f5f692fea8c4456f87db1b37475508b1aa185bafbe08b9b685bc8235c8439eef488c49525af8316 DIST genpatches-3.12-45.extras.tar.xz 18244 SHA256 976054b5555a797b073b302e723ed6823b0e35b354d469dd7516f312d290f98a SHA512 77da50d1f74455ce5c38d5eeabb54dc9de936b3cdfd9dc3666f93cdcbfb546b32ad1dbcc0798c08c538389997182f87afa8d009ab26c6872a4c32a4d5b76a734 WHIRLPOOL 38eccba1cdee6da7ee00f332d740c0046f4cefe3d629e15f13acf4b3740ccbfe8c52029df2d1286e4510ba9f459dc738a75877b73b40b0b98d13d607295325fc +DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29 +DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f +DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405 DIST genpatches-3.14-58.base.tar.xz 1049500 SHA256 e39936f18642b1ff5ae8aea779176c85aa744594f92ba1c02a371364c769ca11 SHA512 1061a233ba42ec880de32099c0a94b772f57cbe5b26ff162ca89be62271ba56b340d20f35143df9a546f93deaf2b5cc6491bd3fa078ec4f1ddff90d49e71cab4 WHIRLPOOL 9b65cac5d4341419a8ee4058a14199e5f2cd58018be13e42f5f885cea7d12342c77281458287fd61176bb258617d1cd5222d9ac9d6cb906a125a723bf7de185c DIST genpatches-3.14-58.experimental.tar.xz 60308 SHA256 8ba27a67947f2c67a1552b036bffba7edd6c5fd7f9aa8807ef28268426696fd3 SHA512 cf1c273dd41c3a7351cbb6c7b3f7026b9bd890b48e92f6ebfa4b455a2321ba8de8221bb091e70107bc3de82e039240ef21c7a49ddfb1c3aa1ee3395ad057b92d WHIRLPOOL 220a59400138e8c56f7a25d6ea3f39ee9123de3adfdae74fb0847e53cfaca3e3c9137025c31faaf3c39bf6d4ea37c5b939d81ec6e98376083460a39c530b0157 DIST genpatches-3.14-58.extras.tar.xz 18252 SHA256 de10705e4f7f9035bdee22b320dc2c988f8700e222d63a78b34336eed5e533b2 SHA512 df1bda02acc817f5bd2c5e812b25180117dda66180fc0c57b217158850d24fd959d1578042417caf11eeffe3a1ed4108061c53a1113867d3bd6c5dc310fe0f90 WHIRLPOOL bfdf157b050d511abf0b478f0478658e0d20137cfead706a0c8c71ee9ea0332b1f034532cf6445910ce43cec520c96d6f6ea76ed003b4d6a8df50850e56a7397 DIST genpatches-3.14-60.base.tar.xz 1080052 SHA256 a1983df5b2064e3dd6f6bf020ea1b2c107e806dfe354d29fecba4382b437c2bb SHA512 b56dadfff7dc2d1191fbad0c16d8e91206d55470bc241a99ce5c11c7b5f713f0c6f33871464f693385e97726a689935ef271ac771244baec9a517a61507830ea WHIRLPOOL 90d73ae372375cf4f2caf0064d4f60700dfbb70e7a34e435018b2fac8c865e8f428206d9a01acb7bb6c544482bb28371e00b1146535ba3bf44117ed333fe217b DIST genpatches-3.14-60.experimental.tar.xz 60280 SHA256 a8b2b6de84dc66028fb4195164d8a5086ab4e0201419a2b7bc9b591792013f08 SHA512 15329d3945d7721b8289b9fe4e3f04dc6446ca53b44c1332b7be3018dd1d8ea4e509198a9ff568d8c61c0d1b9b748323e6111086e4b881273b5186747b9cba04 WHIRLPOOL 0e46224baee6b1997090988034ba75cdd4be9be8121a196ed39a8d15ad1fd27ecf027af8abc22fb98f84da5279f9392adb9e24c6890db151ba8015bd7916e399 DIST genpatches-3.14-60.extras.tar.xz 18256 SHA256 98f631421c5faa472fd4f9054d173ca94dd57dde04c282dee6250d6f28f2514d SHA512 89aae299eab84e795fef89805f1dec933aa3931d185af24acab9ccb4e83a89b6c74302f94fc68caa85bb6e4eb614b582d0f253ecb6f4c687b5be49fb74a81162 WHIRLPOOL 311149588a2d807b4284402f06901c8e13f6f84437bc62650a88d959b17ff9bf9e67756e634e74b2877899d2ae225312de2f635a17a958e409bd690c170ad1c0 +DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593 +DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842 +DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e DIST genpatches-3.18-21.base.tar.xz 632956 SHA256 f657997b05dc52e215c22fde16cb227895d072ac2716d25481654849a9e373f1 SHA512 f1dac401caf1cd6282fc47670ad9e3540855542d7eee77f27231bdb9679d3da07b7b09f675ce5998aa777024817546ba8747c7d75aa45cbeb2789dbabf5c5602 WHIRLPOOL 26d19e9302ffd72123c897f7012ae6d81cbab7a7d1b498d10b6aef27fd5e7f4d466fb510c6e72ef3c5f855eb9c88e80f8adbf436e80d52dcbcf1ac1f3e1bf684 DIST genpatches-3.18-21.experimental.tar.xz 61600 SHA256 ebee995e505d68dcf95f39986b73185b353cc64627b048f230e755195a910094 SHA512 d7866e7948e8d6c83a452f99ca50ed06951f68b7552d9dc182c5686d43abe3dc76e3773c8325a87b65e8bf1fa4c09db75fc1af27b7837bb60918e82273cc17e4 WHIRLPOOL 01f897a369a036624364de57b1ea213b8bbe1b1e9bea792e45e0e5b921c3cff0a88174c3284359466059e3dc3793a51ea92a1aa4a5c7b0dd79d98e99693ccd80 DIST genpatches-3.18-21.extras.tar.xz 16192 SHA256 76e21081cdcb3c1b38632ec5375b456287ed572c1a3cb64cc036471a4ae4f726 SHA512 c1e98a5d2350b07a5d939863386027765c8820e32a45a9c68201beb6de811aadcd32c82ef8ef0627290f6fef7ad5751418b2aa7ab4e2d8f3e5b6683e40fbc80a WHIRLPOOL b39979d760f0695fb2632bf7fbed16070e24efa03992c0575bbd13185ab33f0e2d05e35071e9f352f0eaa83e15015550229c33df2294beebe2ef6d24fa2b755e DIST genpatches-3.18-22.base.tar.xz 651380 SHA256 9c866ac44e0c716a5292c3ec907fc52edfce1a32d75cbc63e51f2adbd10067d0 SHA512 d1183150a2ee641714dc85c873713936d862688d4314a6906a25943bbfb34566fe5d0e838d61eba2fc369a657aa762f6276a2a31a5c4e2e9429db4330a0fa03a WHIRLPOOL 22d358be0bfd836ded82b5fc347f5bc266186ee0374120f2def7e6d8c4e87c43ab364eb64c6b141ee8d0705912ebc12f5525694c7d6fcbc9da38c0012ed09da2 DIST genpatches-3.18-22.experimental.tar.xz 61604 SHA256 a216f6a678d83ca91283adddaef52face5980718cc7eae9d8764f782422771c8 SHA512 aa2819419490a7ea0ac06179c07a2139e671877b4a5109c019c8931f21069e4d313c75279b679a76ead8381bc1f709a77b8eb19da27f3d5e8d4d4fb97a0ae5c3 WHIRLPOOL fb4364fc476edac40019c1215c5ba94e29ffd003aae37cb8bb642008e2f0a853ec174c4495699a2c7984dd190d895aeab17cae3ab6c6045ff497c07716a46939 DIST genpatches-3.18-22.extras.tar.xz 16196 SHA256 deeab880c0705b9a02492e2e73152614b7c7dd9f213303fd5284ee07debf0416 SHA512 5ba6d42c5973daa52a54bc77f3f13312d9c6f496e002ab2ad613a08f18ee64dad39472ec0cdb0e545b2c95aee0d69fd30c38877d15f266768a22fabb8a06e2a3 WHIRLPOOL 84092c11122198958498e26d3c4fccbf06451ff9c880510f763968644d03c30160f01090c2bc5b411cb813715083682b90b750401ffd7c8f011ae24f203e90c0 +DIST genpatches-3.18-23.base.tar.xz 723664 SHA256 e2b851168cb14811a7cbbdf7cf6c6285948353729ff8a6d5d243607fcc0eff8a SHA512 7cf09b223927d656d19466bcfe2f4284301a409b0b680f21f2e949ba973706b5042eaa65378e1034ac1377cd887af5330dcb210262907bcb725d6601c61264cf WHIRLPOOL 4ed8f9c163f3cea84e7923066ea7002710980250362e18e231f0421872b212d7777a6d1f1273945784b0d720182044b842478b939af20f137e0bb9e26fff91d0 +DIST genpatches-3.18-23.experimental.tar.xz 61600 SHA256 f6335db1e0d3a35489ba7632669c47548414389d28fb25838457cea30375c430 SHA512 20b2fa1bd461fb1b7de7c7faa85533d2baa4681ae8a5144fcd9d8ccc34fe6643b491d9f419d4d4d25a5f81398d03af5cfbcce33e7ed18a185072ba11a39f3ebd WHIRLPOOL 62c73dd6833ab3cfd7c0999c68d910340c2652705f6cf075ada82a2db5efb37132255068833454d38bb91472e5ed06bb35ec945fa433ef6ac6f714da45073d75 +DIST genpatches-3.18-23.extras.tar.xz 16200 SHA256 c055d6c67161b7497cd6fb98d6143676efa506a06fd7d77c7db527f648cdbb29 SHA512 898c991f77e578ee4d8280038d65f446a309e154d26410741f4f6d6935e4c5c294d0befa4a627b248c109273725c5ca4a489ede6a8eae4c567a7725589fe6f20 WHIRLPOOL 47754319b9a2179c1ddec78647ab13b5ad862b7677a028fc307205d1c3c29d291da322c465d053938019f72efcd25311d5762fe55769ea87318de330a84a5a58 DIST genpatches-3.4-91.base.tar.xz 1363016 SHA256 14bf3a56d4444ae5a9c307c2bbf2cccda44b5bb8f7c460ef9711b858bc8475b0 SHA512 f28f86bb302313b13c2de08d227e0bd0ca93ab5dd2071b6c0797c9b7e29f84b7abe2266c93bba15789a51d6d77c70b749105b5d4a1f7053b041ebd9eb5a80df5 WHIRLPOOL 8535d191d5482773a6d9aa8d45a6b8614b3ba936fc043e7ae5d52ee676ff89a65457c531bb14ce2ea447cb26083efc50c6748c04412b7d6b1a1c76d1d52a2ed6 DIST genpatches-3.4-91.extras.tar.xz 18236 SHA256 34a52d49b677ca2f528e47e08af64bf4b9e8b036710806ebc31ba31bd612dd1e SHA512 04571d1f872a7dae516c8d20c99639039393f23f961650e4ed63d7cab72ca99b227bc0aafb82143c69890fb084fb51bb28367ad9b59a64c79702078fff9bd208 WHIRLPOOL e70a665250cd5999f3b4906fc8ea8637ef703441aa6e51a06771f0cd906a16b83181bb317375fc3c604676bbf490336a6969e8748a81d4c5628107bbc38439af DIST genpatches-3.4-92.base.tar.xz 1396616 SHA256 690030c86258fa1111aac6d1dbc011023537e4becee793d4351307d965290612 SHA512 af321be89ca243ed5920c12482afc7ed0b7e694b4154a2f83b4f35a432dda90fb5b1fc2bae91b99861d56c70cccd2bfb304b7b52e99b94a4bf3b87dd0980d53b WHIRLPOOL 180749b1314707344c0db11edc0a57640741d1f610145b863bd0ded5f2bfb165b2bd454623899c146fe45927a12bf4e9a6c6c1e6323920c7721d42e791e9a284 DIST genpatches-3.4-92.extras.tar.xz 18240 SHA256 db4f7be2ce243c490895d551506486b7d56407c9f55fc2930202f0601d48317b SHA512 8ed85c0a62d0d7f13256dd959ac029d5dfbd2bb25911bced52e23e0d5b8fca196c305efc7cfe31cb4c39dd99040e05064aa9456a6c97b00692efe489aa93f698 WHIRLPOOL 76d9a84c6dc7e6188a8aa92defe05db81a362b6a15e525e249b16a610b688089e4f84c81ed82fb88757cc162b5f7ddf6b5dbb193e50fd09f28e4d0fa0af42cdf +DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f +DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee DIST genpatches-4.0-11.experimental.tar.xz 61632 SHA256 cedb08c7d68cf62038aa6f8db3999a7d6daf434a08d0c811308affd5d18667d4 SHA512 cfe5281678acc938ba0c906ef58a654889a71da5238fbff13e5e78f328dc07485345deea6080abf1380a8a3ec5314691b8f5a35ae0cf627e6ebb38ba66860e38 WHIRLPOOL 5bfd4de5098fe5cd05bc7184a5797f9b310a848b2d96e04b83986f45d3961abaf6cfb76b801b9031c0b46c2c072578b59b98781c8c432b7ec0989449f8098a04 DIST genpatches-4.0-11.extras.tar.xz 16288 SHA256 84b7509ecc82f7ff1b90959b88e9e0ad77544610d5a95aacfb88b7200b9aced1 SHA512 95354b1a2dce8d93a50cc1e1e79ea807134eb050c7a76921ada26f5bfa210963a16c9af7bda0b75894201a1e82929859f6dfa5c23cf63fe4586e4264eef85c7f WHIRLPOOL 4ebc929d8e39c0967b99d558f68e5454e6ffc771273b7e9637d8d0ba477c67ee490e0a443a8aa4fdcc74f3aab59cf8e9c159f2a3b152b33fb9a8f395a67b0085 @@ -35,12 +49,21 @@ DIST genpatches-4.1-11.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd +DIST genpatches-4.1-16.base.tar.xz 390916 SHA256 c36edc8f56a26e0ae74fa28e9a50d02d8196f5d29447d6d2cdbf17ad71f70902 SHA512 981c4589a2f448a8c58276590eae9db25e716e0df584f4e431e7d29e69714695078112e30b84179038879071dcb94adb0753a94bcc3cf3e4c3a676244543f0aa WHIRLPOOL 6f3bf0ec325a1d7363315fd7828da31901916c497cbb8adb212e515ee7fae1179f276116f9e484fb23f2200e2fa61ad315baa8de1c073c5412dd1ff3ce624cf9 +DIST genpatches-4.1-16.experimental.tar.xz 215996 SHA256 0840ccdcad7c4b03cd4fd54940e3ca31d0d738184abe1c9340d5d0f9c3943009 SHA512 95b8bc22413b24627ac1906830a345689c7e98a77beb1405e9a6c5b97f48c4fa7dbd15a2ffe66f24ef9dd8617a83a4913a26acbcb387f4a0add6d5f37c3343a9 WHIRLPOOL b19fbda05c354c17df10a8fe3e482798926e6631c5b5f96685e2d99cc016f10c37fbe5aef633c8a77bc427d045b02390815469f5aa2850dd76d5cb374a916cc0 +DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 DIST genpatches-4.2-2.base.tar.xz 4384 SHA256 f38d37d15378eecca3e1d74d7dca66ba2200d66e87b7f5a68f716cbb61faf5f1 SHA512 9c754e1bf9cc39635f98a9ac5656c030612d72e0f4d4680b6f619a176e660e3c90594fbe0d9759abb5c9402e4649bd1fcd3e3f55b7d132d1b3d0277e17c65ffc WHIRLPOOL 05df0d6ed05927ee2f6f7b86091f9c10cc932250ecbd12064a46a590943d6d4d0dee4e57d3ba07a4f75fc939f6f14feee5177447bed63349f1b9ef8f109617d6 DIST genpatches-4.2-2.experimental.tar.xz 161712 SHA256 760c2851a96a385298edc817e873a51ec46edb63e9a6a1361912c5f28fb0a371 SHA512 0b1fa56cb667f0c073ea622aa195ac7784c6ace7a0f1fe09a402e8dc9e11a5cc737a2695eaa41e409972beb6ad71353be87b5f2e771bb464e026a20ea3103c95 WHIRLPOOL 468bd993e750ceafe0115ac9a06d49f9f97add5c9bd11e3343b2319bc8bbf9f0cf988b6afcbeab0bf3f00299405b44347d46c2a4e35869eb03ae951a9a967743 DIST genpatches-4.2-2.extras.tar.xz 16168 SHA256 be4078adaac6d679a563709dc7528b92587a463877c28d7c49117b5ddd842fe1 SHA512 9a561564511e3a15648f88f1b230e8985e33b3dac92a082cd8d4a5ccf0da8f8eb030fde59f6a0c5664c478751f710e2f2f8f3cf4b13293329444ed702c70732c WHIRLPOOL 46a021f1801aae12167bfb5378ee62cb058a13b18d48c006b9e7fc4a086803c8c509070cee059c5eb817abec317285f7e1157f6f286ed53a4ce7ad761c7d2e36 DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378 DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd +DIST genpatches-4.2-8.base.tar.xz 191276 SHA256 395dc09c285606e830be9b002eec8968394ec2ac67eaec6673c0703196e708d8 SHA512 216d8c9be1c3ed1fcc612e3739bf7186e996b6fca8ce3d08be4ea9da16f7d4f63a01d6e8606a83d2743f94ffe1640da9f2c1d588fddab51e0f25b090141a353d WHIRLPOOL fdb58098517642e5ec075218b612f765b559b6c850bfd678d3eb7fb0479bd175c6eb01896e552525eb6025a93e72ce204fa57c77f96a028ac0f93bc0c59d13c0 +DIST genpatches-4.2-8.experimental.tar.xz 216032 SHA256 53f431427f4deb72e5495159f8f56902a5470b0f230ab549cd6a21380d757ffd SHA512 3c8233427efa0c181ddc8044d7d5ce3ad914b7df84381af8816b75545d8512777c786710422dfb1006277dd0e5fd69a18404e2d83cd361431853e3f900906db1 WHIRLPOOL eaa9d7697a391f90bcd04293545adbc21cff4c5ae82ee96e00c2cae12720ea9d9679c75988bf24f2eb9ca4f7e9aaa2bee36d3f7208edaa84fc1236a55b418bc9 +DIST genpatches-4.2-8.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be51104657f0acfea1d17b5c7a1e9fd800bd62ee SHA512 0ec02e89fef967286851d8cc0bd8c6d908d0b72c79ef55da30747cc151878340c3c882f9e1067edff3476851f136032674180e58cbc46a6a48d9f501c28c4f56 WHIRLPOOL 0aa25106c9346d8ec2eb3ff56b315312a07363e36039efcce7d52b2e73eebf4c6ffba65dac45ee49a3b6b0ffab05ed42905a86f3e7ead3d6be7bd998e5dbf8b6 +DIST genpatches-4.3-1.base.tar.xz 3464 SHA256 7a4fa6450f306844cbe767c69e0f26cd9363803840e5147c27bc78fa1b20d739 SHA512 a37d673a6daf0956cd5a9284c1772112b726187b2e83293cf1c41b64988eeb3ed27be41394fa18b9ce2dc2c2f07a974f39d74a0d9de406d76d5c8e960bafbe94 WHIRLPOOL 95289c547af7c6ef0c2bf2af323782044c45191b1055e032aeff2652ee2d51779abcb2caea23634dbeaf375397ca4b9ec6b4bb11e3074cac37787b047db0e958 +DIST genpatches-4.3-1.experimental.tar.xz 4904 SHA256 e36a9856c8bef942c21f8211a23b54522cd270e98e7bb3facdd562f19e579a0a SHA512 1690d38ebdd12d9593931b6fe7467cfb3cbe160a65c955fa82fccce2a9f57b6818efb39ef01ce97274aa6c8d0596c2d651f293b67abba5556fba7c7495658cd1 WHIRLPOOL 42414daeecba5d9cbc1fe46a3e438c3ef82ebae317a38c9d8b78ad723376550dbf3b83b102a9a0f7f893ed624a62bfeb80a49566bf13803805ae3dd3050e5afe +DIST genpatches-4.3-1.extras.tar.xz 16288 SHA256 41cf40be254f6204a0dcfbb0051309bf506a9306e6c637058fc23dbecbe37c00 SHA512 6cedca7ab7e3971751077dbebb84d6cdd711600db7ea19a6e110ebc71a6281dc9db3d195b6f4e553bafd74d3dd1a252308c85e13de76879e3b6becd1b64ad2ff WHIRLPOOL 129068f0912b07e64b8087e90a4f8758673f89f61d9d6ff69962168ad183efe27f9a657bcac85e44db62ee690b86eadc131282200e9d657b47402b3bbc95b96b DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41 @@ -49,18 +72,27 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8 DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0 +DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935 DIST tuxonice-for-linux-3.10.87-2015-08-22.patch.bz2 129349 SHA256 29ba679672289dde0e918a3c24241a955a88f786ccfae045753683eaa9121f65 SHA512 b5fec2d22d510afd943e96fbb3221658894223a8891b2ad8776babce3cd8f4ccc7294892189322cd7ed476e5b76c4301ab3ab9376b1a85c34c1bacf1ac64b7a2 WHIRLPOOL bf9a1b9b675733b49b372077b5cfcc8cd62b56817aa10754ce4778f163a14ff1bfd40b32cbf9a3b9389eed793021906d48ef4261e138f5c088b19b0fb4ce8e50 DIST tuxonice-for-linux-3.10.90-2015-10-02.patch.bz2 129346 SHA256 6f3906febc2ef223070b8eae846f4c5384b0767c41bb92a00060956675332c0e SHA512 70c29e472f2e623f29fd6c4de29adcc3be7b2be5f2384e6dff87a36de3afd6442af63b10b65e07ef5985c34694da175410168f731b4dd476bc889a19559216d1 WHIRLPOOL 26b2adc733aa3ad64c3d342e55054a0ca1a70a54fe43ea4c6b3408467e40b5d5b85fef683198e1370f06fdfc925eec3fcaaeb878f8056cbd487ca0b3a53b81f6 +DIST tuxonice-for-linux-3.10.92-2015-10-30.patch.bz2 129326 SHA256 0a6bcbfdd95c9cd00edf6dc3a8e6c90f23d609c9bdb848b9ec82b537cf04e72d SHA512 2262eeefcead10a174611aca9be6357336c282fd382832414c8a3bf22597aca68ebf4e954642e76f0fad512ca39bf411ec1889301586110058fa4ce921dc687f WHIRLPOOL 6fd77b95bd5584a354f0499e0048ee1657056cbaf906a08c2a96baa016d49f5c1734fd12621b0d54a75dcb6332554c6b88830e1feca61135330cf94c58a236b3 DIST tuxonice-for-linux-3.12.47-2015-09-08.patch.bz2 129322 SHA256 2a837a1b4e5746a0bd553f5ca9a866fd771bcf5dbb4a3693b63d2188d072162d SHA512 136a0eb836b9c6aa169f8d760937d197852401c0dd77e48390cc35ce2a5b09710fc4d49c34edad909d6d50d698f2392db974b448a6adec5754c389338209570d WHIRLPOOL 6965b9aafbf15c2167d17aaba2a1baa4b636123889318161d40927202fa006518ac647e590d4ab115356b1d8db471668a2dcfa39f3e0a0eb7eede4b02949d104 DIST tuxonice-for-linux-3.12.48-2015-09-23.patch.bz2 129322 SHA256 2a837a1b4e5746a0bd553f5ca9a866fd771bcf5dbb4a3693b63d2188d072162d SHA512 136a0eb836b9c6aa169f8d760937d197852401c0dd77e48390cc35ce2a5b09710fc4d49c34edad909d6d50d698f2392db974b448a6adec5754c389338209570d WHIRLPOOL 6965b9aafbf15c2167d17aaba2a1baa4b636123889318161d40927202fa006518ac647e590d4ab115356b1d8db471668a2dcfa39f3e0a0eb7eede4b02949d104 +DIST tuxonice-for-linux-3.12.49-2015-10-10.patch.bz2 129255 SHA256 d4a87a3f83fd0c6d6e9bff6cc776aa4a306ffa3d44046244b78aebf312402c4e SHA512 54e726c12e0dbd2ab39a2c8197924041457718d92121ef720a8e7917ee5f16b9a4337ef5f09ab8cfb9a9e0cbc260f2bdc00af85ee7f89b67ec32404ea7f2445e WHIRLPOOL a4d9697f97e4ff32d37f22283f6fa9e4115f458f09c05232caae06eaa0ac1166a8fb3d056c8bd151480b598945afeebf897d9b8f3097e0bb0f704dc9f34338e8 DIST tuxonice-for-linux-3.14.51-2015-08-22.patch.bz2 129508 SHA256 c2aa93c31b914b12fa4d624191a524c9b4b80672868b53d8b16f7590066ebd96 SHA512 73537ada4d02f171d309788ef89b5e58f90b7b93e52cfdc196b3c3213c57cf3703e72aa43998eeac8746aa3d232fe61a0ca25f82d2d635ab209d423b37caf240 WHIRLPOOL f5433114ba02cd2af58628d831cd5e3e62f56abe50c2149fb46268377329b569413e9e17ab296dcd6396043114bc19b45735722093b2ddc90906abbbab095ce2 DIST tuxonice-for-linux-3.14.54-2015-10-02.patch.bz2 129475 SHA256 dafa74c9bfc0d6755f1911929f219c3e290109b3403070ce7174d810c676b414 SHA512 302b6ce76f8c0078ae5f87d0e1274121af557f5b6e331f248d14575e021ff719baf98044d4605edd8268948312b9cd2c8c360466d8f7cdb51f8be2c403bb9d74 WHIRLPOOL 4b7532cf2c6109ddd4065d16b83cbc5c4933d5d93330c89bae0e547ac48b03182d5998e1702e94c4d91fc60e1d3130d126f2587e1b22f0ce39eeb1489ff47ad2 +DIST tuxonice-for-linux-3.14.56-2015-10-30.patch.bz2 129506 SHA256 23982d9b8b86efb2a7872de2ce42f64d1246964aa8f22e85e9931982489c1bf5 SHA512 a6144f2bdaa1f7571a43eb80866b9cc5538153e697d55b76579a6105036366d5bfa2ff89684d06be1ba15900197915569adb3a9a4617ebf951b8e6bcc7d93a28 WHIRLPOOL a1d04ea3d7f3dfa0ea45c14da1abb479f62bcbe65d7cbd561fb2505a50279d91e3ea2bc15eef205f8f0d2bb1bccc332574c29f1d1affc0c35657186659676a04 DIST tuxonice-for-linux-3.18.21-2015-09-08.patch.bz2 127760 SHA256 4234da16ed5861234859311d7b668749e16fa3131ac5059aa7c34194c7d60f55 SHA512 bb7a8ca5d9fb9f652c22c69009c7b9861df9f5ee2a254cbdc7c0e077ece16e93220b46625dc6671eb7d865ecf4292e2b23fdd0c291db96cefcc71c7add99eec9 WHIRLPOOL 61a7c1bc42a29b5398df72b498a97a7149b9fe882f2a0ce38dae9e91a16e8c45e9f851cc124d6682417a1f699ebcccebd9cf646a6bbbacaad283c47c627ec329 DIST tuxonice-for-linux-3.18.22-2015-10-10.patch.bz2 127674 SHA256 83c12cbb770e8a10b35e1b003a061a8bf2b407b82e523fe45406f4876592c897 SHA512 23fa6d07e0e28fe30284e98950c57cbad42900f22bf84eea52860202218ef6629f192ab6e66517f9d9d0aa3223c164a49ba54d12ded7b15e460d44b2e324a9ac WHIRLPOOL 6bf452057971eae52660aa01ea9ab3ffdd1bd148d4452d394ce3c2ad42392463bdbf210f453601f1de3520028316d84063bebec13f6e9520f2378ff9b71d1ac3 +DIST tuxonice-for-linux-3.18.23-2015-10-30.patch.bz2 127492 SHA256 d213ebe58d2119dcda6e12bb0af6c83a67e96b31ee642e774e8f413e5f725124 SHA512 2da98ae2ed51d4ca1a998c1ad7acd08a9baaf0b5600149c8e231ece0c28be708b6719d77776cb095922729aad2eff5b4d4246d9946bf857ee1c15ada13900a75 WHIRLPOOL 3261c5e7901a32e5af3295f2b729d69f3d20057663a0c3af37a03b603ae1461e9bf4765730db9be3346b18c73d7e224dae6f3a92f7361dca30839256357e5a35 DIST tuxonice-for-linux-3.4.107-2015-04-18.patch.bz2 131546 SHA256 c2802f72c7cce5b6811b4476b8135a8e9aa7c715c3807b2c60f92cc84c661caf SHA512 4f4da36b697db267e8153e4336f0458aea9093f20eee8e809a61f2addaba3b9707c73ed6656ad54cbac006bfb08d64f5cd9eb0e2fb9990b00e126e7af15c8178 WHIRLPOOL a4c05d1325a1326273506b07721ec8b7618db17e5fbe5c23353fee922714889a92a19063727ec308e1b63ba6b7912a2ee9b80a9a30cdf837090dc18c4a366adf DIST tuxonice-for-linux-3.4.109-2015-09-23.patch.bz2 131542 SHA256 79321295f40b3e635e53c200e6c4c4cad40250df13c48fb68cab95e150295c02 SHA512 3a66a3e97f3324d51ea6285b6fcfdcdf621818457c6e38dadaca13ab7a3e95ddacf1a1deda784ae3a9dfd967fa85848c223b0c8e0d059756058bc27e6b9b75e6 WHIRLPOOL f13808f5898339762faff722488656bf994d68e29a4cf0640072cc94f5385df4b7b310615caa78aa5bd23507a7a2eeddf5cd2790dd12112f4624eb1f79500ad9 +DIST tuxonice-for-linux-3.4.110-2015-10-30.patch.bz2 131521 SHA256 560c01b65d68b9679111f83e6de40878594c323de09a6c3d86b4d57b3cd07d8a SHA512 7245467dea585fcd3c0d44c60202e15c038e4e7d17e37efa0decf7db92bdc385568ba50fc70c85bdf6f97ef3346fed3fc49e7edf25773713fdd239e618ef159b WHIRLPOOL 00f387c6e3f01c3d89ae5eaf2d3d49914a9cb30f07c1845bebb8b6883aa74e3f0dca0626c84f6233cdc2b05fbcbaac4158319c21d67d85d7dfd9132e106a70db DIST tuxonice-for-linux-4.0.9-2015-07-23.patch.bz2 133980 SHA256 f1063b01027317d95cfb7ea91f8ea0bdc1754ccd65d0cdcdb30b92abd201a5df SHA512 79c11bbb2a50e07042ea31759468ad9d60dd807e7cb54796d51da8c258966ec289c703b81563b4a652f2da7f5645ae42f77867a43fe6b3d56ff8b0f7b3974191 WHIRLPOOL 86fe1993ba447fdd8a4bca148bb8080ce46aa6fa7ca6d1ca2b0899a193638dbe983381462637df80d3c7bce52a027c0462d1d13cdac9bbec9c9c46e9e4aa5128 +DIST tuxonice-for-linux-4.1.12-2015-10-30.patch.bz2 133960 SHA256 0562b40fd3b154c4046398a6c095d5dc804357f115d7a02d3adbdbca93452899 SHA512 35d4f53bd4614ce08098d1246df963b564725d3b2390a5b2474ba855f0f263306a4d857c90c9f986d15966eb2e57609215bf7d3f8f5c35cf04b6c2636dd2454a WHIRLPOOL 96014dd874a87afdc1fe88f49bdc13ac77a96bf50f3bee8011924c7aa2fadd5eb38ec278fa75d4e24ff058cb34959a904a1fb9785c935f3cbfb74c2b2a2154ff DIST tuxonice-for-linux-4.1.6-2015-08-22.patch.bz2 133792 SHA256 4720c29dff3e8a3ab086ce4b66219aacc72ef291c82cf50571d2a73750e4a565 SHA512 a1bb71712e38988ae7ed72fc8b52d72fd9e2ca9896ca47de6f5b269b8e6d237404192b1b5190536c861c28ce440a96376c4aad9b90f8c889b1e2c4ee8161073d WHIRLPOOL 9f31ca35fa1ec857a244ebbe73ae33df0a9de65500c276b45b7eb7108cf82243182016946399069eaac2c0663f27292042cc214ff16ccad8d1dfa932c8bfc63b DIST tuxonice-for-linux-4.1.9-2015-10-02.patch.bz2 134173 SHA256 1610210f37253848bc9d50658bf862cdca6f081e9bf7f146ceb731e863f72dd8 SHA512 4616de7fca26d6f20dcc0ef1233272a45a824707e6de8ecad64f01ed73ad9219ef80d0aa26fd197c0c48e080e53a357db999b5ced6ac03c7e8bc16dc2ee09d76 WHIRLPOOL 509018ac1435b18d2043c6000ec131e16f9129d980c8623ec98645398821eca3b86ccb8639cbdbcdb64b8b5084ec0bc4a2f9fbd9432e01a524f66fd8bce491ca DIST tuxonice-for-linux-4.2.0-2015-09-08.patch.bz2 133600 SHA256 e7dc8e56fc7efa8eafbed18d37f406bdb9a6a9201ca06bf5f46a94db605dae14 SHA512 b76aa697211591d364ab463d3e06cf30c5496e5f849e5fa63b5d49d0676100ffb3bd54b3c76ce925232cd0a737bce31db50d59bd4d45bdaa4ef41fdb5d9716b8 WHIRLPOOL b165787d221015a09e0fecbab54f8d45ccefdd439af492175a6d77e6f4d45239803943f521ea4c320eedbea6e2aaa4fd31aa1ac45e198bd3b3bfdc5d008d4cee DIST tuxonice-for-linux-4.2.3-2015-10-10.patch.bz2 133618 SHA256 6f3640495524c9dbbbc90eee5179da358d7e280659797b1b9d3fb9eab27b8379 SHA512 263a98d92ad80b5db834d4bd9e5f1a91a22227cd51f8257ef705386743beef0de69ff6e3030675be543f33e7126d45d9c97b0ecbf93de58a0bc68254c48c219b WHIRLPOOL 5da716dabcc7c5109768f0ce6451b1af9c2e33c681e9903b3b5f2caa0056e433ccd0919939144237f1551060f0aa8709a5d24230be1939450eed7e62aba0c1ac +DIST tuxonice-for-linux-4.2.5-2015-10-30.patch.bz2 133573 SHA256 e7e6b8767aa97d44f46659ce8be99be58a73f0d83a69d5c5809703c7158835a7 SHA512 e379505276f5829ba07ac7da36ba29a3841c4ee086eb223b833bfc3a1ac3f1c9b3a64b43dae96b5ae6edd34d4fd3b280e027bb94afda3f3f05d95272fe4cc034 WHIRLPOOL 43a5e24cfb24d84350fbfe21043aad3e86aafb5f83f1ab86a3832488b1f65663d768650420585a59c487cc25ed3b5f4267c44dd7b36a4ef242c656d50d7897bd +DIST tuxonice-for-linux-head-4.3.0-rc7-2015-11-01.patch.bz2 133453 SHA256 7b82218d17001ab54691552fd87f38482afa4a2923cfdab104381ca0efce8ae0 SHA512 07f349938f34eba8a4da3eec18325be5aa01067a46290d818b453b170acf66b214802b9cc3b25175b3b478839a6611b4c1862b2271401da396a8bc9a52837787 WHIRLPOOL 133e9b38850a82e52faac6eba16dc6b0445e803c5035fe2da38317ad11a581d266a3ba731fb6db589b0bd2f030aa2e7bedeefa7ebc4e5278acc81f197f4acb8a diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild new file mode 100644 index 000000000000..983d05711d57 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.92.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="97" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.10.92" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild new file mode 100644 index 000000000000..7de68dd651d2 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.49.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="46" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.12.49" +TUXONICE_DATE="2015-10-10" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild new file mode 100644 index 000000000000..491621a69fc4 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.56.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="62" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.14.56" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild new file mode 100644 index 000000000000..716b9a993615 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.23.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="23" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.18.23" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild new file mode 100644 index 000000000000..4c33b3b37516 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.4.110.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras" +K_GENPATCHES_VER="93" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="3.4.110" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild new file mode 100644 index 000000000000..4cf8c16f9ab5 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.1.12.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="16" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="4.1.12" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild new file mode 100644 index 000000000000..4bee51d6d341 --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.2.5.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="8" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="4.2.5" +TUXONICE_DATE="2015-10-30" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild new file mode 100644 index 000000000000..e56b5d544f0e --- /dev/null +++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.3.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +ETYPE="sources" +K_WANT_GENPATCHES="base extras experimental" +K_GENPATCHES_VER="1" + +inherit kernel-2 +detect_version +detect_arch + +DESCRIPTION="TuxOnIce + Gentoo patchset sources" +HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel" + +TUXONICE_PV="head-4.3.0-rc7" +TUXONICE_DATE="2015-11-01" + +TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2" +TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}" +UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}" +UNIPATCH_STRICTORDER="yes" +SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}" + +KEYWORDS="~amd64 ~x86" +IUSE="experimental" + +RDEPEND="${RDEPEND} + >=sys-apps/tuxonice-userui-1.0 + || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )" + +K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list: +http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/" +K_SECURITY_UNSUPPORTED="1" diff --git a/sys-process/procps/procps-3.3.11.ebuild b/sys-process/procps/procps-3.3.11-r1.ebuild index c2031d47a172..d3c2a5def9c0 100644 --- a/sys-process/procps/procps-3.3.11.ebuild +++ b/sys-process/procps/procps-3.3.11-r1.ebuild @@ -43,7 +43,6 @@ src_prepare() { src_configure() { econf \ - --exec-prefix="${EPREFIX}" \ --docdir='$(datarootdir)'/doc/${PF} \ $(use_enable modern-top) \ $(use_with ncurses) \ @@ -62,8 +61,9 @@ src_install() { default #dodoc sysctl.conf - # The configure script is completely whacked in the head - mv "${ED}"/lib* "${ED}"/usr/ || die + dodir /bin + mv "${ED}"/usr/bin/{kill,pidof,ps} "${ED}"/bin/ || die + gen_usr_ldscript -a procps prune_libtool_files } diff --git a/virtual/dnspython/dnspython-1.ebuild b/virtual/dnspython/dnspython-1.ebuild index 0934c78b3600..14cf6ee264d7 100644 --- a/virtual/dnspython/dnspython-1.ebuild +++ b/virtual/dnspython/dnspython-1.ebuild @@ -17,7 +17,10 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND="!dev-python/dnspython:0 +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + !dev-python/dnspython:0 $(python_gen_cond_dep 'dev-python/dnspython:py2[${PYTHON_USEDEP}]' python2*) $(python_gen_cond_dep 'dev-python/dnspython:py3[${PYTHON_USEDEP}]' python3*)" DEPEND="!dev-python/dnspython:0" diff --git a/virtual/funcsigs/funcsigs-0.ebuild b/virtual/funcsigs/funcsigs-0.ebuild index 6674d0ca0aa9..c811a39f5d10 100644 --- a/virtual/funcsigs/funcsigs-0.ebuild +++ b/virtual/funcsigs/funcsigs-0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python{2_7,3_{3,4}} ) +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) inherit python-r1 @@ -14,11 +14,12 @@ SRC_URI="" SLOT="0" LICENSE="" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" ${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/funcsigs' python2_7)" + $(python_gen_cond_dep 'dev-python/funcsigs' python2_7 pypy )" +DEPEND="" diff --git a/virtual/pmw/pmw-1.ebuild b/virtual/pmw/pmw-1.ebuild index e36e85d41660..f16cf1185864 100644 --- a/virtual/pmw/pmw-1.ebuild +++ b/virtual/pmw/pmw-1.ebuild @@ -17,6 +17,9 @@ SLOT="0" KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~amd64-linux ~x86-linux" IUSE="" -RDEPEND=" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} $(python_gen_cond_dep 'dev-python/pmw:py2[${PYTHON_USEDEP}]' python2*) $(python_gen_cond_dep 'dev-python/pmw:py3[${PYTHON_USEDEP}]' python3*)" +DEPEND="" diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest index 44b772ebe2c0..1f4cac90a310 100644 --- a/x11-misc/zim/Manifest +++ b/x11-misc/zim/Manifest @@ -1,2 +1 @@ -DIST zim-0.63.tar.gz 1864169 SHA256 1584547150b6c96dacdb540c2b88e16d2cd673fa8026d9179aab4a082071fb1c SHA512 052f65c98badfcb1a6d9ed9d09eb84a01878384430affcb97d48d51ef5853478c8d489f9337600fc28b9949f8e1ff97e7e4070ed9a4f488f684a392ad2bff791 WHIRLPOOL 12c884fdaeac1c0c4766637d96e9699491cac1d3421368c073f852e78995a969303dd510172ef89b70c65226cfd1de794968b31313e1ee63aeb6e2f63d610451 -DIST zim-0.64.tar.gz 1896231 SHA256 d747d12803385468142a9f078623772d90fee6325d2acc618589aea63a0e9b1b SHA512 be16412e69f0ead6e5fe4418993fe5ef4e3a88bdfbe4aa09a6406e7bc70e1714862fb533172b7313c591b351e5dc44f49c826c3cff80df27fadc59e157b08991 WHIRLPOOL f16c77a9467d5783aa8eaebd8faae8357c4bff1cdc19629472ab8cfe44bc0d56a89079209534d742d19434913551418f3f4baae9f0851f165469f55a040190f1 +DIST zim-0.65.tar.gz 1899614 SHA256 5442f3334395a2beafc5b9a2bbec2e53e38270d4bad696b5c4053dd51dc1ed96 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb WHIRLPOOL 22bfeaee53214029538ba76d309f3413fa327aec125e49270f168a5d985e37672f3a8cc8043e4a35d1141ffb54f958c0a466c6edac4192028893d017401ce2a2 diff --git a/x11-misc/zim/files/zim-0.62-desktop.patch b/x11-misc/zim/files/zim-0.62-desktop.patch deleted file mode 100644 index b2494509b381..000000000000 --- a/x11-misc/zim/files/zim-0.62-desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/xdg/zim.desktop -+++ b/xdg/zim.desktop -@@ -7,7 +7,7 @@ - Terminal=false - Categories=Utility;TextEditor;GTK; - MimeType=application/x-zim-notebook;text/x-zim-wiki;application/x-gjots; --Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal -+Keywords=Text;Editor;Write;Wiki;Notes;Notebook;Journal; - Name=Zim Desktop Wiki - Comment=Edit text files "wiki style" - GenericName=Text Editor diff --git a/x11-misc/zim/zim-0.64.ebuild b/x11-misc/zim/zim-0.64.ebuild deleted file mode 100644 index fb9808a99d12..000000000000 --- a/x11-misc/zim/zim-0.64.ebuild +++ /dev/null @@ -1,84 +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 ) -PYTHON_REQ_USE="sqlite" -DISTUTILS_SINGLE_IMPL=1 - -inherit distutils-r1 gnome2-utils fdo-mime virtualx - -DESCRIPTION="A desktop wiki" -HOMEPAGE="http://zim-wiki.org/" -SRC_URI="http://zim-wiki.org/downloads/${P}.tar.gz" - -LICENSE="BSD GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}] - dev-python/pygobject:2[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - x11-misc/xdg-utils - test? ( - dev-vcs/bzr - dev-vcs/git - dev-vcs/mercurial )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch -) - -python_prepare() { - sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die - - if [[ ${LINGUAS} ]]; then - local lingua - for lingua in translations/*.po; do - lingua=${lingua/.po} - lingua=${lingua/translations\/} - has ${lingua} ${LINGUAS} || \ - { rm translations/${lingua}.po || die; } - done - fi - - distutils-r1_python_prepare -} - -python_test() { - VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py -} - -python_install() { - distutils-r1_python_install --skip-xdg-cmd -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - if ! has_version ${CATEGORY}/${PN}; then - einfo "Please emerge these packages for additional functionality" - einfo " dev-lang/R" - einfo " dev-python/gtkspell-python" - einfo " dev-vcs/bzr" - einfo " gnome-extra/zeitgeist" - einfo " media-gfx/graphviz" - einfo " media-gfx/imagemagick" - einfo " media-gfx/scrot" - einfo " media-sound/lilypond" - einfo " sci-visualization/gnuplot" - einfo " virtual/latex-base app-text/dvipng" - fi -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/x11-misc/zim/zim-0.63.ebuild b/x11-misc/zim/zim-0.65.ebuild index fb9808a99d12..fb9808a99d12 100644 --- a/x11-misc/zim/zim-0.63.ebuild +++ b/x11-misc/zim/zim-0.65.ebuild diff --git a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild index 31ec9aa9c49a..2fbceba98450 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.7.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.7.ebuild @@ -56,7 +56,7 @@ src_configure() { myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" else myconf="${myconf} --disable-locale" fi diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild index 2e5a7783c700..0753568bbb5d 100644 --- a/x11-wm/windowmaker/windowmaker-9999.ebuild +++ b/x11-wm/windowmaker/windowmaker-9999.ebuild @@ -62,7 +62,7 @@ src_configure() { myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)" if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" + [[ -z $LINGUAS ]] && export LINGUAS="$(ls po/*.po | sed 's:po/\(.*\)\.po$:\1:' | xargs)" else myconf="${myconf} --disable-locale" fi |