diff options
| -rw-r--r-- | dev-lang/ruby/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/ruby/ruby-2.3.3-r1.ebuild | 243 | ||||
| -rw-r--r-- | dev-ruby/coderay/coderay-1.1.1.ebuild | 2 | ||||
| -rw-r--r-- | eclass/apache-2.eclass | 2 | ||||
| -rw-r--r-- | net-analyzer/sslscan/Manifest | 2 | ||||
| -rw-r--r-- | net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild | 54 | ||||
| -rw-r--r-- | net-analyzer/sslscan/sslscan-1.11.8.ebuild | 29 | ||||
| -rw-r--r-- | sys-block/fio/fio-2.15.ebuild | 2 |
8 files changed, 332 insertions, 3 deletions
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest index 0fae516bddbb..fb0c22bcafea 100644 --- a/dev-lang/ruby/Manifest +++ b/dev-lang/ruby/Manifest @@ -14,5 +14,6 @@ DIST ruby-patches-2.2.5.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503f DIST ruby-patches-2.2.6.tar.bz2 2272 SHA256 f54373704ce8df732490e8d1e7e35188503faacc5278fe0ab0d8c07bdc762fed SHA512 ed8bff8f730ccb114e62784d29541f276b2821d9eb121a9772dc4aabc139b688f2b14f5f27710098a8cd751c62d31b46170b427ad54dc4f6490c003450ae1583 WHIRLPOOL 8598c9284252c1e7cc9f9019c5f468ce5ab8b4ae013e71c631cd00cc8bfde068b041f1bc6851bb2962982a1e46cbde0ddc51c186ea41638a7881c587c658e603 DIST ruby-patches-2.3.1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 DIST ruby-patches-2.3.2.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 +DIST ruby-patches-2.3.3-r1.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 DIST ruby-patches-2.3.3.tar.bz2 2223 SHA256 f0a803173564368e5cf31162e1dba901c46640f9e861255f6cbe14256d18f3eb SHA512 bb47000e516017c1fedf7c5313b0628fa734030e69bd0fed1c06a38dd115b8c50837e3dd917f272e24abf5609c4c12793ae4570bfd7d6210290785bf2f8287bd WHIRLPOOL 0b0d4dcf7df4ff3ff11610bfe7a7b29ed621b45b412cb7618a6572f98a568ac67419bd852b193cfc3aa0968382cf9400a578511e9e8fb8b2125bc876e733bd64 DIST ruby-patches-2.4.0.tar.bz2 2047 SHA256 9560b8e8dc4a5517814df07aa635c9269f5e7cff5a15827a25a9f0811194e450 SHA512 b35db875a7e4a226e75eb6f7bc68b4bc97cc699bdc5f6930015e55cdc324b67b9883a2aa574c9c9a8b5dc5345c4df8a5ca8ace5b794b3e4de6517f3eefd25745 WHIRLPOOL fc5d226f46fe4ee1c86f6fff51ec9184b8c0ec08a1793eab365437d4ce2fd573cfc8857386cd10932f7dde05254bc975eff5b7986aea429730c606147fae2a5c diff --git a/dev-lang/ruby/ruby-2.3.3-r1.ebuild b/dev-lang/ruby/ruby-2.3.3-r1.ebuild new file mode 100644 index 000000000000..56c659505934 --- /dev/null +++ b/dev-lang/ruby/ruby-2.3.3-r1.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +#PATCHSET=1 + +inherit autotools eutils flag-o-matic multilib versionator + +MY_P="${PN}-$(get_version_component_range 1-3)" +S=${WORKDIR}/${MY_P} + +SLOT=$(get_version_component_range 1-2) +MY_SUFFIX=$(delete_version_separator 1 ${SLOT}) +RUBYVERSION=2.3.0 + +if [[ -n ${PATCHSET} ]]; then + if [[ ${PVR} == ${PV} ]]; then + PATCHSET="${PV}-r0.${PATCHSET}" + else + PATCHSET="${PVR}.${PATCHSET}" + fi +else + PATCHSET="${PVR}" +fi + +DESCRIPTION="An object-oriented scripting language" +HOMEPAGE="http://www.ruby-lang.org/" +SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz + https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2" + +LICENSE="|| ( Ruby-BSD BSD-2 )" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( sys-libs/gdbm ) + jemalloc? ( dev-libs/jemalloc ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl ) + ) + socks5? ( >=net-proxy/dante-1.1.13 ) + tk? ( + dev-lang/tcl:0=[threads] + dev-lang/tk:0=[threads] + ) + ncurses? ( sys-libs/ncurses:0= ) + readline? ( sys-libs/readline:0= ) + dev-libs/libyaml + virtual/libffi + sys-libs/zlib + >=app-eselect/eselect-ruby-20151229 + !<dev-ruby/rdoc-3.9.4 + !<dev-ruby/rubygems-1.8.10-r1" + +DEPEND="${RDEPEND}" + +BUNDLED_GEMS=" + >=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23] + >=dev-ruby/minitest-5.8.3[ruby_targets_ruby23] + >=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23] + >=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23] + >=dev-ruby/rake-10.4.2[ruby_targets_ruby23] + >=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23] +" + +PDEPEND=" + ${BUNDLED_GEMS} + virtual/rubygems[ruby_targets_ruby23] + >=dev-ruby/json-1.8.3[ruby_targets_ruby23] + rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] ) + xemacs? ( app-xemacs/ruby-modes )" + +src_prepare() { + EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \ + epatch "${WORKDIR}/patches" + + einfo "Unbundling gems..." + cd "$S" + # Remove bundled gems that we will install via PDEPEND, bug + # 539700. Use explicit version numbers to ensure rm fails when they + # change so we can update dependencies accordingly. + rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die + + # Fix a hardcoded lib path in configure script + sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \ + configure.in || die "sed failed" + + eautoreconf +} + +src_configure() { + local modules= myconf= + + # -fomit-frame-pointer makes ruby segfault, see bug #150413. + filter-flags -fomit-frame-pointer + # In many places aliasing rules are broken; play it safe + # as it's risky with newer compilers to leave it as it is. + append-flags -fno-strict-aliasing + # SuperH needs this + use sh && append-flags -mieee + + # Socks support via dante + if use socks5 ; then + # Socks support can't be disabled as long as SOCKS_SERVER is + # set and socks library is present, so need to unset + # SOCKS_SERVER in that case. + unset SOCKS_SERVER + fi + + # Increase GC_MALLOC_LIMIT if set (default is 8000000) + if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then + append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}" + fi + + # ipv6 hack, bug 168939. Needs --enable-ipv6. + use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET" + + # Determine which modules *not* to build depending in the USE flags. + if ! use readline ; then + modules="${modules},readline" + fi + if ! use berkdb ; then + modules="${modules},dbm" + fi + if ! use gdbm ; then + modules="${modules},gdbm" + fi + if ! use ssl ; then + modules="${modules},openssl" + fi + if ! use ncurses ; then + modules="${modules},curses" + fi + if ! use tk ; then + modules="${modules},tk" + fi + + # Provide an empty LIBPATHENV because we disable rpath but we do not + # need LD_LIBRARY_PATH by default since that breaks USE=multitarget + # #564272 + INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \ + --program-suffix=${MY_SUFFIX} \ + --with-soname=ruby${MY_SUFFIX} \ + --docdir=${EPREFIX}/usr/share/doc/${P} \ + --enable-shared \ + --enable-pthread \ + --disable-rpath \ + --with-out-ext="${modules}" \ + $(use_enable jemalloc jemalloc) \ + $(use_enable socks5 socks) \ + $(use_enable doc install-doc) \ + --enable-ipv6 \ + $(use_enable debug) \ + ${myconf} \ + --enable-option-checking=no \ + || die "econf failed" +} + +src_compile() { + emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" +} + +src_test() { + emake -j1 V=1 test || die "make test failed" + + elog "Ruby's make test has been run. Ruby also ships with a make check" + elog "that cannot be run until after ruby has been installed." + elog + if use rubytests; then + elog "You have enabled rubytests, so they will be installed to" + elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other" + elog "than root, and you must place them into a writeable directory." + elog "Then call: " + elog + elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb" + else + elog "Enable the rubytests USE flag to install the make check tests" + fi +} + +src_install() { + # Remove the remaining bundled gems. We do this late in the process + # since they are used during the build to e.g. create the + # documentation. + rm -rf ext/json || die + + # Ruby is involved in the install process, we don't want interference here. + unset RUBYOPT + + local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) + + LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}" + for d in $(find "${S}/ext" -type d) ; do + RUBYLIB="${RUBYLIB}:$d" + done + export LD_LIBRARY_PATH RUBYLIB + + emake V=1 DESTDIR="${D}" install || die "make install failed" + + # Remove installed rubygems and rdoc copy + rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + + if use doc; then + make DESTDIR="${D}" install-doc || die "make install-doc failed" + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r sample + fi + + dodoc ChangeLog NEWS doc/NEWS* README* || die + + if use rubytests; then + pushd test + insinto /usr/share/${PN}-${SLOT}/test + doins -r . + popd + fi +} + +pkg_postinst() { + if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then + eselect ruby set ruby${MY_SUFFIX} + fi + + elog + elog "To switch between available Ruby profiles, execute as root:" + elog "\teselect ruby set ruby(19|20|...)" + elog +} + +pkg_postrm() { + eselect ruby cleanup +} diff --git a/dev-ruby/coderay/coderay-1.1.1.ebuild b/dev-ruby/coderay/coderay-1.1.1.ebuild index 6698ce71c77a..84e5b2d6b576 100644 --- a/dev-ruby/coderay/coderay-1.1.1.ebuild +++ b/dev-ruby/coderay/coderay-1.1.1.ebuild @@ -4,7 +4,7 @@ EAPI=5 -USE_RUBY="ruby20 ruby21 ruby22 ruby23" +USE_RUBY="ruby20 ruby21 ruby22 ruby23 ruby24" # The test target also contains test:exe but that requires # shoulda-context which we do not have packaged yet. diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index 919f82faeb46..2a85d48290c6 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -270,7 +270,7 @@ setup_modules() { fi if use ssl ; then - MY_CONF+=( --with-ssl="${EPREFIX}"/usr --enable-ssl=${mod_type} ) + MY_CONF+=( --with-ssl --enable-ssl=${mod_type} ) MY_MODS+=( ssl ) else MY_CONF+=( --without-ssl --disable-ssl ) diff --git a/net-analyzer/sslscan/Manifest b/net-analyzer/sslscan/Manifest index 39d342ff1151..2fe532791c17 100644 --- a/net-analyzer/sslscan/Manifest +++ b/net-analyzer/sslscan/Manifest @@ -1,2 +1,4 @@ +DIST openssl-1.0.2j.tar.gz 5307912 SHA256 e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 SHA512 7d6ccae4aa3ccec3a5d128da29c68401cdb1210cba6d212d55235fc3bc63d7085e2f119e2bbee7ddff6b7b5eef07c6196156791724cd2caf313a4c2fef724edd WHIRLPOOL 1f17e80bc10da2eab9d4c1c3a662b0e2b4f7e8bc448aabb44cd98a96ba3d6cd0ef6cf9a3371d44b39a4d11b1a4087c8f0d056272ace6eba5bd2417f7ab9503b7 DIST sslscan-1.11.3-rbsec.tar.gz 48865 SHA256 c36d6ac127aa36d6e550950f31540f34a7df131cd76b0be5b91092809eef4916 SHA512 37fcc5b220aa8f2fdcd1b50c5d5f29831348e609f5f678f3c31376b22721ed9fb47eff48fa78483ac7622cf8d80709ef4d220421ce85151a3f1c855f7ef0c545 WHIRLPOOL 55d2d0e35aa28e3d61b546034342d3389c3973f4495e376606ff56538daed1fec9de3e1b383430528dc132c700a86a051883a8f29f35baeb93695d158f09a27a DIST sslscan-1.11.7-rbsec.tar.gz 50801 SHA256 1a2787b427eabc3e61350c0692970e4ab679891f6310e2dd855bab549ff8cf73 SHA512 092b3e25d292aa9db5c75311f2e5c034068b19351ad09c9b448a692aa47ee15eb0649e3da64cc84be42a5af7c9a879d9ff41802a27ce19b3b485f98714282816 WHIRLPOOL 6066e50115d9b98b1dd6ff883ca9e7ad06b71cddf86706b94a07954ce94f111b539e3be4b488aed8bef7fc979dc77a589cfbdbb69933cee85959bf999177af1f +DIST sslscan-1.11.8-rbsec.tar.gz 51583 SHA256 1449f8bb45d323b322cb070a74d8dcc57b43ca2dba0560e7a16151efc8b3d911 SHA512 8951b48f34eea8db255de2d0ec95aa28ce2cc9f338053ee70ce627d8992ae4c07115445cab9bc058d7ebdeccabd8bb1a9f4029e4449a2c1df5d8ee5a668ff34f WHIRLPOOL 854bf585bedda25a4c8b88fa6308429852fed6c7fa1c5873c30459325a00368a62952592fde9eeebe45e9056667e9e23900c0411c4d12dca0d1011c46a7f59e2 diff --git a/net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild new file mode 100644 index 000000000000..d943303d1f94 --- /dev/null +++ b/net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +OPENSSL_V=1.0.2j + +inherit eutils toolchain-funcs + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +MY_FORK="rbsec" +SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz + static? ( mirror://openssl/source/openssl-${OPENSSL_V}.tar.gz )" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl +static" + +# Depend on -bindist since sslscan unconditionally requires elliptic +# curve support, bug 491102 +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}-${MY_FORK}" + +src_prepare() { + if use static; then + ln -s ../openssl-${OPENSSL_V} openssl || die + touch .openssl_is_fresh || die + + sed -i -e '/openssl\/.git/,/fi/d' \ + -e '/openssl test/d' Makefile || die + + fi + + default +} + +src_compile() { + if use static; then + emake static + else + emake + fi +} + +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/net-analyzer/sslscan/sslscan-1.11.8.ebuild b/net-analyzer/sslscan/sslscan-1.11.8.ebuild new file mode 100644 index 000000000000..7848c20b58ae --- /dev/null +++ b/net-analyzer/sslscan/sslscan-1.11.8.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils toolchain-funcs + +DESCRIPTION="Fast SSL configuration scanner" +HOMEPAGE="https://github.com/rbsec/sslscan" +MY_FORK="rbsec" +SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz -> ${P}-${MY_FORK}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="libressl" + +# Depend on -bindist since sslscan unconditionally requires elliptic +# curve support, bug 491102 +DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}-${MY_FORK}" +src_install() { + DESTDIR="${D}" emake install + + dodoc Changelog README.md +} diff --git a/sys-block/fio/fio-2.15.ebuild b/sys-block/fio/fio-2.15.ebuild index 73d4d79e141e..6fa33ea84960 100644 --- a/sys-block/fio/fio-2.15.ebuild +++ b/sys-block/fio/fio-2.15.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="aio glusterfs gnuplot gtk numa rbd rdma static zlib" # GTK+:2 does not offer static libaries. |