diff options
70 files changed, 1334 insertions, 741 deletions
diff --git a/app-crypt/gnupg/files/gnupg-2.1.11-tests.patch b/app-crypt/gnupg/files/gnupg-2.1.11-tests.patch new file mode 100644 index 000000000000..216ea7dafc0c --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.1.11-tests.patch @@ -0,0 +1,136 @@ +From acac103ba5772ae738ce5409d17feab80596cde6 Mon Sep 17 00:00:00 2001 +From: "Neal H. Walfield" <neal@g10code.com> +Date: Fri, 12 Feb 2016 22:12:21 +0100 +Subject: [PATCH 1/1] common: Change simple_query to ignore status messages. + +* common/simple-pwquery.c (simple_query): Ignore status messages. + +-- +Signed-off-by: Neal H. Walfield <neal@g10code.com> +GnuPG-bug-id: 2229 +--- + common/simple-pwquery.c | 95 ++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 67 insertions(+), 28 deletions(-) + +diff --git a/common/simple-pwquery.c b/common/simple-pwquery.c +index 90d04c0..b2d666c 100644 +--- a/common/simple-pwquery.c ++++ b/common/simple-pwquery.c +@@ -618,6 +618,7 @@ simple_query (const char *query) + int fd = -1; + int nread; + char response[500]; ++ int have = 0; + int rc; + + rc = agent_open (&fd); +@@ -628,40 +629,78 @@ simple_query (const char *query) + if (rc) + goto leave; + +- /* get response */ +- nread = readline (fd, response, 499); +- if (nread < 0) +- { +- rc = -nread; +- goto leave; +- } +- if (nread < 3) ++ while (1) + { +- rc = SPWQ_PROTOCOL_ERROR; +- goto leave; +- } ++ if (! have || ! strchr (response, '\n')) ++ /* get response */ ++ { ++ nread = readline (fd, &response[have], ++ sizeof (response) - 1 /* NUL */ - have); ++ if (nread < 0) ++ { ++ rc = -nread; ++ goto leave; ++ } ++ have += nread; ++ if (have < 3) ++ { ++ rc = SPWQ_PROTOCOL_ERROR; ++ goto leave; ++ } ++ response[have] = 0; ++ } + +- if (response[0] == 'O' && response[1] == 'K') +- /* OK, do nothing. */; +- else if ((nread > 7 && !memcmp (response, "ERR 111", 7) +- && (response[7] == ' ' || response[7] == '\n') ) +- || ((nread > 4 && !memcmp (response, "ERR ", 4) +- && (strtoul (response+4, NULL, 0) & 0xffff) == 99)) ) +- { +- /* 111 is the old Assuan code for canceled which might still +- be in use by old installations. 99 is GPG_ERR_CANCELED as +- used by modern gpg-agents; 0xffff is used to mask out the +- error source. */ ++ if (response[0] == 'O' && response[1] == 'K') ++ /* OK, do nothing. */; ++ else if ((nread > 7 && !memcmp (response, "ERR 111", 7) ++ && (response[7] == ' ' || response[7] == '\n') ) ++ || ((nread > 4 && !memcmp (response, "ERR ", 4) ++ && (strtoul (response+4, NULL, 0) & 0xffff) == 99)) ) ++ { ++ /* 111 is the old Assuan code for canceled which might still ++ be in use by old installations. 99 is GPG_ERR_CANCELED as ++ used by modern gpg-agents; 0xffff is used to mask out the ++ error source. */ + #ifdef SPWQ_USE_LOGGING +- log_info (_("canceled by user\n") ); ++ log_info (_("canceled by user\n") ); + #endif +- } +- else +- { ++ } ++ else if (response[0] == 'S' && response[1] == ' ') ++ { ++ char *nextline; ++ int consumed; ++ ++ nextline = strchr (response, '\n'); ++ if (! nextline) ++ /* Point to the NUL. */ ++ nextline = &response[have]; ++ else ++ /* Move past the \n. */ ++ nextline ++; ++ ++ consumed = (size_t) nextline - (size_t) response; ++ ++ /* Skip any additional newlines. */ ++ while (consumed < have && response[consumed] == '\n') ++ consumed ++; ++ ++ have -= consumed; ++ ++ if (have) ++ memmove (response, &response[consumed], have + 1); ++ ++ continue; ++ } ++ else ++ { + #ifdef SPWQ_USE_LOGGING +- log_error (_("problem with the agent\n")); ++ log_error (_("problem with the agent (unexpected response \"%s\"\n"), ++ response); + #endif +- rc = SPWQ_ERR_RESPONSE; ++ rc = SPWQ_ERR_RESPONSE; ++ } ++ ++ break; + } + + leave: +-- +2.1.4 + diff --git a/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild new file mode 100644 index 000000000000..4b653de3dbf2 --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.1.11-r1.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" +HOMEPAGE="http://www.gnupg.org/" +MY_P="${P/_/-}" +SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tofu tools usb" + +COMMON_DEPEND_LIBS=" + dev-libs/npth + >=dev-libs/libassuan-2.4.1 + >=dev-libs/libgcrypt-1.6.2[threads] + >=dev-libs/libgpg-error-1.21 + >=dev-libs/libksba-1.2.0 + >=net-misc/curl-7.10 + gnutls? ( >=net-libs/gnutls-3.0 ) + sys-libs/zlib + ldap? ( net-nds/openldap ) + bzip2? ( app-arch/bzip2 ) + readline? ( sys-libs/readline:0= ) + smartcard? ( usb? ( virtual/libusb:0 ) ) + tofu? ( >=dev-db/sqlite-3.7 ) + " +COMMON_DEPEND_BINS="app-crypt/pinentry + !app-crypt/dirmngr" + +# Existence of executables is checked during configuration. +DEPEND="${COMMON_DEPEND_LIBS} + ${COMMON_DEPEND_BINS} + static? ( + >=dev-libs/libassuan-2[static-libs] + >=dev-libs/libgcrypt-1.6.2[static-libs] + >=dev-libs/libgpg-error-1.17[static-libs] + >=dev-libs/libksba-1.0.7[static-libs] + dev-libs/npth[static-libs] + >=net-misc/curl-7.10[static-libs] + sys-libs/zlib[static-libs] + bzip2? ( app-arch/bzip2[static-libs] ) + ) + nls? ( sys-devel/gettext ) + doc? ( sys-apps/texinfo )" + +RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} ) + ${COMMON_DEPEND_BINS} + selinux? ( sec-policy/selinux-gpg ) + nls? ( virtual/libintl )" + +REQUIRED_USE="smartcard? ( !static )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + epatch "${FILESDIR}/${P}-tests.patch" + epatch_user +} + +src_configure() { + local myconf=() + + # 'USE=static' support was requested: + # gnupg1: bug #29299 + # gnupg2: bug #159623 + use static && append-ldflags -static + + if use smartcard; then + myconf+=( + --enable-scdaemon + $(use_enable usb ccid-driver) + ) + else + myconf+=( --disable-scdaemon ) + fi + + if use elibc_SunOS || use elibc_AIX; then + myconf+=( --disable-symcryptrun ) + else + myconf+=( --enable-symcryptrun ) + fi + + # glib fails and picks up clang's internal stdint.h causing weird errors + [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h + + econf \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --enable-gpg \ + --enable-gpgsm \ + --enable-large-secmem \ + --without-adns \ + "${myconf[@]}" \ + $(use_enable bzip2) \ + $(use_enable gnutls) \ + $(use_with ldap) \ + $(use_enable nls) \ + $(use_with readline) \ + $(use_enable tofu) \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" +} + +src_compile() { + default + + if use doc; then + cd doc + emake html + fi +} + +src_install() { + default + + use tools && dobin tools/{convert-from-106,gpg-check-pattern} \ + tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert} + + emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA + # The help*txt files are read from the datadir by GnuPG directly. + # They do not work if compressed or moved! + #rm "${ED}"/usr/share/gnupg/help* || die + + dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \ + doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help* + + dosym gpg2 /usr/bin/gpg + dosym gpgv2 /usr/bin/gpgv + echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1 + echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1 + + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg + + if use doc; then + dohtml doc/gnupg.html/* doc/*.png + fi +} + +pkg_postinst() { + elog "If you wish to view images emerge:" + elog "media-gfx/xloadimage, media-gfx/xli or any other viewer" + elog "Remember to use photo-viewer option in configuration file to activate" + elog "the right viewer." + elog + + if use smartcard; then + elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of" + use usb && elog " - a CCID-compatible reader, used directly through libusb;" + elog " - sys-apps/pcsc-lite and a compatible reader device;" + elog " - dev-libs/openct and a compatible reader device;" + elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces." + elog "" + elog "General hint: you probably want to try installing sys-apps/pcsc-lite and" + elog "app-crypt/ccid first." + fi + + ewarn "Please remember to restart gpg-agent if a different version" + ewarn "of the agent is currently used. If you are unsure of the gpg" + ewarn "agent you are using please run 'killall gpg-agent'," + ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'." + + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "If upgrading from a version prior than 2.1 you might have to re-import" + elog "secret keys after restarting the gpg-agent as the new version is using" + elog "a new storage mechanism." + elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg" + fi +} diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 7a92ae0aae7f..0fd52b0589eb 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,6 +1,3 @@ -DIST nano-2.3.6.tar.gz 1816012 SHA256 a74bf3f18b12c1c777ae737c0e463152439e381aba8720b4bc67449f36a09534 SHA512 00d66dbbd1ee59b3d606af8688599ce627aa98cee494611e255293347b9aa4f3f583820ac28adae5f7209410a28669cdd5211258411d83364d3eb788d909bb73 WHIRLPOOL 6900e40e41f7bbd23a0dc76fe24bbf29c46b65bead328cb574008045f397e92643a7cee35605ef044e1921029dca54e49831548828490abbf24b2c63f0f9092b -DIST nano-2.4.0.tar.gz 1886052 SHA256 5076fb502680503e648cbdcbf2077e39fba193420ae19203f0a54cb2d94a75bd SHA512 7f079e307521a47405ba6d107d481df6869dbd7ea9297de6c69e831d00335cee403ac3ec1ef3578488cbec65c2e2ddec15edfddd45071f0fb4e2eccc94cbef1d WHIRLPOOL 1e4aaaa67c44bf051210b9c65db80c30189606fc2ba0d3e1a6802a41e7244901e60858ad412a0c6ee6e0eaa90d65925d8c954b398387cc12109a626811d8ad07 -DIST nano-2.4.1.tar.gz 1890805 SHA256 6a0ceb5e1b9b9bea72d5d1f46488ace4782b1f198ea6ba558480a86d994f29d2 SHA512 0e2bc99627682350496853b2dc8d3d4c25303b3723fd1dec2e26f2860b21d0f4c6cb99810517fc4e86312f3bec5481c327afab84dac55f4c388799453e6f5f11 WHIRLPOOL 3c3decdd0c94c33a2cb3854e6b8cda4082a9a98d55d8e1d256ec73febaa0de597d41b1f63c18cb6308fb7174b6ced0995434697f6c05a2efb53e3588f2ca7d8a -DIST nano-2.4.2.tar.gz 1898633 SHA256 c8cd7f18fcf5696d9df3364ee2a840e0ab7b6bdbd22abf850bbdc951db7f65b9 SHA512 487b03b33ac8fac4a774223e038b00463ca03e08093c506b10f4df56795039eff1c23518c1a4f32695cee1bb9bb5eb0a2dd3e1f8a9befcc573e7fca3d69fa9d3 WHIRLPOOL ac5942114a48d428e64db47afb919feef506e18da8b21627ea421e59bf3c235083b17ffaf7a6e510193b6617c0e2ad9d2460f64d5d8bbd6b828547bcd41b5c7c DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607 DIST nano-2.5.0.tar.gz 1909625 SHA256 ff323e6fef74caf0a924304841c07ac65ec30db99dc5c1f8272b4c536a5c89ee SHA512 f05f1afa6a79ff6b87359c46fbdaf6161eacdc265ac6be155a0173e3ab5a17023e205d0b9667a942e754556182a9007fe4438f337a830d20b9546aad9d522ba6 WHIRLPOOL 29fbb67ce561da8255dca70d7554d604094a21e89e39ce94fadb67bc3236550ea1ee3f08838616deed8a4e37657df0ef6d320c701cc77a086d8d1ce2dae43d1d +DIST nano-2.5.2.tar.gz 1964016 SHA256 89bd6ac5120880d2a95431d8bad22bf92c7ccbf10b8f1716d4ea062f3faeeb41 SHA512 ec4e35cfb23494dd09c23b195556dfb36b9329007d61bdfe6a25a43c9914e432160969c92ed991bb2221ea5facd5ae1c1e9aef0029dfa259d827b7ea4943a1d3 WHIRLPOOL 3963ed7fad9296ea0d85300dc7ad518a33e2b793d9b94e98056a4c82c9b7984ef187dfa10653f787b262755521321c1e2c37562c1f95cfd338927329c6d0aa97 diff --git a/app-editors/nano/files/awk.nanorc b/app-editors/nano/files/awk.nanorc deleted file mode 100644 index 696ab6ad727c..000000000000 --- a/app-editors/nano/files/awk.nanorc +++ /dev/null @@ -1,38 +0,0 @@ -## Here is an example for awk. -## -syntax "awk" "\.awk$" -## records -icolor brightred "\$[0-9A-Z_!@#$*?-]+" -## awk-set variables -color red "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>" -color red "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>" -color red "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>" -## function declarations and special patterns -color brightgreen "\<(function|extension|BEGIN|END)\>" -## operators -color green "(\{|\}|\(|\)|\;|\]|\[|\\|<|>|!|=|&|\+|-|\*|%|/|\?:|\^|\|)" -## flow control -color brightyellow "\<(for|if|while|do|else|in|delete|exit)\>" -color brightyellow "\<(break|continue|return)\>" -## I/O statements -color brightgreen "\<(close|getline|next|nextfile|print|printf)\>" -color brightgreen "\<(system|fflush)\>" -## standard functions -color magenta "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>" -color magenta "\<(asort|asorti|gensub|gsub|index|length|match)\>" -color magenta "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>" -color magenta "\<(mktime|strftime|systime)\>" -color magenta "\<(and|compl|lshift|or|rshift|xor)\>" -color magenta "\<(bindtextdomain|dcgettext|dcngettext)\>" - -## -## String highlighting. You will in general want your comments and -## strings to come last, because syntax highlighting rules will be -## applied in the order they are read in. -color brightyellow "<[^= ]*>" ""(\\.|[^"])*"" - -## Comment highlighting -color brightblue "(^|[[:space:]])#.*$" - -## Trailing whitespace -color ,green "[[:space:]]+$" diff --git a/app-editors/nano/files/css.nanorc b/app-editors/nano/files/css.nanorc deleted file mode 100644 index 62126e8a7833..000000000000 --- a/app-editors/nano/files/css.nanorc +++ /dev/null @@ -1,9 +0,0 @@ -## Here is an example for css files. -## -syntax "css" "\.css$" -color brightred "." -color brightyellow start="\{" end="\}" -color brightwhite start=":" end="[;^\{]" -color brightblue ":active|:focus|:hover|:link|:visited|:link|:after|:before|$" -color brightblue start="\/\*" end="\\*/" -color green ";|:|\{|\}" diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc deleted file mode 100644 index f08d2e9027ce..000000000000 --- a/app-editors/nano/files/gentoo.nanorc +++ /dev/null @@ -1,50 +0,0 @@ -## Here is an example for ebuilds/eclasses -## -syntax "ebuild" "\.e(build|class)$" -## All the standard portage functions -color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))" -## Highlight bash related syntax -color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while|continue|break)\>" -color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)" -color green "-(e|d|f|r|g|u|w|x|L)\>" -color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>" -## Highlight variables ... official portage ones in red, all others in bright red -color brightred "\$\{?[a-zA-Z_0-9]+\}?" -color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>" -color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>" -## Highlight portage commands -color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*" -color brightblue "\<e(begin|end|conf|install|make|warn|infon?|error|log|patch|new(group|user))\>" -color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>" -color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)\>" -color brightblue "\<do(header|python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>" -color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)" -color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>" "\<usex\>" -## Highlight common commands used in ebuilds -color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>" -## Highlight comments (doesnt work that well) -color yellow "#.*$" -## Highlight strings (doesnt work that well) -color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'" -## Trailing space is bad! -color ,green "[[:space:]]+$" - -## Here is an example for Portage control files -## -syntax "/etc/portage" "\.(keywords|mask|unmask|use)$" -## Base text: -color green "^.+$" -## Use flags: -color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+" -color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+" -## Likely version numbers: -color magenta "-[[:digit:]].*([[:space:]]|$)" -## Accepted arches: -color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>" -color white "[[:space:]][~-]?\*" -## Categories: -color cyan "^[[:space:]]*.*/" -## Masking regulators: -color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)" -## Comments: -color yellow "#.*$" diff --git a/app-editors/nano/files/nano-2.4.0-no-speller.patch b/app-editors/nano/files/nano-2.4.0-no-speller.patch deleted file mode 100644 index 4405266bb0af..000000000000 --- a/app-editors/nano/files/nano-2.4.0-no-speller.patch +++ /dev/null @@ -1,88 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=544296 -https://savannah.gnu.org/bugs/?44607 - -From 14a9c8aa0b124dc580c4805e848e6ff0880b43bd Mon Sep 17 00:00:00 2001 -From: Benno Schulenberg <bensberg@justemail.net> -Date: Fri, 27 Mar 2015 16:55:49 +0000 -Subject: [PATCH] Treating the formatter like a speller, to fix compilation - with --disable-speller. This fixes Savannah bug #44607. - -git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5168 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 ---- - ChangeLog | 2 ++ - src/global.c | 10 ++++++++-- - src/text.c | 3 ++- - 3 files changed, 12 insertions(+), 3 deletions(-) - -ChangeLog - * src/global.c, src/text.c: Treat the formatter like a speller, to fix - compilation with --disable-speller. Fixes Savannah bug #44607. - -diff --git a/src/global.c b/src/global.c -index 4643af2..27ff938 100644 ---- a/src/global.c -+++ b/src/global.c -@@ -639,8 +639,10 @@ void shortcut_init(void) - const char *nano_lint_msg = N_("Invoke the linter, if available"); - const char *nano_prevlint_msg = N_("Go to previous linter msg"); - const char *nano_nextlint_msg = N_("Go to next linter msg"); -+#ifndef DISABLE_SPELLER - const char *nano_formatter_msg = N_("Invoke formatter, if available"); - #endif -+#endif - #endif /* !DISABLE_HELP */ - - #ifndef DISABLE_HELP -@@ -736,9 +738,11 @@ void shortcut_init(void) - #ifndef DISABLE_COLOR - add_to_funcs(do_linter, MMAIN, - N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW); -+#ifndef DISABLE_SPELLER - add_to_funcs(do_formatter, MMAIN, - N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW); - #endif -+#endif - - #ifndef NANO_TINY - add_to_funcs(case_sens_void, MWHEREIS|MREPLACE, -@@ -1006,12 +1010,14 @@ void shortcut_init(void) - #ifndef DISABLE_SPELLER - add_to_sclist(MMAIN, "^T", do_spell, 0); - add_to_sclist(MMAIN, "F12", do_spell, 0); -+#ifndef DISABLE_COLOR -+ add_to_sclist(MMAIN, "^T", do_formatter, 0); -+ add_to_sclist(MMAIN, "F12", do_formatter, 0); -+#endif - #else - #ifndef DISABLE_COLOR - add_to_sclist(MMAIN, "^T", do_linter, 0); - add_to_sclist(MMAIN, "F12", do_linter, 0); -- add_to_sclist(MMAIN, "^T", do_formatter, 0); -- add_to_sclist(MMAIN, "F12", do_formatter, 0); - #endif - #endif - add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0); -diff --git a/src/text.c b/src/text.c -index 8814b49..98b2f80 100644 ---- a/src/text.c -+++ b/src/text.c -@@ -3223,6 +3223,7 @@ free_lints_and_return: - lint_cleanup(); - } - -+#ifndef DISABLE_SPELLER - /* Run a formatter for the given syntax. - * Expects the formatter to be non-interactive and - * operate on a file in-place, which we'll pass it -@@ -3370,7 +3371,7 @@ void do_formatter(void) - - statusbar(finalstatus); - } -- -+#endif /* !DISABLE_SPELLER */ - #endif /* !DISABLE_COLOR */ - - #ifndef NANO_TINY --- -2.3.3 - diff --git a/app-editors/nano/files/xml.nanorc b/app-editors/nano/files/xml.nanorc deleted file mode 100644 index 1f68c05341ad..000000000000 --- a/app-editors/nano/files/xml.nanorc +++ /dev/null @@ -1,9 +0,0 @@ -## Here is an example for xml files. -## -syntax "xml" "\.([jrs]html?|sgml?|xml|xslt?)$" -color green start="<" end=">" -color cyan "<[^> ]+" -color cyan ">" -color yellow start="<!DOCTYPE" end="[/]?>" -color yellow start="<!--" end="-->" -color red "&[^;]*;" diff --git a/app-editors/nano/nano-2.3.6.ebuild b/app-editors/nano/nano-2.3.6.ebuild deleted file mode 100644 index ee21f62673e8..000000000000 --- a/app-editors/nano/nano-2.3.6.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano" - inherit subversion autotools -else - MY_P=${PN}-${PV/_} - SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz" - 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" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug justify +magic minimal ncurses nls slang +spell unicode" - -RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?] - magic? ( sys-apps/file ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang ) )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi - epatch_user -} - -src_configure() { - eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic) - local myconf=() - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac - econf \ - --bindir="${EPREFIX}"/bin \ - --htmldir=/trash \ - $(use_enable !minimal color) \ - $(use_enable !minimal multibuffer) \ - $(use_enable !minimal nanorc) \ - --disable-wrapping-as-root \ - $(use_enable spell speller) \ - $(use_enable justify) \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable unicode utf8) \ - $(use_enable minimal tiny) \ - $(usex ncurses --without-slang $(use_with slang)) \ - "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}"/trash - - dodoc doc/nanorc.sample - dohtml doc/faq.html - insinto /etc - newins doc/nanorc.sample nanorc - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - fi - - dodir /usr/bin - dosym /bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-2.4.0.ebuild b/app-editors/nano/nano-2.4.0.ebuild deleted file mode 100644 index 7e824c28a95a..000000000000 --- a/app-editors/nano/nano-2.4.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano" - inherit subversion autotools -else - MY_P=${PN}-${PV/_} - SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz" - 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" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug justify +magic minimal ncurses nls slang +spell unicode" - -RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?] - magic? ( sys-apps/file ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang ) )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi - epatch "${FILESDIR}"/${P}-no-speller.patch #544296 - epatch_user -} - -src_configure() { - eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic) - local myconf=() - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac - econf \ - --bindir="${EPREFIX}"/bin \ - --htmldir=/trash \ - $(use_enable !minimal color) \ - $(use_enable !minimal multibuffer) \ - $(use_enable !minimal nanorc) \ - --disable-wrapping-as-root \ - $(use_enable spell speller) \ - $(use_enable justify) \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable unicode utf8) \ - $(use_enable minimal tiny) \ - $(usex ncurses --without-slang $(use_with slang)) \ - "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}"/trash - - dodoc doc/nanorc.sample - dohtml doc/faq.html - insinto /etc - newins doc/nanorc.sample nanorc - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - fi - - dodir /usr/bin - dosym /bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-2.4.1.ebuild b/app-editors/nano/nano-2.4.1.ebuild deleted file mode 100644 index 2644916996cd..000000000000 --- a/app-editors/nano/nano-2.4.1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano" - inherit subversion autotools -else - MY_P=${PN}-${PV/_} - SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz" - 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" -fi - -DESCRIPTION="GNU GPL'd Pico clone with more functionality" -HOMEPAGE="http://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" - -LICENSE="GPL-3" -SLOT="0" -IUSE="debug justify +magic minimal ncurses nls slang +spell unicode" - -RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?] - magic? ( sys-apps/file ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang ) )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - virtual/pkgconfig" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi - epatch_user -} - -src_configure() { - eval export ac_cv_{header_magic_h,lib_magic_magic_open}=$(usex magic) - local myconf=() - case ${CHOST} in - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848 - esac - econf \ - --bindir="${EPREFIX}"/bin \ - --htmldir=/trash \ - $(use_enable !minimal color) \ - $(use_enable !minimal multibuffer) \ - $(use_enable !minimal nanorc) \ - --disable-wrapping-as-root \ - $(use_enable spell speller) \ - $(use_enable justify) \ - $(use_enable debug) \ - $(use_enable nls) \ - $(use_enable unicode utf8) \ - $(use_enable minimal tiny) \ - $(usex ncurses --without-slang $(use_with slang)) \ - "${myconf[@]}" -} - -src_install() { - default - rm -rf "${D}"/trash - - dodoc doc/nanorc.sample - dohtml doc/faq.html - insinto /etc - newins doc/nanorc.sample nanorc - if ! use minimal ; then - # Enable colorization by default. - sed -i \ - -e '/^# include /s:# *::' \ - "${ED}"/etc/nanorc || die - fi - - dodir /usr/bin - dosym /bin/nano /usr/bin/nano -} diff --git a/app-editors/nano/nano-2.4.2.ebuild b/app-editors/nano/nano-2.5.2.ebuild index 58fa18e0fffb..58fa18e0fffb 100644 --- a/app-editors/nano/nano-2.4.2.ebuild +++ b/app-editors/nano/nano-2.5.2.ebuild diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest index 5383329dace9..60fb6a1e760f 100644 --- a/app-misc/gcalcli/Manifest +++ b/app-misc/gcalcli/Manifest @@ -1 +1,2 @@ DIST gcalcli-3.2.tar.gz 1672457 SHA256 9b3465be8e64c291ffe4582f8cb779a7025c700e6a83aae74722d87a3b88d55a SHA512 a2e0d9aea2f27eaee3796acfbfdc08b88a7792002b10f0e44b0db1187a7ecd50aa97f78df7236038c8c18bc1b6dacbfa4b26db6bfb5762c880415c10a5364d83 WHIRLPOOL 66b8e954c5d4527e2725d0f07786262f4365f356e3ef893aa8253d07c41523b5f9c71bffd03acc02b27c57001f0c1e7b3cd92fea7396974b8898b4940abff6fb +DIST gcalcli-3.3.2.tar.gz 1674569 SHA256 69c31b5bee1390b4187a48b85b57ba95e40db231489d3deec8c3d387305d2ff3 SHA512 725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0 WHIRLPOOL 86acaf08d36af331524e514c6bfc37e6591ec570dd5c25c0bca6b111aa901636082cc961b70fcadbc32616e72f6c09bbc8460aa97f15a146fa341850fa416d15 diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild b/app-misc/gcalcli/gcalcli-3.3.2.ebuild new file mode 100644 index 000000000000..c74dec1796ea --- /dev/null +++ b/app-misc/gcalcli/gcalcli-3.3.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +# google-api-python-client only supports these +PYTHON_COMPAT=( python2_7 pypy ) + +inherit python-r1 + +DESCRIPTION="Google Calendar Command Line Interface" +HOMEPAGE="https://github.com/insanum/gcalcli" +SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/google-api-python-client[${PYTHON_USEDEP}] + dev-python/gdata[${PYTHON_USEDEP}] + dev-python/vobject[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +src_install() { + dodoc -r ChangeLog README.md docs + python_foreach_impl python_doscript ${PN} +} diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild index d049c3f595a9..1970779a3d87 100644 --- a/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild +++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.18.ebuild @@ -124,6 +124,10 @@ src_prepare() { sed -i \ -e "/^ZLIBDIR=/s:=.*:=${T}:" \ configure.ac || die + # Some files depend on zlib.h directly. Redirect them. #573248 + sed -i \ + -e '/^zlib_h/s:=.*:=:' \ + base/lib.mak || die # search path fix # put LDFLAGS after BINDIR, bug #383447 diff --git a/dev-java/sbt/sbt-0.13.10_rc2.ebuild b/dev-java/sbt/sbt-0.13.10_rc2.ebuild index 86defae2e3ce..cf80d0f9a039 100644 --- a/dev-java/sbt/sbt-0.13.10_rc2.ebuild +++ b/dev-java/sbt/sbt-0.13.10_rc2.ebuild @@ -39,7 +39,7 @@ IUSE="binary" DEPEND="virtual/jdk:1.7 >=dev-lang/scala-2.10.6:${SV}" -RDEPEND="|| ( virtual/jre:1.7 virtual/jre:1.8 ) +RDEPEND=">=virtual/jre-1.7 dev-lang/scala:*" # test hangs or fails diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index db56b5136c55..9fa582d04fd4 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,5 +1,3 @@ -DIST tomcat-native-1.1.32-src.tar.gz 387267 SHA256 26936848f727e162f513bd2b5f7b2300d7d716a5e92e5f4ebcd0e1eff8e09584 SHA512 695f710f91cf720b3115f9933f5dab56e7465ee0fcf6508b53d1de172ba59165b08f27b3cdfef741b60dbf0b3da97ae3ea87c5a0ef9f1d879a9820259197dcba WHIRLPOOL 587c25124ab5b07365a0c26ee558086b690d6b0cb568f6670ecd7b8a79a25fa74091bc7a10574732b96600eca0ae4141119adc40c51b45c7ef87de631a38aeb8 DIST tomcat-native-1.1.33-src.tar.gz 388787 SHA256 523dde7393c57307eedf4972ebbe19a9e9af6f7699e3b1ef6dabd7a11677866e SHA512 62b3c806cd926ca13878b514714a422f4a5d932ccaee4cc328c101cfa92fd890f708d1fb429320a42f1e340b46f70c82a07b9ecf6cbd9d03c0e719b95e24e09b WHIRLPOOL afb57fdf32becae8860ed042d74e27a7208759c4a7c16163148e65c986b4dcfa9521e83bbe0a3fa6874a87f577be2ad31a043d3ec1888c11faec7ace21035419 -DIST tomcat-native-1.2.2-src.tar.gz 400183 SHA256 9bd4deb1a816efda8208bfb4f55ee1689571e1d05a5c1e84faf2ad1021a9cae6 SHA512 2e1aa3fd473824fe35b4aa9b53b6d4d674086902132139aa2930e0ecd0336e177ef0f29e114415122525722653ee4475758d1af1e99e5121341b293354f48a96 WHIRLPOOL 6637002a9aeb0a18d4580a51c0e060f95d854249c17e34324b0d8af43d5f07b2943192655a9dc3fd952b9702e174a337005e61a9f0f5f51c472c6156d5b4c60a DIST tomcat-native-1.2.3-src.tar.gz 387023 SHA256 36bf786371742c98ca8b167d3cb59ad2162169bdcaab122da8d0e923dc10742f SHA512 3e64525d1801d776ba9d0cfa568bfcec74144160354b376be078afb30d506adfdbadaf84a76ab557963ba64fc333c589a73e917faea020cdcf33e36e316945af WHIRLPOOL 2681e27bced3da011a585d9d455d10bfa16cd167093869a515fa582cf2608cfd5ff68e9b3575741b3c62bd0840036fd8b436314eaeb5a4475ed339d97b9a4b54 DIST tomcat-native-1.2.4-src.tar.gz 387352 SHA256 29d53d4646229a839ccb71b7b3caa25c256aab1965c33cc9d140247213b9b171 SHA512 c080867510fb9006832172ee0b1997cee067c6e0275b3f9bdf94f69c14b9a02317352d9cadd8a41d366fb5f25c42f7f8af419e0b699aaa5eefee20db96559e97 WHIRLPOOL bf0acc6a78a79b51d3802fb1e1bfb0ec3e71993723a1be58c5ac14d6d24bab6e54fc9d505e4d5c0852ce335b6edc47c6b57f99055c875258fa0414a702e06fb2 diff --git a/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild deleted file mode 100644 index 30e70b6f707a..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.1.32.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit base eutils java-pkg-2 - -DESCRIPTION="Native APR library for Tomcat" - -SLOT="0" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" -HOMEPAGE="http://tomcat.apache.org/" -KEYWORDS="amd64 x86" -LICENSE="Apache-2.0" -IUSE="" - -RDEPEND="=dev-libs/apr-1* - dev-libs/openssl - >=virtual/jre-1.5" - -DEPEND=">=virtual/jdk-1.5 - ${RDEPEND}" - -S=${WORKDIR}/${P}-src/jni/native - -src_configure(){ - econf --with-apr=/usr/bin/apr-1-config \ - --with-ssl=/usr || die "Could not configure native sources" -} - -src_compile() { - base_src_compile -} - -src_install() { - emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so" -} - -pkg_postinst() { - elog - elog " APR should be available with Tomcat, for more information" - elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html" - elog - elog " Please report any bugs to https://bugs.gentoo.org/" - elog -} diff --git a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild deleted file mode 100644 index fdadfd936126..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.2.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Native APR library for Tomcat" - -SLOT="0" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz" -HOMEPAGE="http://tomcat.apache.org/" -KEYWORDS="amd64 x86" -LICENSE="Apache-2.0" -IUSE="test" - -RDEPEND="dev-libs/apr:1 - dev-libs/openssl:= - >=virtual/jre-1.7" - -DEPEND=">=virtual/jdk-1.7 - test? ( dev-java/ant-junit:0 )" - -S=${WORKDIR}/${P}-src - -src_configure(){ - cd native || die - econf --with-apr=/usr/bin/apr-1-config \ - --with-ssl=/usr || die "Could not configure native sources" -} - -src_compile() { - eant jar -f build.xml - - cd native || die - default -} - -src_install() { - java-pkg_newjar "dist/${P}.jar" "${PN}.jar" - - cd native - emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so" -} - -src_test() { - java-pkg-2_src_test -} - -pkg_postinst() { - elog - elog " APR should be available with Tomcat, for more information" - elog " please see http://tomcat.apache.org/tomcat-6.0-doc/apr.html" - elog - elog " Please report any bugs to https://bugs.gentoo.org/" - elog -} diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 3d503f72259c..dde1368bdcd9 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -2,6 +2,7 @@ DIST apache-tomcat-4.1.36-src.tar.gz 3715200 SHA256 51f9139f10cd865fc331cf5def49 DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653b1e24b31c2f09b7a29235e92d65025f7a334 SHA512 32c605aad92b7d554b9e0f28a4d3e707b3cbfc0661a969eb2479512517f8e9e8848b820132d711c41f5c0fa863028b38e1fa903e7c0205599e9e58a86ab4733a WHIRLPOOL d3bca642fd8d5ad73dadf8864ebd0a75146adc805c298d0fd5ad26ab2d4d93293a9ea83d4190e64accd3a7cd38bebc1580dcc266f9a81c4472bacb37598acef7 DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97 +DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild new file mode 100644 index 000000000000..d54ca242c881 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.45.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_A="apache-${P}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="2.5" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${MY_P}" + +java_prepare() { + cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml" + rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die + find -name '*.jar' -delete || die +} + +src_install() { + java-pkg_dojar "${S}"/output/build/lib/*.jar + use source && java-pkg_dosrc java/javax +} diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest index 6b5c04552fbf..087a7c1b56af 100644 --- a/dev-ml/core/Manifest +++ b/dev-ml/core/Manifest @@ -1 +1,2 @@ DIST core-113.24.00.tar.gz 806394 SHA256 66ab36a4d7b78a4710f992c670777919ae329dcbe107f270239a2215d87dce81 SHA512 ec3682ed9bb15d2bf8f9063930249f3657b34a3edda1a3b69bfcf5d50cd9d59fb6fbbc795d01a695da0897bb2673c80449972de80f4b4f60df9bab831ee1d5d4 WHIRLPOOL c5381a69901d9adc87b9814fa8cd9547ba4898a0536a634f48cee3dbdb0b3bb15c6ef2c834767047a1f8d40a1517771a0d6b79014fc4b2c9d937014c603f97a3 +DIST core-113.24.01.tar.gz 806424 SHA256 16470035f9e21e8accdaa3286c3e353f60c485402323644fd231412fccf6d9c6 SHA512 8bfe45a1d0a1973ae7cd317fd6c71d2bb3a6170e432f735e6504586cd4d51b29dec972588478f4abdc7d20d6967ca58afa3ecb5a18871c807437bf8b73e063ec WHIRLPOOL 3bbc8c54140d6277885c37a525af1467ea1c30c7bc4d9dd55738432eca7e4460fed55c7499aad35a46cff324492b0797c40919f926856d6c9d5cc7fd7728705d diff --git a/dev-ml/core/core-113.24.01.ebuild b/dev-ml/core/core-113.24.01.ebuild new file mode 100644 index 000000000000..2f4f48eadcf4 --- /dev/null +++ b/dev-ml/core/core-113.24.01.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +OASIS_BUILD_DOCS=1 +OASIS_BUILD_TESTS=1 + +inherit eutils oasis + +MY_P=${P/_/\~} +DESCRIPTION="Jane Street's alternative to the standard library" +HOMEPAGE="http://www.janestreet.com/ocaml" +SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" + +LICENSE="LGPL-2.1-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-ml/bin-prot-113.24.00:= + >=dev-ml/core_kernel-113.24.00:= + >=dev-ml/fieldslib-113.24.00:= + dev-ml/ppx_assert:= + dev-ml/ppx_bench:= + dev-ml/ppx_driver:= + dev-ml/ppx_expect:= + dev-ml/ppx_inline_test:= + dev-ml/ppx_jane:= + >=dev-ml/sexplib-113.24.00:= + dev-ml/typerep:= + dev-ml/variantslib:= +" +DEPEND="${RDEPEND}" + +src_configure() { + emake setup.exe + OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure +} + +src_compile() { + emake +} + +src_install() { + opam-installer -i \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + ${PN}.install || die + dodoc CHANGES.md README.md +} diff --git a/dev-ml/ppx_bin_prot/Manifest b/dev-ml/ppx_bin_prot/Manifest index d553bfaa2200..8b6abf3714b4 100644 --- a/dev-ml/ppx_bin_prot/Manifest +++ b/dev-ml/ppx_bin_prot/Manifest @@ -1 +1,2 @@ DIST ppx_bin_prot-113.24.00.tar.gz 68599 SHA256 e54749d90801c726cff6a2df97f25b37fdc02d182813152e09c1f1b0f800da08 SHA512 990a202e61c38ded24b8ab268b36c7d50c99108188f64d6734afe2507ed695a8bb300ba4babf2d5d7e3d7f6eb049f75c8b666d526dd117a41a03f6983faab121 WHIRLPOOL 7bc7fde7169e39d043996aa9385e1679b481736d5621a8f861d7ffdfc563410baf7d8a89ba47cef418b3a2c9b1173f10891eb71a7e3ae36bd1e51a2f1975ae0b +DIST ppx_bin_prot-113.24.01.tar.gz 68281 SHA256 142161bbf424adca3645253e5d5b27a37d4bfc4a748b936e8ba644bce5fef0dd SHA512 64558b0788242a364f08be59a1eccdfd382259717289457b150682df88e01f25e7e18e0633bde3fc597f0e242782f5a285d9ff1b44c4d155871272e0ab1faf0e WHIRLPOOL df6f5c3288ce4be2e1b66ad6cc0474d2adad3405296952505a6e625a602bdc46fa76fe3b0bc1959cad87769bb2d51a99b31e3889027a258c0f2fde4c4cf06f79 diff --git a/dev-ml/ppx_bin_prot/ppx_bin_prot-113.24.01.ebuild b/dev-ml/ppx_bin_prot/ppx_bin_prot-113.24.01.ebuild new file mode 100644 index 000000000000..50cf6692c41d --- /dev/null +++ b/dev-ml/ppx_bin_prot/ppx_bin_prot-113.24.01.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit oasis + +MY_P=${PN/-/_}-${PV} +DESCRIPTION="Generation of bin_prot readers and writers from types" +HOMEPAGE="http://www.janestreet.com/ocaml" +SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="dev-ml/ppx_tools:= + dev-ml/ppx_core:= + dev-ml/ppx_type_conv:= + >=dev-ml/bin-prot-113.24.00:= + " + +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} dev-ml/opam" + +S="${WORKDIR}/${MY_P}" + +src_configure() { + emake setup.exe + OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure +} + +src_compile() { + emake +} + +src_install() { + opam-installer -i \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + ${PN}.install || die + dodoc CHANGES.md +} diff --git a/dev-ml/ppx_jane/Manifest b/dev-ml/ppx_jane/Manifest index 3b546f13905c..4236540e93e2 100644 --- a/dev-ml/ppx_jane/Manifest +++ b/dev-ml/ppx_jane/Manifest @@ -1 +1,2 @@ DIST ppx_jane-113.24.00.tar.gz 51938 SHA256 4a49fb16db18c577d720dc1878e4566c8530c3bc5601335d1c0657a38cb639ed SHA512 048d5971f2d92f435d33b8202356efb20c4453234753071e9a8f513c7ef9310e38d1cad1f7d85a4fbfd9833298c819793401b590e77912956ad83d57a11cd602 WHIRLPOOL a155d5b38b6ce5cb82d96aad2c1d8d84904a9a1734f1314b59f8560e274f6501885c5ac3b4f92d97defe67a45770f5f6263c960ca4a7307907676623cd854e3a +DIST ppx_jane-113.24.01.tar.gz 51453 SHA256 a7d21547b58600a1d9639d815f82ea4884cd03af8861961a0201d3190cbad081 SHA512 89f8722295f9861aff74499d6817a2807390231569e4fc04a515e7680207b5ca19689e50933baabb2cff5022341cc1dff524fd9cdf4d6eaee282d95443ea285c WHIRLPOOL 20180f3a6cb56315407d513503859691838aaa86cc8a87e0bfbb55343a7ed3fff2aadb0e552decdf4eb957b3da05e85e6125e54c3efe7c67c808be1b414c1d3a diff --git a/dev-ml/ppx_jane/ppx_jane-113.24.01.ebuild b/dev-ml/ppx_jane/ppx_jane-113.24.01.ebuild new file mode 100644 index 000000000000..ecba476d46ff --- /dev/null +++ b/dev-ml/ppx_jane/ppx_jane-113.24.01.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit oasis + +DESCRIPTION="Standard Jane Street ppx rewriters" +HOMEPAGE="http://www.janestreet.com/ocaml" +SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="dev-ml/ppx_tools:= + dev-ml/ppx_assert:= + dev-ml/ppx_bench:= + dev-ml/ppx_bin_prot:= + dev-ml/ppx_compare:= + dev-ml/ppx_custom_printf:= + dev-ml/ppx_driver:= + dev-ml/ppx_enumerate:= + dev-ml/ppx_expect:= + dev-ml/ppx_fail:= + dev-ml/ppx_fields_conv:= + dev-ml/ppx_here:= + dev-ml/ppx_inline_test:= + dev-ml/ppx_let:= + dev-ml/ppx_pipebang:= + dev-ml/ppx_sexp_conv:= + dev-ml/ppx_sexp_message:= + dev-ml/ppx_sexp_value:= + dev-ml/ppx_typerep_conv:= + dev-ml/ppx_variants_conv:= +" +RDEPEND="${DEPEND}" +DEPEND="${DEPEND} dev-ml/opam" + +src_configure() { + emake setup.exe + OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure +} + +src_compile() { + emake +} + +src_install() { + opam-installer -i \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + ${PN}.install || die + dodoc README.md +} diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest index 3d70c47b1ba4..77036cc6e97d 100644 --- a/dev-php/pecl-mailparse/Manifest +++ b/dev-php/pecl-mailparse/Manifest @@ -1,2 +1,3 @@ DIST mailparse-2.1.6.tgz 36538 SHA256 73705197d2b2ee782efa5477eb2a21432f592c2cb05a72c3a037bbe39e02b5cc SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374 WHIRLPOOL 238f209a45d83eb9b91cf34f1398ff85c538e8273f73791d4736b15e21de3d48395fd0b838e927cd9dd247bff265782c3e96c87b1d90e73bffc1e6b04beea1ba DIST mailparse-3.0.0.tgz 37878 SHA256 92a80f7d2cda597ca75186531006b802fa278f33d1b3b854420f48832e5bc7da SHA512 2aef70edc5400c7c45847ca57e733897d7fe844fa7550d3091bbc75b1ef459dff2a48f438ca04330379b57e62ed96081ea1fbea9e13ac0e873e906f4d92c1d9f WHIRLPOOL 26114676026dc7890d476db78e67447b28b3d037e55e6402c6e220dff2a410e91ddd0cf2579536143db67ad5155cdd3893c3b1059cc067c1c1338be51e5c94fb +DIST mailparse-3.0.1.tgz 38226 SHA256 42ee10de881a3739acf73ddef8800d80c3c57f70072f41bdb22e6e87ebc9cc62 SHA512 42318d145c49644b0a1aea0e18aa3c6899f8ee2a8def7b9c22f7c02737426de22aba00a4c899a269b1d8e64c190654413d857622c882b92caa07f201620f1e61 WHIRLPOOL 0f451f7059e983cc95b87672da07c241be94393b504d44a3faf096be10de4d270191a20591ce2e7fa12ad5572424064a6f10480a769ec5f0b4e09f4638c294dd diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.1.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.1.ebuild new file mode 100644 index 000000000000..688047638df4 --- /dev/null +++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PHP_EXT_NAME="mailparse" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS="README" + +USE_PHP="php7-0" + +inherit php-ext-pecl-r2 + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + +DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +for target in ${USE_PHP}; do + phpslot=${target/php} + phpslot=${phpslot/-/.} + PHPUSEDEPEND="${PHPUSEDEPEND} + php_targets_${target}? ( dev-lang/php:${phpslot}[unicode] )" +done + +RDEPEND="${PHPUSEDEPEND}" +DEPEND="${RDEPEND} + dev-util/re2c" diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest index f7c47073b7ae..2f698e9aa542 100644 --- a/dev-python/keyring/Manifest +++ b/dev-python/keyring/Manifest @@ -7,3 +7,4 @@ DIST keyring-3.7.zip 89249 SHA256 e187358e6a9b8e63cc2e223f6f9d4c40c972c0076f4aa0 DIST keyring-4.0.zip 83738 SHA256 ea93c3cd9666c648263df4daadc5f34aeb27415dbf8e4d76579a8a737f1741cf SHA512 e16fe24e9dfa897ecf05c5b269fd490abff654a885c8cf928d133943648fef436555832e3a364698fe7615be609e8b13808ebe6a758612c12d9067dbe6286bd1 WHIRLPOOL 4ff17622cb9d0bbb3af44947cab2436931f5738c3d4e9ddab36923b2c005c66f27f795acf0614d8d37a6cc148bb74124d9f2ae24a9727ea9a4e71db120a56ab8 DIST keyring-8.2.tar.gz 34682 SHA256 89d5392dfb82dce6610845a8dc52541ec7e46204fafe242d5c6994216cdc3580 SHA512 34f98de8fea9a3836d63f74714304d47bab77f737326b8c109d97f2fbe84e56958fe679e5499d498505e799f51be843e163c37114cc51bc46d9a68431f5a5446 WHIRLPOOL ac8fb612e25469f9ff00dcd9e8e73518c07da19973616e9b6941344396385dce1a036773541e9978bc432d0528e5fc5e86a50d2ff911a7cdba428223aa10cb0c DIST keyring-8.3.tar.gz 33864 SHA256 284f754d86bd176cd44f57fdc33b9d0decc0cdfc38f06eec649b5b1f93e40dc2 SHA512 96191b830b73ea35a0cfde53143f5d458f3afc36c8c1eb00852e9521d468007f7abee7921279ce975658902db8919da419d0b0a34d21073748353f6e8a4a5c59 WHIRLPOOL c768730fce8368bda90e038e47bdefb8058d873102b7e3e68691959550f7159144b3c0b71cf2ea4de5240508d8ce8de1e81d0aa55aba2748d8901d4e220fd469 +DIST keyring-8.4.tar.gz 34271 SHA256 45c54d972515514bc2464d9eae51e83cdd5955ccb8f6443541b03f0ea6d5196c SHA512 f6cb1cc64f70f40920460ae09f814a3167e21cb96566d3d23d6722e294ce1f5da29984b09d440982663b9aebc7ee75a1fb7a1448e69040ecbc40319c0ca07af4 WHIRLPOOL af197a05bc226406aaafea5a475d09ccd4b854af7986f0f7c5eb20e000426cda8bd0b3b6a29cfad52bf337620fa556502a42935618f93ec4b3b8165318edb8b2 diff --git a/dev-python/keyring/keyring-8.4.ebuild b/dev-python/keyring/keyring-8.4.ebuild new file mode 100644 index 000000000000..1d64631917db --- /dev/null +++ b/dev-python/keyring/keyring-8.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Provides access to the system keyring service" +HOMEPAGE="https://github.com/jaraco/keyring" +SRC_URI="mirror://pypi/k/${PN}/${P}.tar.gz" + +SLOT="0" +LICENSE="PSF-2" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}] + test? ( + dev-python/pytest-runner[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/gdata[$(python_gen_usedep 'python2*')] + dev-python/keyczar[$(python_gen_usedep 'python2*')] + dev-python/pycrypto[$(python_gen_usedep 'python*')] + )" +RDEPEND="" + +python_test() { + py.test -v -v || die "testsuite failed under ${EPYTHON}" +} diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index 106fa6bc7f85..fe9bae1d25e9 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -13,3 +13,4 @@ DIST setuptools-19.6.2.tar.gz 641373 SHA256 69261eefdb21057cfbe92ba8032b923d6363 DIST setuptools-19.6.tar.gz 641502 SHA256 ecd48d753c1a8ecc6a2826b863a6defaafbfd4ceafc0c1d62e5362f5a86912e9 SHA512 79b9a0f595bda16f18997d9937c6bc2e21bb2bb23fcca4be29df2fb71649c5ba973428472e3c795f2a5d6fbcccf1d5f29096a0fb593a4c52fa87b1d003e474da WHIRLPOOL 391f3e20739c717cc42613e099b867ee01cd8a1f3623f31062dee23131c3b1bad2e34345348f76e44ff2b92652cf65931b3fd8b6a7663b9c135a7c03b6954405 DIST setuptools-19.7.tar.gz 641634 SHA256 9e0783f3e6b736530a84980dce99fb0f01dafcd31b3f600cde2aa446f6f77cc0 SHA512 fe74b10eb1afef5d78cc5cd4d6dbd53ed16f975c693c138181dfb1661276255d214037eb036186d0cdc9dd31d636f9f1067d67bf591542e8ef933afca267ee4c WHIRLPOOL e1ee325d3de9a6b0dfd49fc68129271faeaccf5ffb77a750f553986fc47b75a5003c17a3f00d76be15eb3808d04e7060f5ccddb9ca9c804fbb68ad54c01453f4 DIST setuptools-20.0.tar.gz 641692 SHA256 a6f7b295f399fed3de918c4bea9e2053a5fbd9e3a55a6fef7aafe9d1f474866d SHA512 c77b8f963c1c2735014f344cb3fba6ab88fc034ea32e52501a19430538db4bc6217706532ac3427f928d55b9a2321a0948f57aca5c7a01020868efc9231dd174 WHIRLPOOL 2d2a1bb7c5ea4ace4da1ddceb6f03605858be10f8c835f8aee9be896041c3c84680f6f09edc4cbcefc99a209d6b3a9ca50f2413a8e226861ceee135543e409d3 +DIST setuptools-20.1.1.tar.gz 641777 SHA256 2663ce0b0e742ee27c3a06b2da14563e4f6f713eaf5509b932a31793f9dea9a3 SHA512 72da2f5a4e07c14975b3e13246264cb4b9eb52bd6da22fce0ef0f0bb8d902249067e6c23bf263cda45de92a0cdb794f454dff95e52505045e03c7a6ab28cb2ca WHIRLPOOL d2f3f0fd31f4b7d35178c14cd411dae0b011c3f9efd8a7dea4cde24bee1e462758a9662e989ddea7777b111c6162e7d035cf924517e7e6bdcab0b3277d7765e1 diff --git a/dev-python/setuptools/setuptools-20.1.1.ebuild b/dev-python/setuptools/setuptools-20.1.1.ebuild new file mode 100644 index 000000000000..300425331f6d --- /dev/null +++ b/dev-python/setuptools/setuptools-20.1.1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) + +inherit distutils-r1 + +DESCRIPTION="Collection of extensions to Distutils" +HOMEPAGE="https://pypi.python.org/pypi/setuptools" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="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 ~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}] + >=dev-python/six-1.10.0[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + test? ( + >=dev-python/pytest-2.8[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" +PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" + +# Force in-source build because build system modifies sources. +DISTUTILS_IN_SOURCE_BUILD=1 + +DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) + +python_prepare_all() { + rm -r ./pkg_resources/_vendor || die + # disable tests requiring a network connection + rm setuptools/tests/test_packageindex.py || die + + # don't run integration tests + rm setuptools/tests/test_integration.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg + # It tries to sandbox the test in a tempdir + HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" +} + +python_install() { + export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 + distutils-r1_python_install +} diff --git a/dev-util/cccc/Manifest b/dev-util/cccc/Manifest index 6f70191c212e..42d83a87b176 100644 --- a/dev-util/cccc/Manifest +++ b/dev-util/cccc/Manifest @@ -1 +1 @@ -DIST cccc-3.1.4.tar.gz 632007 SHA256 27b3eca9a83a66799332363a80cc4bcd6db9869eddbda1a59a25cdace3ff4dbf SHA512 54b8838e228cd435497bac1fd3f1fe3bf2043871fe1046dd80b4382b08a7b249009aa5b06d5318868bbded31c31b45ec705c70abf3969f02b9680c3adb72a231 WHIRLPOOL bc432ad8247bf2da146db7d7a58af1c7344f5701198d8d9da8bc6e0491aa18fa901e70bb009aceb0356dc52059959d0045c848ec8f3bfe30aeb09cff973e18e2 +DIST cccc-3.1.5.tar.gz 662760 SHA256 6fe91eae83ad0ff4c1fe4277aabb6e7554a4dec1bb266b5657c064ef48a23142 SHA512 61544669a75ff7bd99c6ff5bb1e6ec163f2a09f4538493fe60e8f9f95eab7ba19ad6d39b6717ae010a223b8efe48c497a4feb8ead218e350ee2ab91b9c52c969 WHIRLPOOL 085d897eec29bc6de7fee35261bcde2228bb76e85799a6528d7ff9364712489368ad5f899f8c170169fb9b01931e4b846fd5c63b98b640c733640d10685c100f diff --git a/dev-util/cccc/cccc-3.1.4-r1.ebuild b/dev-util/cccc/cccc-3.1.4-r1.ebuild deleted file mode 100644 index 4a2492e9a21a..000000000000 --- a/dev-util/cccc/cccc-3.1.4-r1.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 - -inherit eutils toolchain-funcs flag-o-matic - -DESCRIPTION="Source code metrics (line counts, complexity, etc) for Java and C++" -HOMEPAGE="http://cccc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc" - -RDEPEND="" -DEPEND="${RDEPEND}" - -MAKEOPTS="-j1" - -src_prepare() { - # fix new C++ syntax error - epatch "${FILESDIR}"/${P}-whitespace-and-unqualified-lookup.patch - - sed -i -e "/^CFLAGS/s|=|+=|" pccts/antlr/makefile - sed -i -e "/^CFLAGS/s|=|+=|" pccts/dlg/makefile - sed -i -e "/^CFLAGS/s|=|+=|" \ - -e "/^LD_OFLAG/s|-o|-o |" \ - -e "/^LDFLAGS/s|=|+=|" cccc/posixgcc.mak - #LD_OFLAG: ld on Darwin needs a space after -o -} - -src_compile() { - emake CCC=$(tc-getCXX) LD=$(tc-getCXX) pccts - - append-cflags "-std=c++98" - emake CCC=$(tc-getCXX) LD=$(tc-getCXX) cccc -} - -src_install() { - dodoc readme.txt changes.txt - use doc && dohtml cccc/*.html - cd install || die - dodir /usr - emake -f install.mak INSTDIR="${ED}"/usr/bin -} diff --git a/dev-util/cccc/cccc-3.1.5.ebuild b/dev-util/cccc/cccc-3.1.5.ebuild new file mode 100644 index 000000000000..e0fb42320fd7 --- /dev/null +++ b/dev-util/cccc/cccc-3.1.5.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils toolchain-funcs flag-o-matic + +DESCRIPTION="Source metrics (line counts, complexity, etc) for Java and C++" +HOMEPAGE="http://sarnold.github.io/cccc/" +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/sarnold/cccc.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="apidoc debug doc mfc" + +RDEPEND="" +DEPEND="${RDEPEND} + apidoc? ( app-doc/doxygen[dot] ) + " + +MAKEOPTS="-j1" + +src_prepare() { + use mfc && epatch "${FILESDIR}"/${PN}-c_dialect.patch +} + +src_compile() { + if use debug ; then + export STRIP_MASK="*/bin/*" + DEBUG="true" emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc + else + emake CCC=$(tc-getCXX) CC=$(tc-getCC) cccc + fi + + use apidoc && emake CCC=$(tc-getCXX) metrics docs +} + +src_test() { + emake CCC=$(tc-getCXX) test +} + +src_install() { + dobin cccc/cccc + + dodoc README.md + + if use mfc ; then + dodoc "${FILESDIR}"/cccc-MFC-dialect.opt + docompress -x "/usr/share/doc/${PF}/cccc-MFC-dialect.opt" + fi + + if use doc ; then + dodoc CHANGELOG.md HISTORY.md + dohtml cccc/*.html || die "html docs failed" + if use apidoc ; then + docinto api + dohtml -A svg -r doxygen/html || die "dox failed" + docompress -x "/usr/share/doc/${PF}/api" + docinto metrics + dohtml ccccout/* || die "metrics failed" + fi + fi +} diff --git a/dev-util/cccc/metadata.xml b/dev-util/cccc/metadata.xml index 095797bdec3b..08fec3d474ac 100644 --- a/dev-util/cccc/metadata.xml +++ b/dev-util/cccc/metadata.xml @@ -1,8 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <herd>dev-tools</herd> + <maintainer type="person"> + <email>nerdboy@gentoo.org</email> + </maintainer> + <longdescription lang="en"> + cccc provides source code metrics (line counts, complexity, + object-oriented, and structural metrics) for Java and C++ + </longdescription> <upstream> - <remote-id type="sourceforge">cccc</remote-id> - <bugs-to>http://sourceforge.net/tracker/?group_id=7763</bugs-to> + <remote-id type="github">sarnold/cccc</remote-id> + <bugs-to>https://github.com/sarnold/cccc/issues</bugs-to> </upstream> + <use> + <flag name="apidoc">Build software docs with doxygen/graphviz and metrics with cccc</flag> + <flag name="mfc">Add patch for MFC dialect options</flag> + </use> </pkgmetadata> diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest new file mode 100644 index 000000000000..d6f46d9a81ac --- /dev/null +++ b/media-libs/embree/Manifest @@ -0,0 +1 @@ +DIST embree-2.8.0.tar.gz 1728824 SHA256 5d070241141161d7ec46fcc7fb9998226738c37e1c4a16b93420dba7d9068b81 SHA512 df9e9a66a8f5972bf22eb7d03d8d6cd17f06a10105f7f42cb6866d76cd203c94496df808558e9aad8b407e7e7d962c0f543d49cd86784f877206654414f3d162 WHIRLPOOL 9685a525d4ee9788ddce3f5e6e20729f619484790e412d22e8e58aac825ad70dbb825b48bf515f10ca8e1c330899fa565912cc4aefe2844c9ec8dea22387ac68 diff --git a/media-libs/embree/embree-2.8.0.ebuild b/media-libs/embree/embree-2.8.0.ebuild new file mode 100644 index 000000000000..6f6926dd376b --- /dev/null +++ b/media-libs/embree/embree-2.8.0.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit cmake-utils multilib toolchain-funcs flag-o-matic + +DESCRIPTION="Collection of high-performance ray tracing kernels" +HOMEPAGE="https://embree.github.io" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="imagemagick ispc jpeg openexr png static-libs" + +RDEPEND="dev-cpp/tbb + media-libs/freeglut + imagemagick? ( + || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx] ) + ) + ispc? ( dev-lang/ispc ) + jpeg? ( virtual/jpeg:0 ) + openexr? ( media-libs/openexr ) + png? ( media-libs/libpng:0 )" +DEPEND="${RDEPEND}" + +src_prepare() { + filter-flags "-march=*" + sed -e "s:PREFIX}/lib:PREFIX}/$(get_libdir):g" \ + -e "s:lib/cmake:$(get_libdir)/cmake:g" \ + -e "/LICENSE.txt/d" \ + -e "/DIRECTORY tutorials/d" \ + -i common/cmake/package.cmake || die + sed -e "s/gcc/$(tc-getCC)/" \ + -e "s/g++/$(tc-getCXX)/" \ + -e "s/-fPIC/${CXXFLAGS} &/" \ + -i common/cmake/gcc.cmake || die + sed -e "/COMPONENT lib/ s/\(DESTINATION \)lib/\1$(get_libdir)/g" \ + -i kernels/xeon/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_TUTORIALS=OFF + $(cmake-utils_use_enable static-libs STATIC_LIB) + $(cmake-utils_use_enable ispc ISPC_SUPPORT) + $(cmake-utils_use_use jpeg LIBJPEG) + $(cmake-utils_use_use png LIBPNG) + $(cmake-utils_use_use imagemagick IMAGE_MAGICK) + $(cmake-utils_use_use openexr OPENEXR) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so +} diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml new file mode 100644 index 000000000000..b4dc96f8ab86 --- /dev/null +++ b/media-libs/embree/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>xarthisius@gentoo.org</email> + <name>Kacper Kowalik</name> + </maintainer> + <use> + <flag name="ispc">Enables support for the Intel SPMD Program Compiler.</flag> + <flag name="imagemagick">Enables BMP, GIF, PNG, TGA, TIFF image codecs.</flag> + <flag name="png">Enables PNG image codecs.</flag> + <flag name="jpeg">Enables JPEG image codecs.</flag> + <flag name="openexr">Enables OpenEXR image codecs.</flag> + </use> +</pkgmetadata> diff --git a/media-libs/opengtl/Manifest b/media-libs/opengtl/Manifest deleted file mode 100644 index 74e031052b1d..000000000000 --- a/media-libs/opengtl/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST OpenGTL-0.9.18.tar.bz2 536113 SHA256 f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8 SHA512 101c200641d93eb2a31c75bdc80ccc7d7e7f79ea7cf2d4280205e86d2a6ca6357444055dab8a8e4b882067f1aad8b6746a4821d0209a0e53393ce3965b42fb50 WHIRLPOOL 735ea8f1af4b4ca83a441f50362e7a0840487629ec29576374d8e4b757a7ef616b5cbe746b3cfaa34e0532e653026c5d56f2ebb675e9c05acd47e8c3d3ddde42 -DIST opengtl-0.9.18-llvm-3.3.patch 27930 SHA256 c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c SHA512 1c1d09e08ed1a00c57c86632c4d27edb9fac436e6e86638f176aead513ba3b1bc5216d2d07fa8fbf570156dc0a20e18e8c29f776a180d638cfb4ca6d1d8ea3b7 WHIRLPOOL 3edbe720a563516f38f3bd1650d5bc7ae258447be2432a41d14432bb6a2c3b7bf5e6ef0ac62b45a34fd77a4a0cf9053b01f0a3432e7f76ed96c526a3c970913c diff --git a/media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch b/media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch deleted file mode 100644 index 3e6ecd557f41..000000000000 --- a/media-libs/opengtl/files/opengtl-0.9.18-memcpy.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp ---- a/Extensions/PngDC/PngDC.cpp Wed Jan 30 05:28:12 2013 +1100 -+++ b/Extensions/PngDC/PngDC.cpp Tue Apr 16 01:59:10 2013 +1000 -@@ -20,6 +20,7 @@ - #include "PngDC.h" - - #include <png.h> -+#include <string.h> - - #include <config-endian.h> - diff --git a/media-libs/opengtl/files/opengtl-0.9.18-underlinking.patch b/media-libs/opengtl/files/opengtl-0.9.18-underlinking.patch deleted file mode 100644 index 6e6d1bda0af9..000000000000 --- a/media-libs/opengtl/files/opengtl-0.9.18-underlinking.patch +++ /dev/null @@ -1,30 +0,0 @@ -changeset: 1792:99a2017746c0 -tag: tip -user: Michael Palimaka <kensington@gentoo.org> -date: Wed Jan 30 05:28:12 2013 +1100 -summary: Fix underlinking. - -diff -r e150672a54ad -r 99a2017746c0 OpenGTL/GTLCore/CMakeLists.txt ---- a/OpenGTL/GTLCore/CMakeLists.txt Sat Dec 29 12:27:12 2012 +0100 -+++ b/OpenGTL/GTLCore/CMakeLists.txt Wed Jan 30 05:28:12 2013 +1100 -@@ -10,6 +10,10 @@ - - ## GTLCore library ## - -+if(PTHREAD_FOUND) -+ set(GTLCore_Thread_LIBS pthread) -+endif(PTHREAD_FOUND) -+ - set(GTLCore_SRCS - AbstractColorConverter.cpp - AbstractImage.cpp -@@ -110,7 +114,7 @@ - set(EXTRA_GTLCORE_LINK_OPTIONS -Wl,-u,__ZTVN4llvm3JITE ) - endif() - --target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS}) -+target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} ${GTLCore_Thread_LIBS} ${EXTRA_GTLCORE_LINK_OPTIONS}) - - # Set the ABI version of the library - set_target_properties(GTLCore PROPERTIES VERSION ${OPENGTL_LIB_VERSION} SOVERSION ${OPENGTL_LIB_SOVERSION} ) - diff --git a/media-libs/opengtl/metadata.xml b/media-libs/opengtl/metadata.xml deleted file mode 100644 index 0cf59224b009..000000000000 --- a/media-libs/opengtl/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> -</maintainer> -</pkgmetadata> diff --git a/media-libs/opengtl/opengtl-0.9.18.ebuild b/media-libs/opengtl/opengtl-0.9.18.ebuild deleted file mode 100644 index d90ae8d67514..000000000000 --- a/media-libs/opengtl/opengtl-0.9.18.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 - -MY_P="OpenGTL-${PV}" - -inherit cmake-utils - -DESCRIPTION="Collection of libraries for graphics transformation algorithms" -HOMEPAGE="http://opengtl.org/" -SRC_URI="http://download.opengtl.org/${MY_P}.tar.bz2 https://dev.gentoo.org/~creffett/distfiles/${PN}-0.9.18-llvm-3.3.patch" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="debug test" - -RDEPEND=" - media-libs/libpng:0= - ( - <sys-devel/llvm-3.4 - >=sys-devel/llvm-3.1 - ) -" -DEPEND="${RDEPEND} - app-text/ghostscript-gpl - test? ( dev-util/lcov ) -" - -RESTRICT="test" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-0.9.18-memcpy.patch" - "${FILESDIR}/${PN}-0.9.18-underlinking.patch" -) - -src_prepare() { - if has_version ">=sys-devel/llvm-3.3"; then - epatch "${DISTDIR}/${PN}-0.9.18-llvm-3.3.patch" - fi - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=TRUE - $(cmake-utils_use debug OPENGTL_ENABLE_DEBUG_OUTPUT) - $(cmake-utils_use test OPENGTL_BUILD_TESTS) - $(cmake-utils_use test OPENGTL_CODE_COVERAGE) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newdoc OpenShiva/doc/reference/region.pdf OpenShiva.pdf -} diff --git a/media-sound/gnac/gnac-0.2.4.1.ebuild b/media-sound/gnac/gnac-0.2.4.1.ebuild index 6ee40a00f04e..0b74c860f0cf 100644 --- a/media-sound/gnac/gnac-0.2.4.1.ebuild +++ b/media-sound/gnac/gnac-0.2.4.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit eutils autotools gnome2 +inherit autotools eutils flag-o-matic gnome2 DESCRIPTION="Audio converter for GNOME" HOMEPAGE="http://gnac.sourceforge.net/" @@ -34,10 +34,17 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext ) " +PATCHES=( + "${FILESDIR}/${P}-cflags.patch" + "${FILESDIR}/${P}-nls.patch" +) src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch - epatch "${FILESDIR}"/${P}-nls.patch + default + epatch -p1 "${PATCHES[@]}" + + # fix bug 574568 by restoring pre-GCC5 inline semantics + append-cflags -std=gnu89 eautoreconf gnome2_src_prepare diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch new file mode 100644 index 000000000000..0c61f096c213 --- /dev/null +++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-nptl-hardened.patch @@ -0,0 +1,15 @@ +Fix breakage caused by undefined behaviour. Using PTHREAD_CANCEL_ASYNCHRONOUS +is only allowed in pure functions. +See also: https://bugs.gentoo.org/show_bug.cgi?id=537516 + +--- linuxsampler-2.0.0/m4/nptl_bug.m4 ++++ linuxsampler-2.0.0/m4/nptl_bug.m4 +@@ -47,7 +47,7 @@ + void* __pthread_launcher(void* p) { + // let the thread be killable under any circumstances + // (without this function call, this test always succeeds !) +- pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL); ++ pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL); + + // this will block this 2nd thread, since we already + // locked this mutex by the main thread diff --git a/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild b/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild new file mode 100644 index 000000000000..4806c00cf796 --- /dev/null +++ b/media-sound/linuxsampler/linuxsampler-2.0.0-r1.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools eutils + +DESCRIPTION="LinuxSampler is a software audio sampler engine with professional grade features" +HOMEPAGE="http://www.linuxsampler.org/" +SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc jack sqlite static-libs" + +RDEPEND="sqlite? ( >=dev-db/sqlite-3.3 ) + >=media-libs/libgig-4.0.0 + media-libs/alsa-lib + jack? ( media-sound/jack-audio-connection-kit )" +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen )" +PATCHES=( + "${FILESDIR}/${P}-nptl-hardened.patch" +) + +src_prepare() { + default + # Force regeneration of the file to let it build with all bison + # versions, bug #556204 + rm src/network/lscpparser.cpp || die + eautoreconf +} + +src_configure() { + econf \ + --enable-alsa-driver \ + --disable-arts-driver \ + $(use_enable jack jack-driver) \ + $(use_enable sqlite instruments-db) \ + $(use_enable static-libs static) +} + +src_compile() { + default + use doc && emake docs +} + +src_install() { + default + + docinto html + use doc && dodoc -r doc/html/* + + prune_libtool_files +} diff --git a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch index 920989a01843..9f41ee5adbd7 100644 --- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch +++ b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch @@ -1,5 +1,6 @@ http://devel.aegisub.org/ticket/1902 http://devel.aegisub.org/ticket/1903 +http://devel.aegisub.org/ticket/1911 diff --git a/Makefile.inc.in b/Makefile.inc.in index 5a52d25..86f93d1 100644 @@ -28,3 +29,16 @@ index b021523..77a18ec 100644 $(d)common/charset.o_FLAGS := $(CFLAGS_UCHARDET) $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV) +diff --git a/tools/Makefile b/tools/Makefile +index cbf985a..d9f64b8 100644 +--- a/tools/Makefile ++++ b/tools/Makefile +@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper + endif + + repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a +-repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(PTHREAD_LIBS) ++repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD) + repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU) + + PROGRAM += $(d)repack-thes-dict diff --git a/media-video/mpv/mpv-0.14.0-r1.ebuild b/media-video/mpv/mpv-0.14.0-r1.ebuild index df48b7c37994..40ccf88d0500 100644 --- a/media-video/mpv/mpv-0.14.0-r1.ebuild +++ b/media-video/mpv/mpv-0.14.0-r1.ebuild @@ -177,6 +177,7 @@ src_configure() { $(usex cli '' '--disable-cplayer') $(use_enable libmpv libmpv-shared) + # See deep down below for build-date --disable-libmpv-static --disable-static-build --disable-optimize # Do not add '-O2' to CFLAGS diff --git a/media-video/mpv/mpv-0.15.0-r1.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild index 5de9fb609f72..d30f5e7c20eb 100644 --- a/media-video/mpv/mpv-0.15.0-r1.ebuild +++ b/media-video/mpv/mpv-0.15.0-r1.ebuild @@ -177,6 +177,7 @@ src_configure() { $(usex cli '' '--disable-cplayer') $(use_enable libmpv libmpv-shared) + # See deep down below for build-date --disable-libmpv-static --disable-static-build --disable-optimize # Do not add '-O2' to CFLAGS diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index a7eb17751cf9..cfbfe7bd6642 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -28,12 +28,11 @@ DOCS+=( README.md ) # See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC. LICENSE="GPL-2+ BSD ISC" SLOT="0" -# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver - xv zsh-completion" + +xv zsh-completion" REQUIRED_USE=" || ( cli libmpv ) @@ -43,7 +42,6 @@ REQUIRED_USE=" lcms? ( || ( opengl egl ) ) libguess? ( iconv ) luajit? ( lua ) - opengl? ( X ) uchardet? ( iconv ) v4l? ( || ( alsa oss ) ) vaapi? ( || ( gbm X wayland ) ) @@ -89,6 +87,7 @@ COMMON_DEPEND=" luajit? ( dev-lang/luajit:2 ) ) openal? ( >=media-libs/openal-1.13 ) + opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) rubberband? ( >=media-libs/rubberband-1.8.0 ) samba? ( net-fs/samba ) @@ -103,10 +102,7 @@ COMMON_DEPEND=" x11-libs/libX11 x11-libs/libXext >=x11-libs/libXrandr-1.2.0 - opengl? ( - x11-libs/libXdamage - virtual/opengl - ) + opengl? ( x11-libs/libXdamage ) vdpau? ( >=x11-libs/libvdpau-0.2 ) xinerama? ( x11-libs/libXinerama ) xscreensaver? ( x11-libs/libXScrnSaver ) @@ -174,6 +170,7 @@ src_configure() { $(usex cli '' '--disable-cplayer') $(use_enable libmpv libmpv-shared) + # See deep down below for build-date --disable-libmpv-static --disable-static-build --disable-optimize # Do not add '-O2' to CFLAGS @@ -229,20 +226,21 @@ src_configure() { $(use_enable xv) $(use_enable xinerama) $(use_enable X xrandr) - $(use_enable opengl gl-x11) + $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11') $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11') $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm') $(use_enable wayland gl-wayland) $(use_enable vdpau) $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11') - $(use_enable vaapi) # See below for vaapi-x-egl + $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11') $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland') $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm') - $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx') $(use_enable libcaca caca) $(use_enable jpeg) + --disable-android $(use_enable raspberry-pi rpi) + $(use_enable opengl desktop-gl) # HWaccels $(use_enable vaapi vaapi-hwaccel) @@ -256,10 +254,11 @@ src_configure() { $(use_enable dvb dvbin) ) - if use vaapi && use X && use egl; then - mywafargs+=(--enable-vaapi-x-egl) - else - mywafargs+=(--disable-vaapi-x-egl) + if use vaapi && use X; then + mywafargs+=( + $(use_enable opengl vaapi-glx) + $(use_enable egl vaapi-x-egl) + ) fi # Create reproducible non-live builds diff --git a/profiles/package.mask b/profiles/package.mask index e6d44277c59f..761b6584b3c2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -30,6 +30,10 @@ #--- END OF EXAMPLES --- +# Mike Gilbert <floppym@gentoo.org> (02 Feb 2016) +# Fails to build, will fix it later. +=sys-libs/efivar-0.22 + # Michael Palimaka <kensington@gentoo.org> (12 Feb 2016) # Fails to build. No revdeps. Masked for removal in 30 days. # Bug 574432 @@ -190,11 +194,6 @@ www-apache/mod_auth_pgsql # Errorneously added. Is already in perl-core. Please uninstall. dev-perl/ExtUtils-Constant -# Michael Palimaka <kensington@gentoo.org)> (09 Jan 2016) -# Fails to build with newer versions of llvm. Dead upstream. No revdeps. -# Masked for removal in 30 days. Bug #571212. -media-libs/opengtl - # Pacho Ramos <pacho@gentoo.org> (08 Jan 2016) # Cannot be downloaded either mirrored, bug #561142. Removal in a month games-fps/ut2004-alienswarm diff --git a/sci-astronomy/stellarium/stellarium-0.14.2.ebuild b/sci-astronomy/stellarium/stellarium-0.14.2.ebuild index 35da181c9793..da0458bca99d 100644 --- a/sci-astronomy/stellarium/stellarium-0.14.2.ebuild +++ b/sci-astronomy/stellarium/stellarium-0.14.2.ebuild @@ -30,7 +30,10 @@ RDEPEND=" dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtscript:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 virtual/opengl + sys-libs/zlib sound? ( dev-qt/qtmultimedia:5[widgets] )" DEPEND="${RDEPEND} dev-qt/qttest:5 diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest index ea3afd156f49..c2d9de0f0270 100644 --- a/sys-apps/collectl/Manifest +++ b/sys-apps/collectl/Manifest @@ -1,4 +1,4 @@ DIST collectl-3.7.3.src.tar.gz 457208 SHA256 93c6c130eb89f0ecba1b1b791e80b7e6746fa82f6c4e770feb486ac8fcc53683 SHA512 4e73fc090685933b89c595b3f9f837c28bfbe1d5c3e7ffb5310db309d529779b106dac4f33f337d8b6686175bf7b4ff5af32cbb15b6469517d6e1ddecb6f34f8 WHIRLPOOL f457bbadd556e2372337f78354d0044773989c5914312b80936040494024f367db471e1d735d9cd72bca18611819dd8062b1f24244b8b002c7a035274c1a8772 DIST collectl-3.7.4.src.tar.gz 462752 SHA256 798657b8e3626e9e4ed6fe5ae44b8216da49f0bc4bbda52217d2a304e3d7e108 SHA512 f25686fe977e0a3ea45a1980eea87baaa92a2d81ec308838c137d181e2bf182df6cdf453c5c6e7f3f0b2ccd3066d17ab9c4137303b587f55303dd4afe7ae35da WHIRLPOOL e017e293348644d922547bc99904e5434c0286b8b332509cb062ac92c6a11ff8af2a4ceb275fe82dd9dda11c7774ab9e2e344c9ca5a2d6d25b036a3dab893db0 -DIST collectl-4.0.0.src.tar.gz 618232 SHA256 7c2ecddb8ca0d49222590526d84de93b6593410515aca9aa2099d5a903e01221 SHA512 9f42a2a845ed7954f7a4d18b9c517b2beeac75819ce5fb60a9b45d24ec0ebf4dee54f32868a3e7e72d068de4c32741764a46712f2d9cfb8dbe0b54d56f1fec6d WHIRLPOOL eac180bd4533e59f16b5e117593d9132f1bc809a0f498fe08a1cb8ae57a921ecb7a80357f302e335d55c148b8748972ceb3fe01fb109ca6721938d69494ebe90 DIST collectl-4.0.2.src.tar.gz 618639 SHA256 57474454913709a17ff22e3ac5e3839b7d6596b71aae7f08658f2c73a277622d SHA512 6e4dd377a3c155bcf4bfc613374096365cd9d3af45683408e4872af6814b87b867700ce31077eca8d011d2acd1cf626f9f220d83ef2d0d4dfdf05b80b858f47e WHIRLPOOL ef661ec0481ba4e374e8af3b8cd03a4797c6626523f316eab4456bedc8b4132b3001556b6d358ed614b18c1e7ea8e5ffc9a6ce96e17273f7f5166ab8d3201a16 +DIST collectl-4.0.4.src.tar.gz 623507 SHA256 03fc26ece3e9db6e410b708ada45fdec8c566ad82e67cb933c6ff8c005058ecf SHA512 1bed130fbcf6eea972a733de60c7ff4d1425a324a7c7b9a2cb767655c602d17f1725ff15ed7927cc887b584cdfd78ffd5db19615ca4fe1032715fc4a844c13b8 WHIRLPOOL afdfe4ace4709a2d7a02f8dc991d1cc54de42885a1c81eefebbf5df2ac538826893e58858d41e3864a39e49c13961b2c3c5947c0b53bfd9704ff6f28705c1c77 diff --git a/sys-apps/collectl/collectl-4.0.0.ebuild b/sys-apps/collectl/collectl-4.0.4.ebuild index f54ea2761240..4d43e9230c84 100644 --- a/sys-apps/collectl/collectl-4.0.0.ebuild +++ b/sys-apps/collectl/collectl-4.0.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI=5 DESCRIPTION="light-weight performance monitoring tool capable of reporting interactively and logging to disk" HOMEPAGE="http://collectl.sourceforge.net/" diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest index 30f92de23a00..da51dd9809aa 100644 --- a/sys-apps/debianutils/Manifest +++ b/sys-apps/debianutils/Manifest @@ -1,2 +1,3 @@ DIST debianutils_4.4.tar.gz 272098 SHA256 190850cdd6b5302e0a1ba1aaed1bc7074d67d3bd8d04c613f242f7145afa53a6 SHA512 78c51a7da586c6f23bf40810fd9bcaedc90648e6043c199f347cf5772f9c83ab646f22c2746ba6eddd7df8d6a31b01dc25f5bcb21a53a173aa5549138d14a9ca WHIRLPOOL 9fe7f16d921247eb74a56a865264d14b0cddb9025c1a4d761798494908c948bce7958ea2ee4db3a1b8800add41596ee9dfe6665603bd26a1c7bfd926a74f7f67 DIST debianutils_4.5.1.tar.xz 151080 SHA256 a531c23e0105fe01cfa928457a8343a1e947e2621b3cd4d05f4e9656020c63b7 SHA512 4cdb030946e8063607f102f58d4a1225b0e2795c5e01aeec45740b0a6fa0754013a9ae1239d89a23f6e4bf67e4d67fd669e84ed14b58695aff93a93b6e961b58 WHIRLPOOL c45bea6cd31a0c89665a6755b30a293d518456a5d850af01f49f72cec9526cb6bb9600db90f6124d51f2aab63f868b72eb95e45348c6f23bc5272fe072b54cfd +DIST debianutils_4.7.tar.xz 156276 SHA256 a269cacd40f52f2fa5d5636357714a49e8538459c16d77772efaa23711fe53d9 SHA512 74110d194de8b6b61d40b133b97629520048a8fdedac349ec2031c793c0246526c1c7904e88098b4c2a121e5efba2d724924139ab1aca15d129a4d210f94a1aa WHIRLPOOL a3a8ab13f904d9fa90d663998b48800fe5ceceea01e46434a052ac81caf940376b580d3228822f390587df7806fc0876627ff6cbcfcb0b1f294b4ce5bacd12bd diff --git a/sys-apps/debianutils/debianutils-4.7.ebuild b/sys-apps/debianutils/debianutils-4.7.ebuild new file mode 100644 index 000000000000..41210e560942 --- /dev/null +++ b/sys-apps/debianutils/debianutils-4.7.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic + +DESCRIPTION="A selection of tools from Debian" +HOMEPAGE="http://packages.qa.debian.org/d/debianutils.html" +SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz" + +LICENSE="BSD GPL-2 SMAIL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="kernel_linux static" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch +} + +src_configure() { + use static && append-ldflags -static + default +} + +src_install() { + into / + dobin tempfile run-parts + if use kernel_linux ; then + dosbin installkernel + fi + + into /usr + dosbin savelog + + doman tempfile.1 run-parts.8 savelog.8 + use kernel_linux && doman installkernel.8 + cd debian || die + dodoc changelog control + keepdir /etc/kernel/postinst.d +} diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest index 689cce1ce5bc..d02dbae1bc6a 100644 --- a/sys-apps/firejail/Manifest +++ b/sys-apps/firejail/Manifest @@ -1 +1,2 @@ DIST firejail-0.9.36.tar.bz2 151123 SHA256 db16c93e6f838048b0bbcb3b90aa191f79860382c5197fd2ac6df51f1a469510 SHA512 8b9b7f3dd071825117a45e41c1e33871bf4f7788faf27f322913079a7094e6fa4eb7a94362630664c4b441213c357531a2f9f41bd94ff06c64bc6f8a6ee68fd1 WHIRLPOOL 413bab0edf6259129f75a8242546a2f290366bb3bd1711689fd0530a895262db5e78afee0a90639c9edc59bbcc8f93225003b1f1340f9e1479dd491f26edd1d6 +DIST firejail-0.9.38.tar.bz2 157543 SHA256 b61b15c03a30b92f5ffddc458b6488eedd1cf87ffe22d77d423e5a254efd16bb SHA512 c1f5e0f56eb0fa6796f3b6eb6037aa8ae4c79b2440dfd64d5a656a775ac01c55db71c5a45d85d4ffb456d1d551038f87ad587dc822d470d41dfdc9a6f8eac9fc WHIRLPOOL 78823d088d8b8f2a15d2f68083c75a1ad5c5638a62cc93fb7358db821f813eb7aab3c3aa29b48ab8b5c6b3818571fd2ffa4e8992e101d4bea0f603bbdf4b26a6 diff --git a/sys-apps/firejail/firejail-0.9.36.ebuild b/sys-apps/firejail/firejail-0.9.36.ebuild index 9aaeccd8726f..526940622527 100644 --- a/sys-apps/firejail/firejail-0.9.36.ebuild +++ b/sys-apps/firejail/firejail-0.9.36.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=6 +EAPI=5 DESCRIPTION="Security sandbox for any type of processes" HOMEPAGE="https://firejail.wordpress.com/" diff --git a/sys-apps/firejail/firejail-0.9.38.ebuild b/sys-apps/firejail/firejail-0.9.38.ebuild new file mode 100644 index 000000000000..526940622527 --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.38.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="Security sandbox for any type of processes" +HOMEPAGE="https://firejail.wordpress.com/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+seccomp" + +DEPEND="" +RDEPEND="" + +src_configure() { + econf $(use_enable seccomp) +} diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 1a89016af901..df82d8e5e7f1 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -429,6 +429,7 @@ pkg_postinst() { enewgroup input enewgroup systemd-journal newusergroup systemd-bus-proxy + newusergroup systemd-coredump newusergroup systemd-journal-gateway newusergroup systemd-journal-remote newusergroup systemd-journal-upload diff --git a/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild b/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild index 58359b625708..f25f1e417adc 100644 --- a/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild +++ b/sys-apps/ucspi-unix/ucspi-unix-0.36-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="2" +EAPI="5" inherit eutils toolchain-funcs multilib @@ -15,7 +15,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="" +# We statically link bglibs. DEPEND=">=dev-libs/bglibs-1.106" +# Block other unixcat installers. #480546 +RDEPEND="!net-analyzer/mk-livestatus" src_prepare() { epatch "${FILESDIR}"/${PN}-gentoo-head.patch @@ -27,12 +30,12 @@ src_configure() { local has_peercred use kernel_linux && has_peercred="-DHASPEERCRED=1" - echo "$(tc-getCC) ${CFLAGS} -I/usr/include/bglibs ${has_peercred} -D_GNU_SOURCE" > conf-cc - echo "$(tc-getCC) ${LDFLAGS} -L/usr/$(get_libdir)/bglibs" > conf-ld + echo "$(tc-getCC) ${CPPFLAGS} ${CFLAGS} -I${SYSROOT}/usr/include/bglibs ${has_peercred} -D_GNU_SOURCE" > conf-cc + echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -L${SYSROOT}/usr/$(get_libdir)/bglibs" > conf-ld } src_install() { - dobin unixserver unixclient unixcat || die + dobin unixserver unixclient unixcat doman unixserver.1 unixclient.1 dodoc ANNOUNCEMENT NEWS PROTOCOL README TODO } diff --git a/sys-devel/dev86/dev86-0.16.21-r1.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild index 9942a8284b5a..ab48df42c6ec 100644 --- a/sys-devel/dev86/dev86-0.16.21-r1.ebuild +++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild @@ -58,7 +58,9 @@ src_compile() { export PATH=${S}/bin:${PATH} - ln -s bin/{ncc,bcc} || die + cd bin || die + ln -s ncc bcc || die + cd .. || die cd bootblocks || die emake DIST="${D}" diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest index a3cb25568243..ab7bf592e111 100644 --- a/sys-libs/efivar/Manifest +++ b/sys-libs/efivar/Manifest @@ -1 +1,2 @@ DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd +DIST efivar-0.22.tar.bz2 67384 SHA256 74f9700039c2c77b468ab2e174c17eb97bd5ee427d22b68a0ae0dbf8fd2d6e32 SHA512 45b1b33e6928415f60de460086e6015e62ee65cab531b578b5a7ea78fd9c593220d8df00ee262171eb1ae3fc1bd1b733ce2c87c1dd91c2ac16a59c2764146e81 WHIRLPOOL 7000191aea4dd37639168e279e00ac4493683c956775d5887f37a860b25a76d3b1d1347b596f2cbb321673de7be3e77fcd10a3f155d483c06a0883a6b47fa8ee diff --git a/sys-libs/efivar/efivar-0.22.ebuild b/sys-libs/efivar/efivar-0.22.ebuild new file mode 100644 index 000000000000..e811cf339e46 --- /dev/null +++ b/sys-libs/efivar/efivar-0.22.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils multilib toolchain-funcs + +DESCRIPTION="Tools and library to manipulate EFI variables" +HOMEPAGE="https://github.com/rhinstaller/efivar" +SRC_URI="https://github.com/rhinstaller/${PN}/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~x86" + +RDEPEND="dev-libs/popt" +DEPEND="${RDEPEND} + >=sys-kernel/linux-headers-3.18" + +src_prepare() { + epatch "${FILESDIR}/0.21-nvme_ioctl.h.patch" + epatch "${FILESDIR}/0.22-flags.patch" + epatch_user +} + +src_configure() { + tc-export CC + export libdir="/usr/$(get_libdir)" + unset LIBS # Bug 562004 +} + +src_compile() { + # Avoid building static binary/libs + opts=( + BINTARGETS=efivar + STATICLIBTARGETS= + ) + emake "${opts[@]}" +} + +src_install() { + emake "${opts[@]}" DESTDIR="${D}" install +} diff --git a/sys-libs/efivar/files/0.22-flags.patch b/sys-libs/efivar/files/0.22-flags.patch new file mode 100644 index 000000000000..df49f43af769 --- /dev/null +++ b/sys-libs/efivar/files/0.22-flags.patch @@ -0,0 +1,41 @@ +From 5bc17590cb096340fc695da3020883130437d745 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Fri, 12 Feb 2016 13:22:13 -0500 +Subject: [PATCH] Make.defaults: Improve gcc/clang detection + +The old filter only matched "gcc" or "clang". + +The new findstring call matches any occurance of gcc or clang. This is +useful when CC includes the full host tuple, like x86_64-pc-linux-gnu-gcc. + +Signed-off-by: Mike Gilbert <floppym@gentoo.org> +--- + Make.defaults | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index bf814b8..5aed21e 100644 +--- a/Make.defaults ++++ b/Make.defaults +@@ -25,14 +25,14 @@ PKGS = + clang_cflags = + gcc_cflags = -specs=$(TOPDIR)/gcc.specs + cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ +- $(if $(filter $(CC),clang),$(clang_cflags),) \ +- $(if $(filter $(CC),gcc),$(gcc_cflags),) \ ++ $(if $(findstring clang,$(CC)),$(clang_cflags),) \ ++ $(if $(findstring gcc,$(CC)),$(gcc_cflags),) \ + $(call pkg-config-cflags) + clang_ccldflags = + gcc_ccldflags = + ccldflags = $(cflags) $(CCLDFLAGS) $(LDFLAGS) \ +- $(if $(filter $(CCLD),clang),$(clang_ccldflags),) \ +- $(if $(filter $(CCLD),gcc),$(gcc_ccldflags),) \ ++ $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \ ++ $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ + $(call pkg-config-ccldflags) + SOFLAGS=-shared + LDLIBS=$(foreach lib,$(LIBS),-l$(lib)) $(call pkg-config-ldlibs) +-- +2.7.1 + diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 9b782e8d10f8..e3193d227658 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,4 +1,5 @@ DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97 +DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256 d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512 d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab WHIRLPOOL 144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593 DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc diff --git a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch new file mode 100644 index 000000000000..743065130f07 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch @@ -0,0 +1,71 @@ +diff -Naur apache-tomcat-6.0.44-src.orig/build.xml apache-tomcat-6.0.44-src/build.xml +--- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000 +0100 ++++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100 +@@ -159,12 +159,14 @@ + </fileset> + </copy> + <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar --> ++<!-- + <copy todir="${tomcat.classes}/javax/servlet/resources" encoding="ISO-8859-1"> + <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources"> + <include name="*" /> + <exclude name="jspxml*" /> + </fileset> + </copy> ++ --> + + </target> + +@@ -307,19 +309,25 @@ + manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> + + <!-- Servlet 2.5 Implementation JAR File --> ++<!-- + <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api" + manifest="${tomcat.manifests}/servlet-api.jar.manifest" + license="${tomcat.manifests}/servlet-api.jar.license" + notice="${tomcat.manifests}/servlet-api.jar.notice" /> ++--> + + <!-- JSP 2.1 Implementation JAR File --> ++<!-- + <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api" + manifest="${tomcat.manifests}/jsp-api.jar.manifest" /> ++--> + + + <!-- JSP 2.1 EL Implementation JAR File --> ++<!-- + <jarIt jarfile="${el-api.jar}" filesId="files.el-api" + manifest="${tomcat.manifests}/el-api.jar.manifest" /> ++--> + + <!-- Bootstrap JAR File --> + <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap" +@@ -492,12 +500,14 @@ + + <target name="deploy" depends="build-only,build-docs,warn.dbcp"> + ++<!-- + <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" + file="${tomcat-native.tar.gz}" /> + <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" + file="${commons-daemon.native.src.tgz}" /> + + <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> ++--> + + <!-- Copy scripts --> + <copy todir="${tomcat.build}/bin"> +@@ -649,9 +659,11 @@ + </fileset> + </txt2html> + ++<!-- + <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" + failonerror="false"/> + <copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> ++--> + + </target> + diff --git a/www-servers/tomcat/tomcat-6.0.45.ebuild b/www-servers/tomcat/tomcat-6.0.45.ebuild new file mode 100644 index 000000000000..4c91ddae9ae7 --- /dev/null +++ b/www-servers/tomcat/tomcat-6.0.45.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +JAVA_PKG_IUSE="source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container" +HOMEPAGE="http://tomcat.apache.org/" +SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="6" +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd" +IUSE="extra-webapps" + +ECJ_SLOT="3.7" +SAPI_SLOT="2.5" + +COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} + dev-java/oracle-javamail:0 + >=dev-java/tomcat-servlet-api-6.0.44-r1:${SAPI_SLOT}" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.6 + !<dev-java/tomcat-native-1.1.20" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.6 + test? ( dev-java/ant-junit:0 )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + java-pkg-2_pkg_setup + enewgroup tomcat 265 + enewuser tomcat 265 -1 /dev/null tomcat +} + +java_prepare() { + find -name '*.jar' -type f -delete -print || die + + # Remove bundled javamail, servlet-api + rm -rv java/javax/{el,mail,servlet} || die + + epatch \ + "${FILESDIR}/${P}-build.xml.patch" \ + "${FILESDIR}/tomcat-6-sysprop.patch" + + # For use of catalina.sh in netbeans + sed -i -e "/^# ----- Execute The Requested Command/ a\ + CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \ + bin/catalina.sh || die +} + +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_BUILD_TARGET="deploy" +EANT_TEST_TARGET="all" +EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}" +EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" +EANT_NEEDS_TOOLS="true" +EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false" + +# revisions of the scripts +IM_REV="-r1" +INIT_REV="-r1" + +src_compile() { + EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)" + java-pkg-2_src_compile +} + +src_test() { + EANT_BUILD_XML="test/build.xml" java-pkg-2_src_test +} + +src_install() { + local dest="/usr/share/${PN}-${SLOT}" + + java-pkg_jarinto "${dest}"/bin + java-pkg_dojar output/build/bin/*.jar + exeinto "${dest}"/bin + doexe output/build/bin/*.sh + + java-pkg_jarinto "${dest}"/lib + java-pkg_dojar output/build/lib/*.jar + + dodoc RELEASE-NOTES RUNNING.txt + use source && java-pkg_dosrc java/* + + ### Webapps ### + + insinto "${dest}"/webapps + doins -r output/build/webapps/{host-manager,manager,ROOT} + use extra-webapps && doins -r output/build/webapps/{docs,examples} + + ### Config ### + + # create "logs" directory in $CATALINA_BASE + # and set correct perms, see #458890 + dodir "${dest}"/logs + fperms 0750 "${dest}"/logs + + # replace the default pw with a random one, see #92281 + local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15) + sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die + + # prepend gentoo.classpath to common.loader, see #453212 + sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die + + insinto "${dest}" + doins -r output/build/conf + + ### rc ### + + cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die + eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} + sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die + + insinto "${dest}"/gentoo + doins "${T}"/tomcat.conf + exeinto "${dest}"/gentoo + newexe "${T}"/tomcat${INIT_REV}.init tomcat.init + newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash +} + +pkg_postinst() { + elog "New ebuilds of Tomcat support running multiple instances. If you used prior version" + elog "of Tomcat (<6.0.36), you have to migrate your existing instance to work with new Tomcat." + elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat" + + elog "To manage Tomcat instances, run:" + elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help" + + ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar" + ewarn "from upstream binary if you need it. Gentoo Bug # 144276" + +# einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information." +} |