From de9098926e0a2240add78455f9f1d9dc6fae82f1 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 23 Jan 2015 20:38:43 +0300 Subject: [PATCH] Sync with portage [Fri Jan 23 20:38:42 MSK 2015]. --- dev-lang/tcl/tcl-8.6.3.ebuild | 6 +- dev-lang/tk/tk-8.6.3.ebuild | 35 +- dev-libs/openssl/Manifest | 2 +- .../openssl/files/openssl-1.0.2-ipv6.patch | 611 +++++++++++++++++ .../files/openssl-1.0.2-s_client-verify.patch | 17 + .../files/openssl-1.0.2_beta2-ipv6.patch | 640 ------------------ dev-libs/openssl/metadata.xml | 1 + ...2_beta3.ebuild => openssl-1.0.2-r1.ebuild} | 14 +- dev-perl/Clone/Clone-0.370.0.ebuild | 4 +- .../Spreadsheet-WriteExcel-2.400.0.ebuild | 4 +- dev-python/funcsigs/funcsigs-0.4.ebuild | 10 +- .../vdr-remote/vdr-remote-0.5.0-r1.ebuild | 30 + .../vdr-rssreader/vdr-rssreader-2.0.1.ebuild | 4 +- media-radio/unixcw/Manifest | 1 + media-radio/unixcw/unixcw-3.4.1.ebuild | 68 ++ metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- metadata/md5-cache/dev-lang/tcl-8.6.3 | 2 +- metadata/md5-cache/dev-lang/tk-8.6.3 | 12 +- .../{openssl-1.0.2_beta3 => openssl-1.0.2-r1} | 9 +- metadata/md5-cache/dev-perl/Clone-0.370.0 | 4 +- .../dev-perl/Spreadsheet-WriteExcel-2.400.0 | 4 +- metadata/md5-cache/dev-python/funcsigs-0.4 | 4 +- .../media-plugins/vdr-remote-0.5.0-r1 | 13 + .../media-plugins/vdr-rssreader-2.0.1 | 2 +- metadata/md5-cache/media-radio/unixcw-3.4.1 | 13 + metadata/md5-cache/sci-biology/mira-3.9.18 | 2 +- metadata/md5-cache/sci-biology/mira-4.0.2 | 13 + metadata/md5-cache/sys-block/ms-sys-2.5.0 | 13 + metadata/md5-cache/sys-devel/llvm-3.5.1 | 2 +- metadata/md5-cache/sys-devel/llvm-9999 | 2 +- metadata/md5-cache/x11-misc/slock-1.2 | 4 +- metadata/md5-cache/x11-terms/xterm-314 | 13 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- profiles/arch/amd64-fbsd/package.use.mask | 4 +- profiles/use.local.desc | 1 + sci-biology/mira/Manifest | 1 + sci-biology/mira/mira-3.9.18.ebuild | 5 +- sci-biology/mira/mira-4.0.2.ebuild | 76 +++ sys-block/ms-sys/Manifest | 1 + sys-block/ms-sys/ms-sys-2.5.0.ebuild | 36 + sys-devel/llvm/llvm-3.5.1.ebuild | 4 +- sys-devel/llvm/llvm-9999.ebuild | 6 +- x11-misc/slock/slock-1.2.ebuild | 6 +- x11-terms/xterm/Manifest | 1 + x11-terms/xterm/xterm-314.ebuild | 92 +++ 49 files changed, 1090 insertions(+), 714 deletions(-) create mode 100644 dev-libs/openssl/files/openssl-1.0.2-ipv6.patch create mode 100644 dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.2_beta2-ipv6.patch rename dev-libs/openssl/{openssl-1.0.2_beta3.ebuild => openssl-1.0.2-r1.ebuild} (94%) create mode 100644 media-plugins/vdr-remote/vdr-remote-0.5.0-r1.ebuild create mode 100644 media-radio/unixcw/unixcw-3.4.1.ebuild rename metadata/md5-cache/dev-libs/{openssl-1.0.2_beta3 => openssl-1.0.2-r1} (77%) create mode 100644 metadata/md5-cache/media-plugins/vdr-remote-0.5.0-r1 create mode 100644 metadata/md5-cache/media-radio/unixcw-3.4.1 create mode 100644 metadata/md5-cache/sci-biology/mira-4.0.2 create mode 100644 metadata/md5-cache/sys-block/ms-sys-2.5.0 create mode 100644 metadata/md5-cache/x11-terms/xterm-314 create mode 100644 sci-biology/mira/mira-4.0.2.ebuild create mode 100644 sys-block/ms-sys/ms-sys-2.5.0.ebuild create mode 100644 x11-terms/xterm/xterm-314.ebuild diff --git a/dev-lang/tcl/tcl-8.6.3.ebuild b/dev-lang/tcl/tcl-8.6.3.ebuild index 16096af18dad..ab3ae085c5d9 100644 --- a/dev-lang/tcl/tcl-8.6.3.ebuild +++ b/dev-lang/tcl/tcl-8.6.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.3.ebuild,v 1.1 2014/12/19 15:02:24 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.6.3.ebuild,v 1.2 2015/01/23 11:23:00 jlec Exp $ EAPI=5 -inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator multilib-minimal +inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator MY_P="${PN}${PV}" diff --git a/dev-lang/tk/tk-8.6.3.ebuild b/dev-lang/tk/tk-8.6.3.ebuild index 78f3693e71e6..a3e8a3e3abaa 100644 --- a/dev-lang/tk/tk-8.6.3.ebuild +++ b/dev-lang/tk/tk-8.6.3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild,v 1.1 2014/12/20 09:03:03 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.6.3.ebuild,v 1.2 2015/01/23 11:26:53 jlec Exp $ EAPI=5 -inherit autotools eutils multilib prefix toolchain-funcs versionator virtualx +inherit autotools eutils multilib multilib-minimal prefix toolchain-funcs versionator virtualx MY_P="${PN}${PV/_beta/b}" @@ -19,15 +19,15 @@ IUSE="debug +threads truetype aqua xscreensaver" RDEPEND=" !aqua? ( - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXt - truetype? ( x11-libs/libXft ) - xscreensaver? ( x11-libs/libXScrnSaver ) + media-libs/fontconfig[${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + x11-libs/libXt[${MULTILIB_USEDEP}] + truetype? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) + xscreensaver? ( x11-libs/libXScrnSaver[${MULTILIB_USEDEP}] ) ) - ~dev-lang/tcl-${PV}" + ~dev-lang/tcl-${PV}[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} - !aqua? ( x11-proto/xproto )" + !aqua? ( x11-proto/xproto[${MULTILIB_USEDEP}] )" # Not bumped to 8.6 #RESTRICT=test @@ -66,9 +66,11 @@ src_prepare() { -i tcl.m4 || die eautoconf + + multilib_copy_sources } -src_configure() { +multilib_src_configure() { local mylibdir=$(get_libdir) econf \ @@ -80,11 +82,11 @@ src_configure() { $(use_enable debug symbols) } -src_test() { +multilib_src_test() { Xemake test } -src_install() { +multilib_src_install() { #short version number local v1=$(get_version_component_range 1-2) local mylibdir=$(get_libdir) @@ -124,7 +126,8 @@ src_install() { dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a - dosym wish${v1} /usr/bin/wish - - dodoc "${SPARENT}"/{ChangeLog*,README,changes} + if multilib_is_native_abi; then + dosym wish${v1} /usr/bin/wish + dodoc "${SPARENT}"/{ChangeLog*,README,changes} + fi } diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 30d63d40e038..454fad3297f7 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -7,5 +7,5 @@ DIST openssl-1.0.0q.tar.gz 4004090 SHA256 230dc19ea33b87836c388c1117a71f8eb539cb DIST openssl-1.0.1j.tar.gz 4432964 SHA256 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 SHA512 a786bb99b68d88c1de79d3c5372767f091ebeefb5abc1d4883253fd3ab5a86af53389f5ff36fdd8faa27c5fb78be8bbff406392c373358697da80d250eadebb8 WHIRLPOOL 467aa3b02d04837e3281670401985e492d15b561c03b97246e3c8e61b0d3b1927332e3a226de4ed5bd02265a04fb31ce84c3501f4af9685633d00a9b43c56978 DIST openssl-1.0.1k.tar.gz 4434910 SHA256 8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c SHA512 8b000fbd1bf919d9913a314f99aedd48a69f6caa4ccf43237889e73e08cbe0d82bfc27e9c7c4cade09fc459f91d6c4a831a9b3fc8bca0344fb864eadd7d1e8e8 WHIRLPOOL 5236a966d610c971e473cfc30e5412a72eef116fd259ada9c50da08bcd4ca967f80bb19babf530b4e5b9f1f24e9275e00391eb2e12a26d4544f593e2b4ba20b8 DIST openssl-1.0.1l.tar.gz 4429979 SHA256 b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 SHA512 27fe42f33815a3aafff75f2b9a5604c328fe5945c5cecaca74e5d2c2a1e066d64ddcc1fdb14b54fc7523cc730ab8a57d7d56b2879c289e86673f91fee0cca65e WHIRLPOOL 79f5698585c68ba647fcdfc4b342a43d06d69230658ca1bc265dd10d8da939c3e27b9a4125bd2adfbf50002b1dddef18be086dfc23a5050e69fb77350131909f -DIST openssl-1.0.2-beta3.tar.gz 5149260 SHA256 264d2d5114d3da3c0e1712312ad0c77bd41757f1cc12f543250063d1e57259e6 SHA512 d18ce87429d0addba11a02d121affd16ec63237a97474167ae1ed914dbc5d284b090d72443b0bfed1e0ad165a37655dd96d3be87053b792a871515e819ccfa72 WHIRLPOOL 26bbce30122106cb5f36d426fb1f50c0bca952caf6d7224e17a6252a5731e3b4ec9da1a96553f152631e7b0243332d3c0f7c8bc2e512b64f3a126955d4355a53 +DIST openssl-1.0.2.tar.gz 5265809 SHA256 8c48baf3babe0d505d16cfc0cf272589c66d3624264098213db0fb00034728e9 SHA512 dea46225a5445edc4986b02b99fbc90153819374b9a9bfdd892b60cd18ac7fefaf21a7e9d2bb05d0e3bfa4d2704e0ee24b06cc8e7081a542d7598cc9e73c67c5 WHIRLPOOL fe628a38125390deb75728b31427c308efbf65637a569fd1f139f6313fea533514ef05bf3d01bbdc793f77eb259400c95c53074a294d32d73576939d16f22e25 DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 diff --git a/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch new file mode 100644 index 000000000000..27574ea616de --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch @@ -0,0 +1,611 @@ +http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest + +--- openssl-1.0.2/apps/s_apps.h ++++ openssl-1.0.2/apps/s_apps.h +@@ -154,7 +154,7 @@ + int do_server(int port, int type, int *ret, + int (*cb) (char *hostname, int s, int stype, + unsigned char *context), unsigned char *context, +- int naccept); ++ int naccept, int use_ipv4, int use_ipv6); + #ifdef HEADER_X509_H + int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); + #endif +@@ -167,7 +167,8 @@ + int ssl_print_curves(BIO *out, SSL *s, int noshared); + #endif + int ssl_print_tmp_key(BIO *out, SSL *s); +-int init_client(int *sock, char *server, int port, int type); ++int init_client(int *sock, char *server, int port, int type, ++ int use_ipv4, int use_ipv6); + int should_retry(int i); + int extract_port(char *str, short *port_ptr); + int extract_host_port(char *str, char **host_ptr, unsigned char *ip, +--- openssl-1.0.2/apps/s_client.c ++++ openssl-1.0.2/apps/s_client.c +@@ -302,6 +302,10 @@ + { + BIO_printf(bio_err, "usage: s_client args\n"); + BIO_printf(bio_err, "\n"); ++ BIO_printf(bio_err, " -4 - use IPv4 only\n"); ++#if OPENSSL_USE_IPV6 ++ BIO_printf(bio_err, " -6 - use IPv6 only\n"); ++#endif + BIO_printf(bio_err, " -host host - use -connect instead\n"); + BIO_printf(bio_err, " -port port - use -connect instead\n"); + BIO_printf(bio_err, +@@ -658,6 +662,7 @@ + int sbuf_len, sbuf_off; + fd_set readfds, writefds; + short port = PORT; ++ int use_ipv4, use_ipv6; + int full_log = 1; + char *host = SSL_HOST_NAME; + char *cert_file = NULL, *key_file = NULL, *chain_file = NULL; +@@ -709,7 +714,11 @@ + #endif + char *sess_in = NULL; + char *sess_out = NULL; +- struct sockaddr peer; ++#if OPENSSL_USE_IPV6 ++ struct sockaddr_storage peer; ++#else ++ struct sockaddr_in peer; ++#endif + int peerlen = sizeof(peer); + int fallback_scsv = 0; + int enable_timeouts = 0; +@@ -737,6 +746,12 @@ + + meth = SSLv23_client_method(); + ++ use_ipv4 = 1; ++#if OPENSSL_USE_IPV6 ++ use_ipv6 = 1; ++#else ++ use_ipv6 = 0; ++#endif + apps_startup(); + c_Pause = 0; + c_quiet = 0; +@@ -1096,6 +1111,16 @@ + jpake_secret = *++argv; + } + #endif ++ else if (strcmp(*argv,"-4") == 0) { ++ use_ipv4 = 1; ++ use_ipv6 = 0; ++ } ++#if OPENSSL_USE_IPV6 ++ else if (strcmp(*argv,"-6") == 0) { ++ use_ipv4 = 0; ++ use_ipv6 = 1; ++ } ++#endif + #ifndef OPENSSL_NO_SRTP + else if (strcmp(*argv, "-use_srtp") == 0) { + if (--argc < 1) +@@ -1421,7 +1446,7 @@ + + re_start: + +- if (init_client(&s, host, port, socket_type) == 0) { ++ if (init_client(&s, host, port, socket_type, use_ipv4, use_ipv6) == 0) { + BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error()); + SHUTDOWN(s); + goto end; +@@ -1444,7 +1469,7 @@ + if (socket_type == SOCK_DGRAM) { + + sbio = BIO_new_dgram(s, BIO_NOCLOSE); +- if (getsockname(s, &peer, (void *)&peerlen) < 0) { ++ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) { + BIO_printf(bio_err, "getsockname:errno=%d\n", + get_last_socket_error()); + SHUTDOWN(s); +--- openssl-1.0.2/apps/s_server.c ++++ openssl-1.0.2/apps/s_server.c +@@ -643,6 +643,10 @@ + BIO_printf(bio_err, + " -alpn arg - set the advertised protocols for the ALPN extension (comma-separated list)\n"); + #endif ++ BIO_printf(bio_err, " -4 - use IPv4 only\n"); ++#if OPENSSL_USE_IPV6 ++ BIO_printf(bio_err, " -6 - use IPv6 only\n"); ++#endif + BIO_printf(bio_err, + " -keymatexport label - Export keying material using label\n"); + BIO_printf(bio_err, +@@ -1070,6 +1074,7 @@ + int state = 0; + const SSL_METHOD *meth = NULL; + int socket_type = SOCK_STREAM; ++ int use_ipv4, use_ipv6; + ENGINE *e = NULL; + char *inrand = NULL; + int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; +@@ -1111,6 +1116,12 @@ + + meth = SSLv23_server_method(); + ++ use_ipv4 = 1; ++#if OPENSSL_USE_IPV6 ++ use_ipv6 = 1; ++#else ++ use_ipv6 = 0; ++#endif + local_argc = argc; + local_argv = argv; + +@@ -1503,6 +1514,16 @@ + jpake_secret = *(++argv); + } + #endif ++ else if (strcmp(*argv,"-4") == 0) { ++ use_ipv4 = 1; ++ use_ipv6 = 0; ++ } ++#if OPENSSL_USE_IPV6 ++ else if (strcmp(*argv,"-6") == 0) { ++ use_ipv4 = 0; ++ use_ipv6 = 1; ++ } ++#endif + #ifndef OPENSSL_NO_SRTP + else if (strcmp(*argv, "-use_srtp") == 0) { + if (--argc < 1) +@@ -2023,13 +2044,13 @@ + (void)BIO_flush(bio_s_out); + if (rev) + do_server(port, socket_type, &accept_socket, rev_body, context, +- naccept); ++ naccept, use_ipv4, use_ipv6); + else if (www) + do_server(port, socket_type, &accept_socket, www_body, context, +- naccept); ++ naccept, use_ipv4, use_ipv6); + else + do_server(port, socket_type, &accept_socket, sv_body, context, +- naccept); ++ naccept, use_ipv4, use_ipv6); + print_stats(bio_s_out, ctx); + ret = 0; + end: +--- openssl-1.0.2/apps/s_socket.c ++++ openssl-1.0.2/apps/s_socket.c +@@ -101,16 +101,16 @@ + # include "netdb.h" + # endif + +-static struct hostent *GetHostByName(char *name); ++static struct hostent *GetHostByName(char *name, int domain); + # if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) + static void ssl_sock_cleanup(void); + # endif + static int ssl_sock_init(void); +-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type); +-static int init_server(int *sock, int port, int type); +-static int init_server_long(int *sock, int port, char *ip, int type); ++static int init_client_ip(int *sock, unsigned char *ip, int port, int type, int domain); ++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6); ++static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6); + static int do_accept(int acc_sock, int *sock, char **host); +-static int host_ip(char *str, unsigned char ip[4]); ++static int host_ip(char *str, unsigned char *ip, int domain); + + # ifdef OPENSSL_SYS_WIN16 + # define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ +@@ -231,38 +231,68 @@ + return (1); + } + +-int init_client(int *sock, char *host, int port, int type) ++int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6) + { ++# if OPENSSL_USE_IPV6 ++ unsigned char ip[16]; ++# else + unsigned char ip[4]; ++# endif + +- memset(ip, '\0', sizeof ip); +- if (!host_ip(host, &(ip[0]))) +- return 0; +- return init_client_ip(sock, ip, port, type); +-} +- +-static int init_client_ip(int *sock, unsigned char ip[4], int port, int type) +-{ +- unsigned long addr; ++ if (use_ipv4) ++ if (host_ip(host, ip, AF_INET)) ++ return(init_client_ip(sock, ip, port, type, AF_INET)); ++# if OPENSSL_USE_IPV6 ++ if (use_ipv6) ++ if (host_ip(host, ip, AF_INET6)) ++ return(init_client_ip(sock, ip, port, type, AF_INET6)); ++# endif ++ return 0; ++} ++ ++static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain) ++{ ++# if OPENSSL_USE_IPV6 ++ struct sockaddr_storage them; ++ struct sockaddr_in *them_in = (struct sockaddr_in *)&them; ++ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them; ++# else + struct sockaddr_in them; ++ struct sockaddr_in *them_in = &them; ++# endif ++ socklen_t addr_len; + int s, i; + + if (!ssl_sock_init()) + return (0); + + memset((char *)&them, 0, sizeof(them)); +- them.sin_family = AF_INET; +- them.sin_port = htons((unsigned short)port); +- addr = (unsigned long) +- ((unsigned long)ip[0] << 24L) | +- ((unsigned long)ip[1] << 16L) | +- ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]); +- them.sin_addr.s_addr = htonl(addr); ++ if (domain == AF_INET) { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in); ++ them_in->sin_family=AF_INET; ++ them_in->sin_port=htons((unsigned short)port); ++# ifndef BIT_FIELD_LIMITS ++ memcpy(&them_in->sin_addr.s_addr, ip, 4); ++# else ++ memcpy(&them_in->sin_addr, ip, 4); ++# endif ++ } ++ else ++# if OPENSSL_USE_IPV6 ++ { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in6); ++ them_in6->sin6_family=AF_INET6; ++ them_in6->sin6_port=htons((unsigned short)port); ++ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr)); ++ } ++# else ++ return(0); ++# endif + + if (type == SOCK_STREAM) +- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); ++ s = socket(domain, SOCK_STREAM, SOCKET_PROTOCOL); + else /* ( type == SOCK_DGRAM) */ +- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); ++ s = socket(domain, SOCK_DGRAM, IPPROTO_UDP); + + if (s == INVALID_SOCKET) { + perror("socket"); +@@ -280,7 +310,7 @@ + } + # endif + +- if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) { ++ if (connect(s, (struct sockaddr *)&them, addr_len) == -1) { + closesocket(s); + perror("connect"); + return (0); +@@ -292,14 +322,14 @@ + int do_server(int port, int type, int *ret, + int (*cb) (char *hostname, int s, int stype, + unsigned char *context), unsigned char *context, +- int naccept) ++ int naccept, int use_ipv4, int use_ipv6) + { + int sock; + char *name = NULL; + int accept_socket = 0; + int i; + +- if (!init_server(&accept_socket, port, type)) ++ if (!init_server(&accept_socket, port, type, use_ipv4, use_ipv6)) + return (0); + + if (ret != NULL) { +@@ -328,32 +358,41 @@ + } + } + +-static int init_server_long(int *sock, int port, char *ip, int type) ++static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6) + { + int ret = 0; ++ int domain; ++# if OPENSSL_USE_IPV6 ++ struct sockaddr_storage server; ++ struct sockaddr_in *server_in = (struct sockaddr_in *)&server; ++ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server; ++# else + struct sockaddr_in server; ++ struct sockaddr_in *server_in = &server; ++# endif ++ socklen_t addr_len; + int s = -1; + ++ if (!use_ipv4 && !use_ipv6) ++ goto err; ++# if OPENSSL_USE_IPV6 ++ /* we are fine here */ ++# else ++ if (use_ipv6) ++ goto err; ++# endif + if (!ssl_sock_init()) + return (0); + +- memset((char *)&server, 0, sizeof(server)); +- server.sin_family = AF_INET; +- server.sin_port = htons((unsigned short)port); +- if (ip == NULL) +- server.sin_addr.s_addr = INADDR_ANY; +- else +-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ +-# ifndef BIT_FIELD_LIMITS +- memcpy(&server.sin_addr.s_addr, ip, 4); ++#if OPENSSL_USE_IPV6 ++ domain = use_ipv6 ? AF_INET6 : AF_INET; + # else +- memcpy(&server.sin_addr, ip, 4); ++ domain = AF_INET; + # endif +- + if (type == SOCK_STREAM) +- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); +- else /* type == SOCK_DGRAM */ +- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); ++ s=socket(domain, SOCK_STREAM, SOCKET_PROTOCOL); ++ else /* type == SOCK_DGRAM */ ++ s=socket(domain, SOCK_DGRAM, IPPROTO_UDP); + + if (s == INVALID_SOCKET) + goto err; +@@ -363,7 +402,42 @@ + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j); + } + # endif +- if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) { ++# if OPENSSL_USE_IPV6 ++ if ((use_ipv4 == 0) && (use_ipv6 == 1)) { ++ const int on = 1; ++ ++ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, ++ (const void *) &on, sizeof(int)); ++ } ++# endif ++ if (domain == AF_INET) { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in); ++ memset(server_in, 0, sizeof(struct sockaddr_in)); ++ server_in->sin_family=AF_INET; ++ server_in->sin_port = htons((unsigned short)port); ++ if (ip == NULL) ++ server_in->sin_addr.s_addr = htonl(INADDR_ANY); ++ else ++/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ ++# ifndef BIT_FIELD_LIMITS ++ memcpy(&server_in->sin_addr.s_addr, ip, 4); ++# else ++ memcpy(&server_in->sin_addr, ip, 4); ++# endif ++ } ++# if OPENSSL_USE_IPV6 ++ else { ++ addr_len = (socklen_t)sizeof(struct sockaddr_in6); ++ memset(server_in6, 0, sizeof(struct sockaddr_in6)); ++ server_in6->sin6_family = AF_INET6; ++ server_in6->sin6_port = htons((unsigned short)port); ++ if (ip == NULL) ++ server_in6->sin6_addr = in6addr_any; ++ else ++ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr)); ++ } ++# endif ++ if (bind(s, (struct sockaddr *)&server, addr_len) == -1) { + # ifndef OPENSSL_SYS_WINDOWS + perror("bind"); + # endif +@@ -381,16 +455,23 @@ + return (ret); + } + +-static int init_server(int *sock, int port, int type) ++static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6) + { +- return (init_server_long(sock, port, NULL, type)); ++ return (init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6)); + } + + static int do_accept(int acc_sock, int *sock, char **host) + { + int ret; + struct hostent *h1, *h2; +- static struct sockaddr_in from; ++#if OPENSSL_USE_IPV6 ++ struct sockaddr_storage from; ++ struct sockaddr_in *from_in = (struct sockaddr_in *)&from; ++ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from; ++#else ++ struct sockaddr_in from; ++ struct sockaddr_in *from_in = &from; ++#endif + int len; + /* struct linger ling; */ + +@@ -440,14 +521,25 @@ + + if (host == NULL) + goto end; ++# if OPENSSL_USE_IPV6 ++ if (from.ss_family == AF_INET) ++# else ++ if (from.sin_family == AF_INET) ++# endif + # ifndef BIT_FIELD_LIMITS +- /* I should use WSAAsyncGetHostByName() under windows */ +- h1 = gethostbyaddr((char *)&from.sin_addr.s_addr, +- sizeof(from.sin_addr.s_addr), AF_INET); ++ /* I should use WSAAsyncGetHostByName() under windows */ ++ h1 = gethostbyaddr((char *)&from_in->sin_addr.s_addr, ++ sizeof(from_in->sin_addr.s_addr), AF_INET); + # else +- h1 = gethostbyaddr((char *)&from.sin_addr, +- sizeof(struct in_addr), AF_INET); ++ h1 = gethostbyaddr((char *)&from_in->sin_addr, ++ sizeof(struct in_addr), AF_INET); ++# endif ++# if OPENSSL_USE_IPV6 ++ else ++ h1 = gethostbyaddr((char *)&from_in6->sin6_addr, ++ sizeof(struct in6_addr), AF_INET6); + # endif ++ + if (h1 == NULL) { + BIO_printf(bio_err, "bad gethostbyaddr\n"); + *host = NULL; +@@ -460,14 +552,22 @@ + } + BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1); + +- h2 = GetHostByName(*host); ++# if OPENSSL_USE_IPV6 ++ h2=GetHostByName(*host, from.ss_family); ++# else ++ h2=GetHostByName(*host, from.sin_family); ++# endif + if (h2 == NULL) { + BIO_printf(bio_err, "gethostbyname failure\n"); + closesocket(ret); + return (0); + } +- if (h2->h_addrtype != AF_INET) { +- BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n"); ++# if OPENSSL_USE_IPV6 ++ if (h2->h_addrtype != from.ss_family) { ++# else ++ if (h2->h_addrtype != from.sin_family) { ++# endif ++ BIO_printf(bio_err, "gethostbyname addr is not correct\n"); + closesocket(ret); + return (0); + } +@@ -483,14 +583,14 @@ + char *h, *p; + + h = str; +- p = strchr(str, ':'); ++ p = strrchr(str, ':'); + if (p == NULL) { + BIO_printf(bio_err, "no port defined\n"); + return (0); + } + *(p++) = '\0'; + +- if ((ip != NULL) && !host_ip(str, ip)) ++ if ((ip != NULL) && !host_ip(str, ip, AF_INET)) + goto err; + if (host_ptr != NULL) + *host_ptr = h; +@@ -502,44 +602,51 @@ + return (0); + } + +-static int host_ip(char *str, unsigned char ip[4]) ++static int host_ip(char *str, unsigned char *ip, int domain) + { + unsigned int in[4]; ++ unsigned long l; + int i; + +- if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == +- 4) { ++ if ((domain == AF_INET) && (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == 4)) { + for (i = 0; i < 4; i++) + if (in[i] > 255) { + BIO_printf(bio_err, "invalid IP address\n"); + goto err; + } +- ip[0] = in[0]; +- ip[1] = in[1]; +- ip[2] = in[2]; +- ip[3] = in[3]; +- } else { /* do a gethostbyname */ ++ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]); ++ memcpy(ip, &l, 4); ++ return 1; ++ } ++# if OPENSSL_USE_IPV6 ++ else if ((domain == AF_INET6) && (inet_pton(AF_INET6, str, ip) == 1)) ++ return 1; ++# endif ++ else { /* do a gethostbyname */ + struct hostent *he; + + if (!ssl_sock_init()) + return (0); + +- he = GetHostByName(str); ++ he = GetHostByName(str, domain); + if (he == NULL) { + BIO_printf(bio_err, "gethostbyname failure\n"); + goto err; + } + /* cast to short because of win16 winsock definition */ +- if ((short)he->h_addrtype != AF_INET) { +- BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n"); ++ if ((short)he->h_addrtype != domain) { ++ BIO_printf(bio_err, "gethostbyname addr is not correct\n"); + return (0); + } +- ip[0] = he->h_addr_list[0][0]; +- ip[1] = he->h_addr_list[0][1]; +- ip[2] = he->h_addr_list[0][2]; +- ip[3] = he->h_addr_list[0][3]; ++ if (domain == AF_INET) ++ memset(ip, 0, 4); ++# if OPENSSL_USE_IPV6 ++ else ++ memset(ip, 0, 16); ++# endif ++ memcpy(ip, he->h_addr_list[0], he->h_length); ++ return 1; + } +- return (1); + err: + return (0); + } +@@ -573,7 +680,7 @@ + static unsigned long ghbn_hits = 0L; + static unsigned long ghbn_miss = 0L; + +-static struct hostent *GetHostByName(char *name) ++static struct hostent *GetHostByName(char *name, int domain) + { + struct hostent *ret; + int i, lowi = 0; +@@ -585,13 +692,18 @@ + lowi = i; + } + if (ghbn_cache[i].order > 0) { +- if (strncmp(name, ghbn_cache[i].name, 128) == 0) ++ if ((strncmp(name, ghbn_cache[i].name, 128) == 0) && (ghbn_cache[i].ent.h_addrtype == domain)) + break; + } + } + if (i == GHBN_NUM) { /* no hit */ + ghbn_miss++; +- ret = gethostbyname(name); ++ if (domain == AF_INET) ++ ret = gethostbyname(name); ++# if OPENSSL_USE_IPV6 ++ else ++ ret = gethostbyname2(name, AF_INET6); ++# endif + if (ret == NULL) + return (NULL); + /* else add to cache */ diff --git a/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch b/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch new file mode 100644 index 000000000000..803a91dde99c --- /dev/null +++ b/dev-libs/openssl/files/openssl-1.0.2-s_client-verify.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/472584 +http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest + +fix verification handling in s_client. when loading paths, make sure +we properly fallback to setting the default paths. + +--- openssl-1.0.2/apps/s_client.c ++++ openssl-1.0.2/apps/s_client.c +@@ -1337,7 +1337,7 @@ + + SSL_CTX_set_verify(ctx, verify, verify_callback); + +- if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) || ++ if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) && + (!SSL_CTX_set_default_verify_paths(ctx))) { + /* + * BIO_printf(bio_err,"error setting default verify locations\n"); diff --git a/dev-libs/openssl/files/openssl-1.0.2_beta2-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.2_beta2-ipv6.patch deleted file mode 100644 index 8683d2829f04..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.2_beta2-ipv6.patch +++ /dev/null @@ -1,640 +0,0 @@ -http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest - ---- openssl-1.0.2-beta2/apps/s_apps.h -+++ openssl-1.0.2-beta2/apps/s_apps.h -@@ -148,7 +148,7 @@ - #define PORT_STR "4433" - #define PROTOCOL "tcp" - --int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept); -+int do_server(int port, int type, int *ret, int (*cb) (char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept, int use_ipv4, int use_ipv6); - #ifdef HEADER_X509_H - int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); - #endif -@@ -161,7 +161,7 @@ - int ssl_print_curves(BIO *out, SSL *s, int noshared); - #endif - int ssl_print_tmp_key(BIO *out, SSL *s); --int init_client(int *sock, char *server, int port, int type); -+int init_client(int *sock, char *server, int port, int type, int use_ipv4, int use_ipv6); - int should_retry(int i); - int extract_port(char *str, short *port_ptr); - int extract_host_port(char *str,char **host_ptr,unsigned char *ip,short *p); ---- openssl-1.0.2-beta2/apps/s_client.c -+++ openssl-1.0.2-beta2/apps/s_client.c -@@ -288,6 +288,10 @@ - { - BIO_printf(bio_err,"usage: s_client args\n"); - BIO_printf(bio_err,"\n"); -+ BIO_printf(bio_err," -4 - use IPv4 only\n"); -+#if OPENSSL_USE_IPV6 -+ BIO_printf(bio_err," -6 - use IPv6 only\n"); -+#endif - BIO_printf(bio_err," -host host - use -connect instead\n"); - BIO_printf(bio_err," -port port - use -connect instead\n"); - BIO_printf(bio_err," -connect host:port - who to connect to (default is %s:%s)\n",SSL_HOST_NAME,PORT_STR); -@@ -595,6 +599,7 @@ - int sbuf_len,sbuf_off; - fd_set readfds,writefds; - short port=PORT; -+ int use_ipv4, use_ipv6; - int full_log=1; - char *host=SSL_HOST_NAME; - char *cert_file=NULL,*key_file=NULL,*chain_file=NULL; -@@ -647,7 +652,11 @@ - #endif - char *sess_in = NULL; - char *sess_out = NULL; -- struct sockaddr peer; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage peer; -+#else -+ struct sockaddr_in peer; -+#endif - int peerlen = sizeof(peer); - int enable_timeouts = 0 ; - long socket_mtu = 0; -@@ -674,6 +683,12 @@ - - meth=SSLv23_client_method(); - -+ use_ipv4 = 1; -+#if OPENSSL_USE_IPV6 -+ use_ipv6 = 1; -+#else -+ use_ipv6 = 0; -+#endif - apps_startup(); - c_Pause=0; - c_quiet=0; -@@ -1079,6 +1094,18 @@ - jpake_secret = *++argv; - } - #endif -+ else if (strcmp(*argv,"-4") == 0) -+ { -+ use_ipv4 = 1; -+ use_ipv6 = 0; -+ } -+#if OPENSSL_USE_IPV6 -+ else if (strcmp(*argv,"-6") == 0) -+ { -+ use_ipv4 = 0; -+ use_ipv6 = 1; -+ } -+#endif - else if (strcmp(*argv,"-use_srtp") == 0) - { - if (--argc < 1) goto bad; -@@ -1445,7 +1472,7 @@ - - re_start: - -- if (init_client(&s,host,port,socket_type) == 0) -+ if (init_client(&s,host,port,socket_type,use_ipv4,use_ipv6) == 0) - { - BIO_printf(bio_err,"connect:errno=%d\n",get_last_socket_error()); - SHUTDOWN(s); -@@ -1471,7 +1498,7 @@ - { - - sbio=BIO_new_dgram(s,BIO_NOCLOSE); -- if (getsockname(s, &peer, (void *)&peerlen) < 0) -+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) - { - BIO_printf(bio_err, "getsockname:errno=%d\n", - get_last_socket_error()); ---- openssl-1.0.2-beta2/apps/s_server.c -+++ openssl-1.0.2-beta2/apps/s_server.c -@@ -584,6 +584,10 @@ - BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n"); - BIO_printf(bio_err," -alpn arg - set the advertised protocols for the ALPN extension (comma-separated list)\n"); - #endif -+ BIO_printf(bio_err," -4 - use IPv4 only\n"); -+#if OPENSSL_USE_IPV6 -+ BIO_printf(bio_err," -6 - use IPv6 only\n"); -+#endif - BIO_printf(bio_err," -keymatexport label - Export keying material using label\n"); - BIO_printf(bio_err," -keymatexportlen len - Export len bytes of keying material (default 20)\n"); - BIO_printf(bio_err," -status - respond to certificate status requests\n"); -@@ -1014,6 +1018,7 @@ - int state=0; - const SSL_METHOD *meth=NULL; - int socket_type=SOCK_STREAM; -+ int use_ipv4, use_ipv6; - ENGINE *e=NULL; - char *inrand=NULL; - int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; -@@ -1055,6 +1060,12 @@ - - meth=SSLv23_server_method(); - -+ use_ipv4 = 1; -+#if OPENSSL_USE_IPV6 -+ use_ipv6 = 1; -+#else -+ use_ipv6 = 0; -+#endif - local_argc=argc; - local_argv=argv; - -@@ -1493,6 +1504,18 @@ - jpake_secret = *(++argv); - } - #endif -+ else if (strcmp(*argv,"-4") == 0) -+ { -+ use_ipv4 = 1; -+ use_ipv6 = 0; -+ } -+#if OPENSSL_USE_IPV6 -+ else if (strcmp(*argv,"-6") == 0) -+ { -+ use_ipv4 = 0; -+ use_ipv6 = 1; -+ } -+#endif - else if (strcmp(*argv,"-use_srtp") == 0) - { - if (--argc < 1) goto bad; -@@ -2063,11 +2086,11 @@ - BIO_printf(bio_s_out,"ACCEPT\n"); - (void)BIO_flush(bio_s_out); - if (rev) -- do_server(port,socket_type,&accept_socket,rev_body, context, naccept); -+ do_server(port,socket_type,&accept_socket,rev_body, context, naccept, use_ipv4, use_ipv6); - else if (www) -- do_server(port,socket_type,&accept_socket,www_body, context, naccept); -+ do_server(port,socket_type,&accept_socket,www_body, context, naccept, use_ipv4, use_ipv6); - else -- do_server(port,socket_type,&accept_socket,sv_body, context, naccept); -+ do_server(port,socket_type,&accept_socket,sv_body, context, naccept, use_ipv4, use_ipv6); - print_stats(bio_s_out,ctx); - ret=0; - end: ---- openssl-1.0.2-beta2/apps/s_socket.c -+++ openssl-1.0.2-beta2/apps/s_socket.c -@@ -97,16 +97,16 @@ - #include "netdb.h" - #endif - --static struct hostent *GetHostByName(char *name); -+static struct hostent *GetHostByName(char *name, int domain); - #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) - static void ssl_sock_cleanup(void); - #endif - static int ssl_sock_init(void); --static int init_client_ip(int *sock,unsigned char ip[4], int port, int type); --static int init_server(int *sock, int port, int type); --static int init_server_long(int *sock, int port,char *ip, int type); -+static int init_client_ip(int *sock,unsigned char *ip, int port, int type, int domain); -+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6); -+static int init_server_long(int *sock, int port,char *ip, int type, int use_ipv4, int use_ipv6); - static int do_accept(int acc_sock, int *sock, char **host); --static int host_ip(char *str, unsigned char ip[4]); -+static int host_ip(char *str, unsigned char *ip, int domain); - - #ifdef OPENSSL_SYS_WIN16 - #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ -@@ -234,38 +234,68 @@ - return(1); - } - --int init_client(int *sock, char *host, int port, int type) -+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6) - { -+#if OPENSSL_USE_IPV6 -+ unsigned char ip[16]; -+#else - unsigned char ip[4]; -+#endif - -- memset(ip, '\0', sizeof ip); -- if (!host_ip(host,&(ip[0]))) -- return 0; -- return init_client_ip(sock,ip,port,type); -- } -- --static int init_client_ip(int *sock, unsigned char ip[4], int port, int type) -- { -- unsigned long addr; -+ if (use_ipv4) -+ if (host_ip(host,ip,AF_INET)) -+ return(init_client_ip(sock,ip,port,type,AF_INET)); -+#if OPENSSL_USE_IPV6 -+ if (use_ipv6) -+ if (host_ip(host,ip,AF_INET6)) -+ return(init_client_ip(sock,ip,port,type,AF_INET6)); -+#endif -+ return 0; -+ } -+ -+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain) -+ { -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage them; -+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them; -+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them; -+#else - struct sockaddr_in them; -+ struct sockaddr_in *them_in = &them; -+#endif -+ socklen_t addr_len; - int s,i; - - if (!ssl_sock_init()) return(0); - - memset((char *)&them,0,sizeof(them)); -- them.sin_family=AF_INET; -- them.sin_port=htons((unsigned short)port); -- addr=(unsigned long) -- ((unsigned long)ip[0]<<24L)| -- ((unsigned long)ip[1]<<16L)| -- ((unsigned long)ip[2]<< 8L)| -- ((unsigned long)ip[3]); -- them.sin_addr.s_addr=htonl(addr); -+ if (domain == AF_INET) -+ { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in); -+ them_in->sin_family=AF_INET; -+ them_in->sin_port=htons((unsigned short)port); -+#ifndef BIT_FIELD_LIMITS -+ memcpy(&them_in->sin_addr.s_addr, ip, 4); -+#else -+ memcpy(&them_in->sin_addr, ip, 4); -+#endif -+ } -+ else -+#if OPENSSL_USE_IPV6 -+ { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in6); -+ them_in6->sin6_family=AF_INET6; -+ them_in6->sin6_port=htons((unsigned short)port); -+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr)); -+ } -+#else -+ return(0); -+#endif - - if (type == SOCK_STREAM) -- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); -+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL); - else /* ( type == SOCK_DGRAM) */ -- s=socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP); -+ s=socket(domain,SOCK_DGRAM,IPPROTO_UDP); - - if (s == INVALID_SOCKET) { perror("socket"); return(0); } - -@@ -277,29 +307,27 @@ - if (i < 0) { closesocket(s); perror("keepalive"); return(0); } - } - #endif -- -- if (connect(s,(struct sockaddr *)&them,sizeof(them)) == -1) -+ if (connect(s,(struct sockaddr *)&them,addr_len) == -1) - { closesocket(s); perror("connect"); return(0); } - *sock=s; - return(1); - } - --int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept) -+int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, int stype, unsigned char *context), unsigned char *context, int naccept, int use_ipv4, int use_ipv6) - { - int sock; - char *name = NULL; - int accept_socket = 0; - int i; - -- if (!init_server(&accept_socket,port,type)) return(0); -- -+ if (!init_server(&accept_socket,port,type, use_ipv4, use_ipv6)) return(0); - if (ret != NULL) - { - *ret=accept_socket; - /* return(1);*/ - } -- for (;;) -- { -+ for (;;) -+ { - if (type==SOCK_STREAM) - { - if (do_accept(accept_socket,&sock,&name) == 0) -@@ -324,41 +352,88 @@ - } - } - --static int init_server_long(int *sock, int port, char *ip, int type) -+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6) - { - int ret=0; -+ int domain; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage server; -+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server; -+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server; -+#else - struct sockaddr_in server; -+ struct sockaddr_in *server_in = &server; -+#endif -+ socklen_t addr_len; - int s= -1; - -+ if (!use_ipv4 && !use_ipv6) -+ goto err; -+#if OPENSSL_USE_IPV6 -+ /* we are fine here */ -+#else -+ if (use_ipv6) -+ goto err; -+#endif - if (!ssl_sock_init()) return(0); - -- memset((char *)&server,0,sizeof(server)); -- server.sin_family=AF_INET; -- server.sin_port=htons((unsigned short)port); -- if (ip == NULL) -- server.sin_addr.s_addr=INADDR_ANY; -- else --/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ --#ifndef BIT_FIELD_LIMITS -- memcpy(&server.sin_addr.s_addr,ip,4); -+#if OPENSSL_USE_IPV6 -+ domain = use_ipv6 ? AF_INET6 : AF_INET; - #else -- memcpy(&server.sin_addr,ip,4); -+ domain = AF_INET; - #endif -- -- if (type == SOCK_STREAM) -- s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL); -- else /* type == SOCK_DGRAM */ -- s=socket(AF_INET, SOCK_DGRAM,IPPROTO_UDP); -+ if (type == SOCK_STREAM) -+ s=socket(domain,SOCK_STREAM,SOCKET_PROTOCOL); -+ else /* type == SOCK_DGRAM */ -+ s=socket(domain, SOCK_DGRAM,IPPROTO_UDP); - - if (s == INVALID_SOCKET) goto err; - #if defined SOL_SOCKET && defined SO_REUSEADDR -+ { -+ int j = 1; -+ setsockopt(s, SOL_SOCKET, SO_REUSEADDR, -+ (void *) &j, sizeof j); -+ } -+#endif -+#if OPENSSL_USE_IPV6 -+ if ((use_ipv4 == 0) && (use_ipv6 == 1)) -+ { -+ const int on = 1; -+ -+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, -+ (const void *) &on, sizeof(int)); -+ } -+#endif -+ if (domain == AF_INET) -+ { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in); -+ memset(server_in, 0, sizeof(struct sockaddr_in)); -+ server_in->sin_family=AF_INET; -+ server_in->sin_port = htons((unsigned short)port); -+ if (ip == NULL) -+ server_in->sin_addr.s_addr = htonl(INADDR_ANY); -+ else -+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ -+#ifndef BIT_FIELD_LIMITS -+ memcpy(&server_in->sin_addr.s_addr, ip, 4); -+#else -+ memcpy(&server_in->sin_addr, ip, 4); -+#endif -+ } -+#if OPENSSL_USE_IPV6 -+ else - { -- int j = 1; -- setsockopt(s, SOL_SOCKET, SO_REUSEADDR, -- (void *) &j, sizeof j); -+ addr_len = (socklen_t)sizeof(struct sockaddr_in6); -+ memset(server_in6, 0, sizeof(struct sockaddr_in6)); -+ server_in6->sin6_family = AF_INET6; -+ server_in6->sin6_port = htons((unsigned short)port); -+ if (ip == NULL) -+ server_in6->sin6_addr = in6addr_any; -+ else -+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr)); - } - #endif -- if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1) -+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1) - { - #ifndef OPENSSL_SYS_WINDOWS - perror("bind"); -@@ -377,16 +452,23 @@ - return(ret); - } - --static int init_server(int *sock, int port, int type) -+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6) - { -- return(init_server_long(sock, port, NULL, type)); -+ return(init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6)); - } - - static int do_accept(int acc_sock, int *sock, char **host) - { - int ret; - struct hostent *h1,*h2; -- static struct sockaddr_in from; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage from; -+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from; -+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from; -+#else -+ struct sockaddr_in from; -+ struct sockaddr_in *from_in = &from; -+#endif - int len; - /* struct linger ling; */ - -@@ -433,13 +515,23 @@ - */ - - if (host == NULL) goto end; -+#if OPENSSL_USE_IPV6 -+ if (from.ss_family == AF_INET) -+#else -+ if (from.sin_family == AF_INET) -+#endif - #ifndef BIT_FIELD_LIMITS -- /* I should use WSAAsyncGetHostByName() under windows */ -- h1=gethostbyaddr((char *)&from.sin_addr.s_addr, -- sizeof(from.sin_addr.s_addr),AF_INET); -+ /* I should use WSAAsyncGetHostByName() under windows */ -+ h1=gethostbyaddr((char *)&from_in->sin_addr.s_addr, -+ sizeof(from_in->sin_addr.s_addr), AF_INET); - #else -- h1=gethostbyaddr((char *)&from.sin_addr, -- sizeof(struct in_addr),AF_INET); -+ h1=gethostbyaddr((char *)&from_in->sin_addr, -+ sizeof(struct in_addr), AF_INET); -+#endif -+#if OPENSSL_USE_IPV6 -+ else -+ h1=gethostbyaddr((char *)&from_in6->sin6_addr, -+ sizeof(struct in6_addr), AF_INET6); - #endif - if (h1 == NULL) - { -@@ -457,16 +549,24 @@ - } - BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1); - -- h2=GetHostByName(*host); -+#if OPENSSL_USE_IPV6 -+ h2=GetHostByName(*host, from.ss_family); -+#else -+ h2=GetHostByName(*host, from.sin_family); -+#endif - if (h2 == NULL) - { - BIO_printf(bio_err,"gethostbyname failure\n"); - closesocket(ret); - return(0); - } -- if (h2->h_addrtype != AF_INET) -+#if OPENSSL_USE_IPV6 -+ if (h2->h_addrtype != from.ss_family) -+#else -+ if (h2->h_addrtype != from.sin_family) -+#endif - { -- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); -+ BIO_printf(bio_err,"gethostbyname addr is not correct\n"); - closesocket(ret); - return(0); - } -@@ -482,7 +582,7 @@ - char *h,*p; - - h=str; -- p=strchr(str,':'); -+ p=strrchr(str,':'); - if (p == NULL) - { - BIO_printf(bio_err,"no port defined\n"); -@@ -490,7 +590,7 @@ - } - *(p++)='\0'; - -- if ((ip != NULL) && !host_ip(str,ip)) -+ if ((ip != NULL) && !host_ip(str,ip,AF_INET)) - goto err; - if (host_ptr != NULL) *host_ptr=h; - -@@ -501,48 +601,58 @@ - return(0); - } - --static int host_ip(char *str, unsigned char ip[4]) -+static int host_ip(char *str, unsigned char *ip, int domain) - { -- unsigned int in[4]; -+ unsigned int in[4]; -+ unsigned long l; - int i; - -- if (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4) -+ if ((domain == AF_INET) && -+ (sscanf(str,"%u.%u.%u.%u",&(in[0]),&(in[1]),&(in[2]),&(in[3])) == 4)) - { -+ - for (i=0; i<4; i++) - if (in[i] > 255) - { - BIO_printf(bio_err,"invalid IP address\n"); - goto err; - } -- ip[0]=in[0]; -- ip[1]=in[1]; -- ip[2]=in[2]; -- ip[3]=in[3]; -- } -+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]); -+ memcpy(ip, &l, 4); -+ return 1; -+ } -+#if OPENSSL_USE_IPV6 -+ else if ((domain == AF_INET6) && -+ (inet_pton(AF_INET6, str, ip) == 1)) -+ return 1; -+#endif - else - { /* do a gethostbyname */ - struct hostent *he; - - if (!ssl_sock_init()) return(0); - -- he=GetHostByName(str); -+ he=GetHostByName(str,domain); - if (he == NULL) - { - BIO_printf(bio_err,"gethostbyname failure\n"); - goto err; - } - /* cast to short because of win16 winsock definition */ -- if ((short)he->h_addrtype != AF_INET) -+ if ((short)he->h_addrtype != domain) - { -- BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); -+ BIO_printf(bio_err,"gethostbyname addr family is not correct\n"); - return(0); - } -- ip[0]=he->h_addr_list[0][0]; -- ip[1]=he->h_addr_list[0][1]; -- ip[2]=he->h_addr_list[0][2]; -- ip[3]=he->h_addr_list[0][3]; -+ if (domain == AF_INET) -+ memset(ip, 0, 4); -+#if OPENSSL_USE_IPV6 -+ else -+ memset(ip, 0, 16); -+#endif -+ memcpy(ip, he->h_addr_list[0], he->h_length); -+ return 1; - } -- return(1); - err: - return(0); - } -@@ -579,7 +689,7 @@ - static unsigned long ghbn_hits=0L; - static unsigned long ghbn_miss=0L; - --static struct hostent *GetHostByName(char *name) -+static struct hostent *GetHostByName(char *name, int domain) - { - struct hostent *ret; - int i,lowi=0; -@@ -594,14 +704,20 @@ - } - if (ghbn_cache[i].order > 0) - { -- if (strncmp(name,ghbn_cache[i].name,128) == 0) -+ if ((strncmp(name,ghbn_cache[i].name,128) == 0) && -+ (ghbn_cache[i].ent.h_addrtype == domain)) - break; - } - } - if (i == GHBN_NUM) /* no hit*/ - { - ghbn_miss++; -- ret=gethostbyname(name); -+ if (domain == AF_INET) -+ ret=gethostbyname(name); -+#if OPENSSL_USE_IPV6 -+ else -+ ret=gethostbyname2(name, AF_INET6); -+#endif - if (ret == NULL) return(NULL); - /* else add to cache */ - if(strlen(name) < sizeof ghbn_cache[0].name) diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml index d6bf0bcf4a41..38505776ece0 100644 --- a/dev-libs/openssl/metadata.xml +++ b/dev-libs/openssl/metadata.xml @@ -4,6 +4,7 @@ base-system Disable EC/RC5 algorithms (as they seem to be patented) -- note: changes the ABI + Support for Stream Control Transmission Protocol Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers) Enable the Heartbeat Extension in TLS and DTLS diff --git a/dev-libs/openssl/openssl-1.0.2_beta3.ebuild b/dev-libs/openssl/openssl-1.0.2-r1.ebuild similarity index 94% rename from dev-libs/openssl/openssl-1.0.2_beta3.ebuild rename to dev-libs/openssl/openssl-1.0.2-r1.ebuild index a715b3125195..0bac611268ea 100644 --- a/dev-libs/openssl/openssl-1.0.2_beta3.ebuild +++ b/dev-libs/openssl/openssl-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2_beta3.ebuild,v 1.1 2014/09/26 06:05:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.2-r1.ebuild,v 1.1 2015/01/23 15:30:57 polynomial-c Exp $ EAPI="4" @@ -15,8 +15,8 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz LICENSE="openssl" 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="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib" +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="bindist gmp kerberos rfc3779 sctp sse2 static-libs test +tls-heartbeat vanilla zlib" # The blocks are temporary just to make sure people upgrade to a # version that lack runtime version checking. We'll drop them in @@ -33,6 +33,7 @@ RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} sys-apps/diffutils >=dev-lang/perl-5 + sctp? ( net-misc/lksctp-tools ) test? ( sys-devel/bc )" PDEPEND="app-misc/ca-certificates" @@ -58,8 +59,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 epatch "${FILESDIR}"/${PN}-1.0.2-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.2_beta2-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584 + epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch + epatch "${FILESDIR}"/${PN}-1.0.2-s_client-verify.patch #472584 epatch_user #332661 fi @@ -143,6 +144,7 @@ multilib_src_configure() { echoit \ ./${config} \ ${sslout} \ + $(use sctp && echo "sctp") \ $(use sse2 || echo "no-sse2") \ enable-camellia \ $(use_ssl !bindist ec) \ diff --git a/dev-perl/Clone/Clone-0.370.0.ebuild b/dev-perl/Clone/Clone-0.370.0.ebuild index 5c30ce3f4a6c..879c97c9ef09 100644 --- a/dev-perl/Clone/Clone-0.370.0.ebuild +++ b/dev-perl/Clone/Clone-0.370.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Clone/Clone-0.370.0.ebuild,v 1.1 2015/01/09 22:45:08 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Clone/Clone-0.370.0.ebuild,v 1.2 2015/01/23 12:05:57 zlogene Exp $ EAPI=5 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Recursively copy Perl datatypes" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" SRC_TEST="do" mymake='OPTIMIZE=${CFLAGS}' diff --git a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild index d9b0e30a86eb..9da566f6394b 100644 --- a/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild +++ b/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild,v 1.5 2015/01/22 18:23:29 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/Spreadsheet-WriteExcel/Spreadsheet-WriteExcel-2.400.0.ebuild,v 1.6 2015/01/23 12:03:42 zlogene Exp $ EAPI=5 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Write cross-platform Excel binary file" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 amd64-fbsd ~x86-fbsd" IUSE="" RDEPEND="virtual/perl-File-Temp diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild index 60ce0115ed95..a09aa6cf6412 100644 --- a/dev-python/funcsigs/funcsigs-0.4.ebuild +++ b/dev-python/funcsigs/funcsigs-0.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/funcsigs/funcsigs-0.4.ebuild,v 1.2 2014/06/27 01:50:48 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/funcsigs/funcsigs-0.4.ebuild,v 1.3 2015/01/23 11:57:49 jlec Exp $ EAPI=5 @@ -17,8 +17,10 @@ LICENSE="Apache-2.0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="test" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -DEPEND="test? ( dev-python/unittest2[${PYTHON_USEDEP}] )" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/unittest2[${PYTHON_USEDEP}] )" +RDEPEND="" python_test() { esetup.py test diff --git a/media-plugins/vdr-remote/vdr-remote-0.5.0-r1.ebuild b/media-plugins/vdr-remote/vdr-remote-0.5.0-r1.ebuild new file mode 100644 index 000000000000..0e54c4a50142 --- /dev/null +++ b/media-plugins/vdr-remote/vdr-remote-0.5.0-r1.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-remote/vdr-remote-0.5.0-r1.ebuild,v 1.1 2015/01/23 13:49:34 hd_brummy Exp $ + +EAPI=5 + +inherit vdr-plugin-2 + +DESCRIPTION="VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards)" +HOMEPAGE="http://www.escape-edv.de/endriss/vdr/" +SRC_URI="http://www.escape-edv.de/endriss/vdr/${P}.tgz" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="systemd" + +DEPEND=">=media-video/vdr-2" +RDEPEND="${DEPEND}" + +pkg_setup() { + vdr-plugin-2_pkg_setup + + if use systemd; then + if ! getent group input | grep -q vdr; then + einfo "add user 'vdr' to group 'input' for full access to remote control device" + gpasswd -a vdr input + fi + fi +} diff --git a/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild b/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild index d76d94721519..6dac588ce56d 100644 --- a/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild +++ b/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild,v 1.1 2015/01/18 21:28:11 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-rssreader/vdr-rssreader-2.0.1.ebuild,v 1.2 2015/01/23 15:25:27 hd_brummy Exp $ EAPI=5 @@ -21,7 +21,7 @@ DEPEND=">=media-video/vdr-2.0.0 RDEPEND="${DEPEND}" -PATCHES=("${FILESDIR}/${P}-gentoo.diff") +PATCHES=("${FILESDIR}/${PN}-2.0.0-gentoo.diff") src_install() { vdr-plugin-2_src_install diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest index 7822281d65f0..52e778da6c5c 100644 --- a/media-radio/unixcw/Manifest +++ b/media-radio/unixcw/Manifest @@ -1,3 +1,4 @@ DIST unixcw-3.3.0.tar.gz 676649 SHA256 5acaeef7c1c8803161820458f0dd21cf1f401ff910f7641685951224ffe53fb7 SHA512 eb2085818d3a6735ebaa33477366e556685f8796dc0baf2123cfdecbc4c9548a06993e83ed70f54da498fad593e7b2641ae775e0d3561d7012a039c1442e6a2e WHIRLPOOL f23688051c211b6cc7d46f0e3bafd6f1437d6523d2afa0590fd04240e845b0059b4efb47dbb2f79e4ec3fe0fed575f3ef2b6fa16c8415027070cd1e4c0c60132 DIST unixcw-3.3.1.tar.gz 677296 SHA256 ec905e3f5ef84e4d28ce1b3524c9128c5c61db9967ba213572a3be043a9928db SHA512 11dd17af3bf88a5e84aad137ed8cb130fc61ee466129f431d8d810e48d7d10e2f2bc90cec4e7a9ab6db35bd796a6f8a3b698592bfac33b9bb07862116ed3eac0 WHIRLPOOL 7346e3b83f42298db57921bdddcfe8f4067b3dfa2c6f6ad5ca41aa0fc51f4232176251b6d00b3fc25f4579c2b2cca8f83b9ba484f6ca68cedc4886180af00761 DIST unixcw-3.4.0.tar.gz 700095 SHA256 11a678ec616f8b22d319c988365750bb7e0ee7570c7dcdbbd37669d6123ea972 SHA512 9271c47c77d2240387c3d305d952f09eb1ecdb6f9191a16e03f00d2921d16e229b4ee50f05d540fd3ed3da4040c134e1e8ac414ac81d983200c630c55f4f372f WHIRLPOOL c41b132e164792b43faf1bc24cf8cc034f62c8b18cd252b42cfde348a004f0b028e91a589c4e0f6a060ebd4c7bb901b1a406bff175f0cccdb3ac9286a684736a +DIST unixcw-3.4.1.tar.gz 692181 SHA256 9c0bb1fc4a2a18918fe8b73ddc72df8806181fa490e0b2ef5ea116b934ac0727 SHA512 0dd8717ef921019adfb94812f2c9ec3f0be88b94910eb3548e71383523a1f5de13f1ed60be98ab1bcd568ccabc3dfff38100f1b97fbf54b0b5ef8469dfa013e7 WHIRLPOOL 333df1c05442e5152a391a52d1af0c9fffa1e5bba65b203485df3bb78f3bafa40df43cb1b588213b5685e85d791478ce00beda131559368bed201ced67999982 diff --git a/media-radio/unixcw/unixcw-3.4.1.ebuild b/media-radio/unixcw/unixcw-3.4.1.ebuild new file mode 100644 index 000000000000..737807fa3e8f --- /dev/null +++ b/media-radio/unixcw/unixcw-3.4.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-radio/unixcw/unixcw-3.4.1.ebuild,v 1.1 2015/01/23 14:08:20 tomjbe Exp $ + +EAPI=5 + +inherit eutils flag-o-matic multilib + +DESCRIPTION="A package of programs that fit together to form a morse code tutor program" +HOMEPAGE="http://unixcw.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" +IUSE="alsa ncurses pulseaudio suid qt4" + +RDEPEND="ncurses? ( sys-libs/ncurses ) + qt4? ( dev-qt/qtgui:4[qt3support] ) + alsa? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio )" +DEPEND="${RDEPEND} + virtual/pkgconfig + sys-devel/libtool + !<=app-misc/cw-1.0.16-r1" + +src_prepare() { + append-cflags -std=gnu99 +} + +src_configure() { + econf --libdir=/usr/$(get_libdir) \ + $(use_enable pulseaudio ) \ + $(use_enable alsa ) \ + $(use_enable ncurses cwcp ) \ + $(use_enable qt4 xcwcp ) +} + +src_install() { + emake DESTDIR="${D}" install + prune_libtool_files + dodoc ChangeLog NEWS README + if ! use suid ; then + fperms 711 /usr/bin/cw + if use ncurses ; then + fperms 711 /usr/bin/cwcp + fi + if use qt4 ; then + fperms 711 /usr/bin/xcwcp + fi + fi +} + +pkg_postinst() { + if use suid ; then + ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid" + ewarn "by setting USE=suid." + ewarn "Be aware that this is a security risk and not recommended." + ewarn "" + ewarn "These files do only need root access if you want to use the" + ewarn "PC speaker for morse sidetone output. You can alternativly" + ewarn "drop USE=suid and use sudo." + else + elog "Be aware that 'cw', 'cwcp' and 'xcwcp' needs root access if" + elog "you want to use the PC speaker for morse sidetone output." + elog "You can call the programs via sudo for that (see 'man sudo')." + fi +} diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index 339c3414ba7c..5515ad199630 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Fri, 23 Jan 2015 10:36:58 +0000 +Fri, 23 Jan 2015 17:07:00 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index 3dd1565b8f37..fb5118841d0c 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Fri, 23 Jan 2015 10:36:59 +0000 +Fri, 23 Jan 2015 17:07:01 +0000 diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.3 b/metadata/md5-cache/dev-lang/tcl-8.6.3 index edcc710407fa..ef639531c521 100644 --- a/metadata/md5-cache/dev-lang/tcl-8.6.3 +++ b/metadata/md5-cache/dev-lang/tcl-8.6.3 @@ -10,4 +10,4 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a SLOT=0/8.6 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.3-src.tar.gz _eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f -_md5_=6a5d6866894403887be16459c5d88371 +_md5_=fd40fd4c7f754bb44069a01737323b7c diff --git a/metadata/md5-cache/dev-lang/tk-8.6.3 b/metadata/md5-cache/dev-lang/tk-8.6.3 index 9e3c0f95d9e4..11184a60aa7e 100644 --- a/metadata/md5-cache/dev-lang/tk-8.6.3 +++ b/metadata/md5-cache/dev-lang/tk-8.6.3 @@ -1,13 +1,13 @@ -DEFINED_PHASES=configure install prepare test -DEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.6.3 !aqua? ( x11-proto/xproto ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) +DEFINED_PHASES=compile configure install prepare test +DEPEND=!aqua? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( x11-libs/libXScrnSaver[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !aqua? ( x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) DESCRIPTION=Tk Widget Set EAPI=5 HOMEPAGE=http://www.tcl.tk/ -IUSE=debug +threads truetype aqua xscreensaver test +IUSE=debug +threads truetype aqua xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris LICENSE=tcltk -RDEPEND=!aqua? ( media-libs/fontconfig x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.6.3 +RDEPEND=!aqua? ( media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] truetype? ( x11-libs/libXft[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( x11-libs/libXScrnSaver[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ~dev-lang/tcl-8.6.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] SLOT=0/8.6 SRC_URI=mirror://sourceforge/tcl/tk8.6.3-src.tar.gz -_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86 -_md5_=fc931b440e15abd480af313c03f80de6 +_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86 +_md5_=c5551c9481193485b1310e1e2092bf4b diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2_beta3 b/metadata/md5-cache/dev-libs/openssl-1.0.2-r1 similarity index 77% rename from metadata/md5-cache/dev-libs/openssl-1.0.2_beta3 rename to metadata/md5-cache/dev-libs/openssl-1.0.2-r1 index 38e31a1fbe7c..9c85a94a20ed 100644 --- a/metadata/md5-cache/dev-libs/openssl-1.0.2_beta3 +++ b/metadata/md5-cache/dev-libs/openssl-1.0.2-r1 @@ -1,13 +1,14 @@ DEFINED_PHASES=compile configure install postinst preinst prepare test -DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-lang/perl-5 test? ( sys-devel/bc ) +DEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !=dev-lang/perl-5 sctp? ( net-misc/lksctp-tools ) test? ( sys-devel/bc ) DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS) EAPI=4 HOMEPAGE=http://www.openssl.org/ -IUSE=bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +IUSE=bindist gmp kerberos rfc3779 sctp sse2 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +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 LICENSE=openssl PDEPEND=app-misc/ca-certificates RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) ! openssl-c_rehash.sh.1.7 +SRC_URI=mirror://openssl/source/openssl-1.0.2.tar.gz http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c_rehash.sh?rev=1.7 -> openssl-c_rehash.sh.1.7 _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=b30898d9072e3b3e59ab695afdd5462c +_md5_=32a63c39887c1fa699f9adf7f50de418 diff --git a/metadata/md5-cache/dev-perl/Clone-0.370.0 b/metadata/md5-cache/dev-perl/Clone-0.370.0 index f82e7cdeadcd..2f317a620a4f 100644 --- a/metadata/md5-cache/dev-perl/Clone-0.370.0 +++ b/metadata/md5-cache/dev-perl/Clone-0.370.0 @@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=[-build(-)] DESCRIPTION=Recursively copy Perl datatypes EAPI=5 HOMEPAGE=http://search.cpan.org/dist/Clone/ -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris +KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris LICENSE=|| ( Artistic GPL-1+ ) RDEPEND=dev-lang/perl:=[-build(-)] SLOT=0 SRC_URI=mirror://cpan/authors/id/G/GA/GARU/Clone-0.37.tar.gz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 4e599aab78ebadca09ce51369fa9019d toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=c1544583f2b147623cefecdd6cbcd23f +_md5_=6c4c351a1c3cc04af38f11edb59a9cde diff --git a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 index e18ac2887502..39dc39a0b1de 100644 --- a/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 +++ b/metadata/md5-cache/dev-perl/Spreadsheet-WriteExcel-2.400.0 @@ -3,10 +3,10 @@ DEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLi DESCRIPTION=Write cross-platform Excel binary file EAPI=5 HOMEPAGE=http://search.cpan.org/dist/Spreadsheet-WriteExcel/ -KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd +KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 amd64-fbsd ~x86-fbsd LICENSE=|| ( Artistic GPL-1+ ) RDEPEND=virtual/perl-File-Temp dev-perl/Parse-RecDescent >=dev-perl/OLE-StorageLite-0.19 dev-perl/IO-stringy dev-lang/perl:=[-build(-)] SLOT=0 SRC_URI=mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 perl-module 4e599aab78ebadca09ce51369fa9019d toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 -_md5_=70c80bdd679d6760e32fa90d5d115ab7 +_md5_=3c9e0ec64f95465d56ce09fb3d0e0deb diff --git a/metadata/md5-cache/dev-python/funcsigs-0.4 b/metadata/md5-cache/dev-python/funcsigs-0.4 index be98709878f2..7d12662b2858 100644 --- a/metadata/md5-cache/dev-python/funcsigs-0.4 +++ b/metadata/md5-cache/dev-python/funcsigs-0.4 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install prepare test -DEPEND=test? ( dev-python/unittest2[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] +DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] test? ( dev-python/unittest2[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) dev-lang/python-exec:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] DESCRIPTION=Python function signatures from PEP362 for Python 2.7 EAPI=5 HOMEPAGE=https://pypi.python.org/pypi/funcsigs @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) SLOT=0 SRC_URI=mirror://pypi/f/funcsigs/funcsigs-0.4.tar.gz _eclasses_=distutils-r1 5cf77567a87c3a6f59d6a51848ebde98 eutils 998e5931fb95b10a6a11ec796ada2759 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multiprocessing d7f2985a2c76c365ee20269db5261414 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=2cf9ddbad08d68875c4bd9e59b70d18d +_md5_=f8654dde160e809199d38bd11f624dbe diff --git a/metadata/md5-cache/media-plugins/vdr-remote-0.5.0-r1 b/metadata/md5-cache/media-plugins/vdr-remote-0.5.0-r1 new file mode 100644 index 000000000000..b3cf357f82a7 --- /dev/null +++ b/metadata/md5-cache/media-plugins/vdr-remote-0.5.0-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile config install postinst postrm prepare setup unpack +DEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers +DESCRIPTION=VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards) +EAPI=5 +HOMEPAGE=http://www.escape-edv.de/endriss/vdr/ +IUSE=systemd +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=media-video/vdr-2 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2 +SLOT=0 +SRC_URI=http://www.escape-edv.de/endriss/vdr/vdr-remote-0.5.0.tgz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 vdr-plugin-2 abe06aa01a351d441519a8a4bcde9b43 +_md5_=3d2ab221b7eaae238bbbd623200aefef diff --git a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 index 8a9908f2ba68..34ca22d11a2d 100644 --- a/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 +++ b/metadata/md5-cache/media-plugins/vdr-rssreader-2.0.1 @@ -9,4 +9,4 @@ RDEPEND=>=media-video/vdr-2.0.0 >=dev-libs/expat-1.95.8 >=net-misc/curl-7.15.1-r SLOT=0 SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/rssreader/files/vdr-rssreader-2.0.1.tgz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac unpacker f300a7ca9131b1024a79762e8edd3c52 vdr-plugin-2 abe06aa01a351d441519a8a4bcde9b43 -_md5_=36a80da9930a7d25b3b5972173e13a14 +_md5_=494edaffc2b3be6003eee2a0a8c21fb1 diff --git a/metadata/md5-cache/media-radio/unixcw-3.4.1 b/metadata/md5-cache/media-radio/unixcw-3.4.1 new file mode 100644 index 000000000000..2fde46df723f --- /dev/null +++ b/metadata/md5-cache/media-radio/unixcw-3.4.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig sys-devel/libtool !<=app-misc/cw-1.0.16-r1 +DESCRIPTION=A package of programs that fit together to form a morse code tutor program +EAPI=5 +HOMEPAGE=http://unixcw.sourceforge.net +IUSE=alsa ncurses pulseaudio suid qt4 +KEYWORDS=~alpha ~amd64 ~ppc ~x86 +LICENSE=GPL-2 +RDEPEND=ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtgui:4[qt3support] ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) +SLOT=0 +SRC_URI=mirror://sourceforge/unixcw/unixcw-3.4.1.tar.gz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=2881a1084c0e224afcaffaa0c615c892 diff --git a/metadata/md5-cache/sci-biology/mira-3.9.18 b/metadata/md5-cache/sci-biology/mira-3.9.18 index bf8a575f19b3..01567f566e1c 100644 --- a/metadata/md5-cache/sci-biology/mira-3.9.18 +++ b/metadata/md5-cache/sci-biology/mira-3.9.18 @@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost dev-util/google-perftools SLOT=0 SRC_URI=http://sourceforge.net/projects/mira-assembler/files/MIRA/development/mira-3.9.18.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_06-07-2012.tar.bz2 _eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=aabdc82032bcb90b0b45bbd353407106 +_md5_=f753ff4892fb9e7b76395f446e3a9f6c diff --git a/metadata/md5-cache/sci-biology/mira-4.0.2 b/metadata/md5-cache/sci-biology/mira-4.0.2 new file mode 100644 index 000000000000..59ad862dbabf --- /dev/null +++ b/metadata/md5-cache/sci-biology/mira-4.0.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install postinst prepare +DEPEND=dev-libs/boost dev-util/google-perftools app-editors/vim-core dev-libs/expat !=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina +EAPI=5 +HOMEPAGE=http://www.chevreux.org/projects_mira.html +IUSE=doc +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos +LICENSE=GPL-2 +RDEPEND=dev-libs/boost dev-util/google-perftools +SLOT=0 +SRC_URI=http://sourceforge.net/projects/mira-assembler/files/MIRA/stable/mira-4.0.2.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_06-07-2012.tar.bz2 +_eclasses_=autotools 8fc2dd333ef9346c906ffd9a523d8211 eutils 998e5931fb95b10a6a11ec796ada2759 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=dca0f25d8fff22c8df266da055f36534 diff --git a/metadata/md5-cache/sys-block/ms-sys-2.5.0 b/metadata/md5-cache/sys-block/ms-sys-2.5.0 new file mode 100644 index 000000000000..cb17980522b8 --- /dev/null +++ b/metadata/md5-cache/sys-block/ms-sys-2.5.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install +DEPEND=sys-devel/gettext +DESCRIPTION=A command-line program for writing Microsoft compatible boot records +EAPI=5 +HOMEPAGE=http://ms-sys.sourceforge.net +IUSE=linguas_sv +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=virtual/libintl +SLOT=0 +SRC_URI=mirror://sourceforge/ms-sys/ms-sys-2.5.0.tar.gz +_eclasses_=multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=c391df0cfd95070725b7576af88d0fd0 diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.1 b/metadata/md5-cache/sys-devel/llvm-3.5.1 index 451ac7181611..673157af1fd3 100644 --- a/metadata/md5-cache/sys-devel/llvm-3.5.1 +++ b/metadata/md5-cache/sys-devel/llvm-3.5.1 @@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( py SLOT=0/3.5 SRC_URI=http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz clang? ( http://llvm.org/releases/3.5.1/compiler-rt-3.5.1.src.tar.xz http://llvm.org/releases/3.5.1/cfe-3.5.1.src.tar.xz http://llvm.org/releases/3.5.1/clang-tools-extra-3.5.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 ) _eclasses_=check-reqs a7f404bfb16e0a996700c5d3ac4edad3 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pax-utils dfe060cb70d89757fde5c1ff8405e950 prefix 21058c21ca48453d771df15500873ede python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=fee38f9dd3cd8503ee56d335d7d34783 +_md5_=bbcb1946f7e16aaa97a78603ecaa2fe0 diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999 index 14c9b0819be1..0245bda2ebc4 100644 --- a/metadata/md5-cache/sys-devel/llvm-9999 +++ b/metadata/md5-cache/sys-devel/llvm-9999 @@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) ) SLOT=0/9999 _eclasses_=check-reqs a7f404bfb16e0a996700c5d3ac4edad3 eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 git-r3 6ebae45064cb04482f3c702632dd9528 multibuild 6d4858dc00f8bc51caf3f957f8430eb0 multilib 3bf24e6abb9b76d9f6c20600f0b716bf multilib-build 0983c7893df461213a05f791cc7dea6d multilib-minimal 13dd976916c35a1e2c8d170e840c7018 pax-utils dfe060cb70d89757fde5c1ff8405e950 python-r1 236a8d81f730332749bd484d8b53ee91 python-utils-r1 7d5f4ad9ba85664d8c5f56041a70f4c3 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=16e8ff72a7f49b4886d79b54e2a98895 +_md5_=599c435b622e1b25256e385991a0e243 diff --git a/metadata/md5-cache/x11-misc/slock-1.2 b/metadata/md5-cache/x11-misc/slock-1.2 index 68125cdfefd2..678446d032e1 100644 --- a/metadata/md5-cache/x11-misc/slock-1.2 +++ b/metadata/md5-cache/x11-misc/slock-1.2 @@ -4,10 +4,10 @@ DESCRIPTION=simple X screen locker EAPI=5 HOMEPAGE=http://tools.suckless.org/slock IUSE=+filecaps savedconfig -KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd +KEYWORDS=~amd64 hppa ~x86 ~x86-fbsd LICENSE=MIT RDEPEND=x11-libs/libX11 x11-libs/libXext SLOT=0 SRC_URI=http://dl.suckless.org/tools/slock-1.2.tar.gz _eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 fcaps c247b6885e1ff14f794a0eb65fb1e8ec multilib 3bf24e6abb9b76d9f6c20600f0b716bf portability a45c088f246ef5091e029f6285d7ce42 savedconfig 5313100f525c41f6c72c6e04edeb4f65 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac -_md5_=3f75da6fa07242b8231c8f47867c101e +_md5_=1478cbf79b1fba12c02cfad3142656d3 diff --git a/metadata/md5-cache/x11-terms/xterm-314 b/metadata/md5-cache/x11-terms/xterm-314 new file mode 100644 index 000000000000..003cb95476e5 --- /dev/null +++ b/metadata/md5-cache/x11-terms/xterm-314 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install setup +DEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7 x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) virtual/pkgconfig x11-proto/kbproto x11-proto/xproto +DESCRIPTION=Terminal Emulator for X Windows +EAPI=5 +HOMEPAGE=http://invisible-island.net/xterm/ +IUSE=+openpty toolbar truetype unicode Xaw3d +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=MIT +RDEPEND=kernel_linux? ( sys-libs/libutempter ) kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) >=sys-libs/ncurses-5.7-r7 x11-apps/xmessage x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) media-fonts/font-misc-misc +SLOT=0 +SRC_URI=ftp://invisible-island.net/xterm/xterm-314.tgz +_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac +_md5_=a52ffb8ce7e74b870f9f825b618732e5 diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index 33cdd7cd9255..f27f437fbdd6 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Fri, 23 Jan 2015 10:37:02 +0000 +Fri, 23 Jan 2015 17:07:04 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 8386108514ec..af03620ad80b 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Fri Jan 23 10:36:58 UTC 2015 +Fri Jan 23 17:07:00 UTC 2015 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index d8f31a19ab87..b4499802675b 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Fri, 23 Jan 2015 11:00:01 +0000 +Fri, 23 Jan 2015 17:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index 3f67c848722e..9e0c6fb45e59 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1422009301 Fri 23 Jan 2015 10:35:01 AM UTC UTC +1422032701 Fri 23 Jan 2015 05:05:01 PM UTC UTC diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask index cd253f77ccef..52efd07cf7df 100644 --- a/profiles/arch/amd64-fbsd/package.use.mask +++ b/profiles/arch/amd64-fbsd/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/package.use.mask,v 1.25 2015/01/18 10:07:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64-fbsd/package.use.mask,v 1.26 2015/01/23 11:09:41 polynomial-c Exp $ # Michael Palimaka (17 Nov 2014) +# Lars Wendler (23 Jan 2015) # Missing keywords +dev-libs/openssl sctp net-misc/openssh sctp # Pacho Ramos (01 Jun 2014) diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 2b18fc5707fd..73bc2282a264 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -1977,6 +1977,7 @@ dev-libs/opensc:pcsc-lite - Use sys-apps/pcsc-lite (and PC/SC API) for accessing dev-libs/opensc:secure-messaging - Enable secure messaging. dev-libs/openssl:bindist - Disable EC/RC5 algorithms (as they seem to be patented) -- note: changes the ABI dev-libs/openssl:rfc3779 - Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers) +dev-libs/openssl:sctp - Support for Stream Control Transmission Protocol dev-libs/openssl:tls-heartbeat - Enable the Heartbeat Extension in TLS and DTLS dev-libs/pkcs11-helper:nss - Enable NSS crypto engine dev-libs/ppl:lpsol - Build the ppl_lpsol linear programming problem solver diff --git a/sci-biology/mira/Manifest b/sci-biology/mira/Manifest index 544291897e0f..c28e9bc9197a 100644 --- a/sci-biology/mira/Manifest +++ b/sci-biology/mira/Manifest @@ -1,2 +1,3 @@ DIST mira-3.9.18.tar.bz2 10378027 SHA256 ca8236b570cf8d3eabfc394edea33a3406e9e8b9e0b8aca9a418d20679710747 SHA512 99bfc0200f8220bdd4ddffb608d2e4e2bf9554cda0f7934c5252e22b01fa93b12105e3e55d59c994ef004d71c0396170ff170bd7494250c961e150123349b914 WHIRLPOOL 90e6016e62b28d5ac681a7da4ae81363da74137002dc6c19e23c8b53a777cd020d727ac2dfd67f126728317ece7b51ea4dab153a720e37b6ac31aa07d5b633b9 +DIST mira-4.0.2.tar.bz2 10368046 SHA256 a32cb2b21e0968a5536446287c895fe9e03d11d78957554e355c1080b7b92a80 SHA512 a7f9845de207cefb87ffa652f4f6b9b85735ef22eeb29b456e4d946ba1675e7dd2c78abb2da56f11fddcb699f5c0700a08ce298196ce1a8e586a758a8d3bdc7e WHIRLPOOL d038472f9b129e97883f59c471df51f07315ee38eda5a9e804cdd2d33988306162b1bb1dde2cb7fd510c82be5734240dfd69364d39865a47af439762c7154747 DIST mira_3rdparty_06-07-2012.tar.bz2 31656 SHA256 53cbbb9d57e2fa51706b3f1d055621c0863091542b8851f3ce8a45850951d7d2 SHA512 4d4dbdf7ab5126f9d47160bee8bc127b6a225de8087f6b9914c754324a74d966333207c86a3f38cf0ea9f91408707e2a24086dbe1318fdfa2870b0c39bc5033b WHIRLPOOL c9946ddc032d6864a33e7a60a4d1a515262ca2204535c7d81dcc73144b4f471f766007082d1912fc4ca219a9cbb4ac5a485451c625a7ffcc1949fb8574a3f3d2 diff --git a/sci-biology/mira/mira-3.9.18.ebuild b/sci-biology/mira/mira-3.9.18.ebuild index f08b17363e11..53ef0df29303 100644 --- a/sci-biology/mira/mira-3.9.18.ebuild +++ b/sci-biology/mira/mira-3.9.18.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-3.9.18.ebuild,v 1.3 2014/01/14 13:52:56 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-3.9.18.ebuild,v 1.4 2015/01/23 11:25:31 jlec Exp $ EAPI=5 @@ -41,6 +41,7 @@ src_prepare() { -e "s:-funroll-loops::g" \ -i configure.ac || die + ln -s config/m4 . || die AT_M4DIR="config/m4" eautoreconf } diff --git a/sci-biology/mira/mira-4.0.2.ebuild b/sci-biology/mira/mira-4.0.2.ebuild new file mode 100644 index 000000000000..8ae345aeeef5 --- /dev/null +++ b/sci-biology/mira/mira-4.0.2.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sci-biology/mira/mira-4.0.2.ebuild,v 1.1 2015/01/23 11:48:13 jlec Exp $ + +EAPI=5 + +MIRA_3RDPARTY_PV="06-07-2012" +MY_PV="${PV/_}" # convert from mira-4.0_rc2 (Gentoo ebuild filename derived) to mira-4.0rc2 (upstream fromat) + +inherit autotools eutils multilib + +DESCRIPTION="Whole Genome Shotgun and EST Sequence Assembler for Sanger, 454 and Solexa / Illumina" +HOMEPAGE="http://www.chevreux.org/projects_mira.html" +SRC_URI=" + http://sourceforge.net/projects/mira-assembler/files/MIRA/stable/"${PN}"-"${MY_PV}".tar.bz2 + mirror://sourceforge/mira-assembler/mira_3rdparty_${MIRA_3RDPARTY_PV}.tar.bz2" +# http://sourceforge.net/projects/mira-assembler/files/MIRA/development/${P}.tar.bz2 +# mirror://sourceforge/mira-assembler/mira_3rdparty_${MIRA_3RDPARTY_PV}.tar.bz2" + +S="${WORKDIR}"/"${PN}"-"${MY_PV}" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="doc" + +CDEPEND=" + dev-libs/boost + dev-util/google-perftools" +DEPEND="${CDEPEND} + app-editors/vim-core + dev-libs/expat" +RDEPEND="${CDEPEND}" + +#DOCS=( AUTHORS GETTING_STARTED NEWS README HELP_WANTED +# THANKS doc/3rdparty/scaffolding_MIRA_BAMBUS.pdf ) +DOCS=( AUTHORS GETTING_STARTED NEWS README HELP_WANTED THANKS ) + +src_prepare() { + find -name 'configure*' -or -name 'Makefile*' | xargs sed -i 's/flex++/flex -+/' || die + epatch \ + "${FILESDIR}"/${PN}-3.4.0.2-boost-1.50.patch + + sed \ + -e "s:-O[23]::g" \ + -e "s:-funroll-loops::g" \ + -i configure.ac || die + + eautoreconf +} + +src_configure() { + econf \ + --with-boost="${EPREFIX}/usr/$(get_libdir)" \ + --with-boost-libdir="${EPREFIX}/usr/$(get_libdir)" \ + --with-boost-thread=boost_thread-mt +} + +#src_compile() { +# base_src_compile +# # TODO: resolve docbook incompatibility for building docs +# if use doc; then emake -C doc clean docs || die; fi +#} + +src_install() { + default + dodoc ${DOCS[@]} + + dobin "${WORKDIR}"/3rdparty/{sff_extract,qual2ball,*.pl} + dodoc "${WORKDIR}"/3rdparty/{README.txt,midi_screen.fasta} +} + +pkg_postinst() { + einfo "Documentation is no longer built, you can find it at:" + einfo "http://mira-assembler.sourceforge.net/docs/DefinitiveGuideToMIRA.html" +} diff --git a/sys-block/ms-sys/Manifest b/sys-block/ms-sys/Manifest index a54a350e82d1..429ce69db328 100644 --- a/sys-block/ms-sys/Manifest +++ b/sys-block/ms-sys/Manifest @@ -1,2 +1,3 @@ DIST ms-sys-2.3.0.tar.gz 44949 SHA256 7b271c35426d4f748b2e7da1dd6e8dad5fdd90dea40eb2e467a8908e39759d4d SHA512 f7af08a24b223bb2b01f4906b6228df3bccfb290d67b346304f603bbb9dfddebeb87ca5b8ea8304a061c3266b753200cf25ce3fdf6bc1edf02b8b3d5564f2d8b WHIRLPOOL de4c09566c03f948b7f374c58a92eea9cfa8509de0e64483a111d267054c41918cdb412113b6c1a51c7b03a8c1c664c73f096e6c914c38ef64db804e11bc672c DIST ms-sys-2.4.0.tar.gz 46501 SHA256 afcfefb52350f632bbd4671c3f97df09e42a60d0de3e56d42682450c7ebf689e SHA512 17e2496d2e4815180b9f33fa0f206953fb3484e01c115a2e67d110fb04d421be7e694a434d991a7518579eadb9dce4e907dbd849dbaf6fb506758c425faa14ec WHIRLPOOL f85390ff016f42fd750e9b2d1fe34e132cb5e7cba141141863dc420bcca436fcc4bb5d2181d0c6e2f633ca2b10dc36f562ac2c1c0f688f3c320287dfab856cac +DIST ms-sys-2.5.0.tar.gz 48383 SHA256 f2a4b3a39dce7fdcc871f011794ac26c1e161991a216124a8a3cde1e8c61a854 SHA512 306c39ed8c3c77047d3c0aaa2ce07edd00d8e6d358923910325d3c81252ac0f48ff64b87309c21197c063b7b4f67339af476bb3b6ae0bd5ac759ef26b3f74ea4 WHIRLPOOL cd4ef331b211ae7b61b1f26942018a3c896db34496f179ab76ec6b58799fcf789e2ed98bee995bc540b8e2a29c46a48d7ac9cee854e38591bae0a190c4ad27d4 diff --git a/sys-block/ms-sys/ms-sys-2.5.0.ebuild b/sys-block/ms-sys/ms-sys-2.5.0.ebuild new file mode 100644 index 000000000000..3e83bc882131 --- /dev/null +++ b/sys-block/ms-sys/ms-sys-2.5.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-block/ms-sys/ms-sys-2.5.0.ebuild,v 1.1 2015/01/23 13:55:12 mrueg Exp $ + +EAPI=5 + +inherit toolchain-funcs + +DESCRIPTION="A command-line program for writing Microsoft compatible boot records" +HOMEPAGE="http://ms-sys.sourceforge.net" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="linguas_sv" + +DEPEND="sys-devel/gettext" +RDEPEND="virtual/libintl" + +src_compile() { + tc-export CC + default +} + +src_install() { + local nls="" + if ! use linguas_sv ; then + nls='NLS_FILES=' + fi + + emake DESTDIR="${D}" MANDIR="/usr/share/man" \ + PREFIX="/usr" ${nls} install + + dodoc CHANGELOG CONTRIBUTORS FAQ README TODO +} diff --git a/sys-devel/llvm/llvm-3.5.1.ebuild b/sys-devel/llvm/llvm-3.5.1.ebuild index 540bf02035c2..827c230dadc1 100644 --- a/sys-devel/llvm/llvm-3.5.1.ebuild +++ b/sys-devel/llvm/llvm-3.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.2 2015/01/21 14:59:19 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.1.ebuild,v 1.3 2015/01/23 13:22:11 voyageur Exp $ EAPI=5 @@ -146,6 +146,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch epatch "${FILESDIR}"/${PN}-3.5-gentoo-install.patch + # Make ocaml warnings non-fatal, bug #537308 + sed -e "/RUN/s/-warn-error A//" -i test/Bindings/Ocaml/*ml || die if use clang; then # Automatically select active system GCC's libraries, bugs #406163 and #417913 diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild index 3c745c0010ed..6623689d905c 100644 --- a/sys-devel/llvm/llvm-9999.ebuild +++ b/sys-devel/llvm/llvm-9999.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.96 2014/12/31 10:37:36 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.97 2015/01/23 13:22:11 voyageur Exp $ EAPI=5 @@ -146,6 +146,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-3.2-nodoctargz.patch epatch "${FILESDIR}"/${PN}-3.5-gcc-4.9.patch epatch "${FILESDIR}"/${PN}-3.6-gentoo-install.patch + # Make ocaml warnings non-fatal, bug #537308 + sed -e "/RUN/s/-warn-error A//" -i test/Bindings/Ocaml/*ml || die if use clang; then # Automatically select active system GCC's libraries, bugs #406163 and #417913 diff --git a/x11-misc/slock/slock-1.2.ebuild b/x11-misc/slock/slock-1.2.ebuild index 4dcd98199e17..b3fc44f76f23 100644 --- a/x11-misc/slock/slock-1.2.ebuild +++ b/x11-misc/slock/slock-1.2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-1.2.ebuild,v 1.1 2014/12/22 21:04:41 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slock/slock-1.2.ebuild,v 1.2 2015/01/23 15:03:31 jer Exp $ EAPI=5 inherit eutils fcaps savedconfig toolchain-funcs @@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd" +KEYWORDS="~amd64 hppa ~x86 ~x86-fbsd" RDEPEND=" x11-libs/libX11 diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest index 84ade377ff1d..e31808c06ca0 100644 --- a/x11-terms/xterm/Manifest +++ b/x11-terms/xterm/Manifest @@ -1,3 +1,4 @@ DIST xterm-297.tgz 1119462 SHA256 a2dc32a9a8401a2d3d2ae99844ba9cd9f81f0bc930870ebef783a9bcf165d179 SHA512 3787df65f6f4080ff8447002fcf6227898dfeb7091f3d2781d659a13cfd693cefcfa40238a663f18d3c5f45503e91763fb9d7c85d0dc44bc021446327b816c8f WHIRLPOOL c6da6fb0f3a48c282f4bda3fab0f0079282675ebd11035c890838b5ed961900300902a6b96b0f1a347f57043fc76e65a7678046a40f0df9bf71e701dd226b170 DIST xterm-304.tgz 1159060 SHA256 d3af3934a7d27783005f1025a544d3dfede793b9444dec056bfefdefe02dd7a7 SHA512 3faee9483933290e24eef62f60eae179d97b51a952503a97bcab68fa2bfabfe246ec74e02a9139767e533d55640bdef2cb9f2f79cae701da1735d0a83c311b66 WHIRLPOOL 89855d8d1910bc1dc749c725a04f7380d19b0981b91b4d3274a6150cc76092cd304888fbaf90e933d265f12fea24413a41967eb1121e49ac1cf2340a4e82a23d DIST xterm-312.tgz 1186265 SHA256 fad48e1b14e564be1ff06d4a18793a2169037748ff456432f15484383485f36e SHA512 396c17054298dd9e1adcd91fa3841dc4af25bc86fe30e0e0d342e0bcaed248d583004e2a32389c471c5628f4230e9365da30886c5c36181d5fe49bbfe0786227 WHIRLPOOL 00b43731205384e5353b00b77e023553e965408c8c685fb2b944307b67508327fffc77cbbfd8ee9748efae8277fa0e7add5987ccc86102e86653d17ade6390b3 +DIST xterm-314.tgz 1200426 SHA256 1dbf1e93796c1b71b22b84e82eb58bcf20a14a7f365158819f3b4dbb29fe93f0 SHA512 bce72207b6db288c3873f00b928797dfd2aaea51d183b11d377af008a1a83965bd781c648fd26d88b491197594315b2d2549cfdb44f0dbd856b269aebc31ad9f WHIRLPOOL a9eda394dc47d0d31ab27fe338e3a1d41ef581b1617d324fdb98289374e9d5e4854735ddc4a862323203ec1ecb2788f3ae7e4abe1f3b17b15dadecc6edb9f651 diff --git a/x11-terms/xterm/xterm-314.ebuild b/x11-terms/xterm/xterm-314.ebuild new file mode 100644 index 000000000000..c94ebf73d39c --- /dev/null +++ b/x11-terms/xterm/xterm-314.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-314.ebuild,v 1.1 2015/01/23 11:30:37 chithanh Exp $ + +EAPI=5 + +inherit eutils flag-o-matic multilib + +DESCRIPTION="Terminal Emulator for X Windows" +HOMEPAGE="http://invisible-island.net/xterm/" +SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+openpty toolbar truetype unicode Xaw3d" + +COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter ) + kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) + >=sys-libs/ncurses-5.7-r7 + x11-apps/xmessage + x11-libs/libX11 + x11-libs/libXaw + x11-libs/libXft + x11-libs/libxkbfile + x11-libs/libXmu + x11-libs/libXrender + x11-libs/libXt + unicode? ( x11-apps/luit ) + Xaw3d? ( x11-libs/libXaw3d )" +RDEPEND="${COMMON_DEPEND} + media-fonts/font-misc-misc" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + x11-proto/kbproto + x11-proto/xproto" + +DOCS=( README{,.i18n} ctlseqs.txt ) + +pkg_setup() { + DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults +} + +src_configure() { + # 454736 + # Workaround for ncurses[tinfo] until upstream fixes their buildsystem using + # something sane like pkg-config or ncurses5-config and stops guessing libs + # Everything gets linked against ncurses anyways, so don't shout + append-libs $(pkg-config --libs ncurses) + + econf \ + --libdir="${EPREFIX}"/etc \ + --disable-full-tgetent \ + --with-app-defaults="${DEFAULTS_DIR}" \ + --disable-setuid \ + --disable-setgid \ + --with-utempter \ + --with-x \ + $(use_with Xaw3d) \ + --disable-imake \ + --enable-256-color \ + --enable-broken-osc \ + --enable-broken-st \ + --enable-exec-xterm \ + $(use_enable truetype freetype) \ + --enable-i18n \ + --enable-load-vt-fonts \ + --enable-logging \ + $(use_enable openpty) \ + $(use_enable toolbar) \ + $(use_enable unicode mini-luit) \ + $(use_enable unicode luit) \ + --enable-wide-chars \ + --enable-dabbrev \ + --enable-warnings +} + +src_install() { + default + + dohtml xterm.log.html + domenu *.desktop + + # Fix permissions -- it grabs them from live system, and they can + # be suid or sgid like they were in pre-unix98 pty or pre-utempter days, + # respectively (#69510). + # (info from Thomas Dickey) - Donnie Berkholz + fperms 0755 /usr/bin/xterm + + # restore the navy blue + sed -i -e "s:blue2$:blue:" "${D}${DEFAULTS_DIR}"/XTerm-color || die +}