Sync with portage [Wed Mar 2 08:40:58 MSK 2016].

mhiretskiy 253
root 8 years ago
parent 73974abddb
commit 0f6a7dda3b

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -11,7 +11,7 @@ PYTHON_COMPAT=( python2_7 )
inherit autotools base eutils java-pkg-opt-2 linux-info multilib perl-app python-single-r1 systemd user
DESCRIPTION="A a daemon which collects system statistic and provides mechanisms to store the values"
DESCRIPTION="Collects system statistics and provides mechanisms to store the values"
HOMEPAGE="http://collectd.org"
SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
@ -77,13 +77,13 @@ COMMON_DEPEND="
collectd_plugins_netlink? ( net-libs/libmnl )
collectd_plugins_nginx? ( net-misc/curl )
collectd_plugins_notify_desktop? ( x11-libs/libnotify )
collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl )
collectd_plugins_nut? ( sys-power/nut )
collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl:= )
collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_onewire? ( sys-fs/owfs )
collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
collectd_plugins_perl? ( dev-lang/perl:=[ithreads] )
collectd_plugins_ping? ( net-libs/liboping )
collectd_plugins_postgresql? ( dev-db/postgresql )
collectd_plugins_postgresql? ( dev-db/postgresql:= )
collectd_plugins_python? ( ${PYTHON_DEPS} )
collectd_plugins_routeros? ( net-libs/librouteros )
collectd_plugins_rrdcached? ( net-analyzer/rrdtool )

@ -79,7 +79,7 @@ COMMON_DEPEND="
collectd_plugins_nginx? ( net-misc/curl )
collectd_plugins_notify_desktop? ( x11-libs/libnotify:= )
collectd_plugins_notify_email? ( net-libs/libesmtp dev-libs/openssl:0= )
collectd_plugins_nut? ( sys-power/nut )
collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_onewire? ( sys-fs/owfs )
collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )
collectd_plugins_openldap? ( net-nds/openldap )

@ -91,7 +91,7 @@ COMMON_DEPEND="
collectd_plugins_nginx? ( net-misc/curl )
collectd_plugins_notify_desktop? ( x11-libs/libnotify )
collectd_plugins_notify_email? ( net-libs/libesmtp )
collectd_plugins_nut? ( sys-power/nut )
collectd_plugins_nut? ( >=sys-power/nut-2.7.2-r2 )
collectd_plugins_openldap? ( net-nds/openldap )
collectd_plugins_onewire? ( >=sys-fs/owfs-3.1 )
collectd_plugins_oracle? ( dev-db/oracle-instantclient-basic )

@ -1,5 +1,3 @@
DIST elektra-0.7.1.tar.gz 1347524 SHA256 ff90ae274935eac9c9c5c85ca7e66049be46a31d9ef08bc59a59858a15284c8c SHA512 25ca25e95d1a20a79ba97b094dc9630fb791f6653c2bacec751cc51492202831b7d28ae0786081e6be91581245bda3f5b7e2f3b523f7faa6bfb1d97b3d209684 WHIRLPOOL e90e7c126f2467c8ae29e3cffd5d8a6bfa444dfd38edcc8809d49562825aff8ec6c826139da4a2aa09e38935ee63b48674431c7cc27e2a14d372b2b8270b170d
DIST elektra-0.8.12.tar.gz 2102450 SHA256 562432bea9455a61ff6e6b3263078ea9b26bef2ed177a04b5f9b181d605bc021 SHA512 be01dbeae5cc680973a7c7917f341506106139c7facc3d3f597f31f7aa91065dcee862121b8704d589f4c6dd916a99cadc9b67e2e9604bec2841b1ebafea89ea WHIRLPOOL 6661d9a337aa71fcc9764f127ec4055b3eb1456d60608c80ac8763aee2d680ab8691a16668da8ef694efb09e2415f58bf4e34a4f1f0e9a7498fecf88f56ce9da
DIST elektra-0.8.3.tar.gz 1092409 SHA256 48fab82a6b1e8f0038c43ae9ade4da25b697d0aa74e39b7b94056ab7febc4be1 SHA512 e298c0515515a3a59fe28e695fd347ce775465d95f95f8d08c54e0223baf24300ec7e876d35fd3a07f2348290fdc7f740557333b26e847d09b4c41df63a1d886 WHIRLPOOL 64673416e96cc0a8f3ffbfc3f88525de3bc1270b381d0642b59f0a4f9d49db5cb296bd10a2839bc2baea82f58dcb6416ada1031553d378cba858d8f94df2d3b9
DIST elektra-0.8.6.tar.gz 1188337 SHA256 e815cf69b070c339784472841aa0ee0b169fab7c78f41cbbd7044f53fa9ed216 SHA512 4df585e07ab461b924a506a8c58bcfbe55e6c1df72710bfdc13760559054ffef6b92f8da94c08f2d8f6a7a7692983d0e92d4ffa98506fcbfc166a71bf989e488 WHIRLPOOL b0dfa2841dcef35e03dfa04e5613576d5d8d74586e959c538399adbebf2d4d4842b15e912845c07f5c309614e33217b112124ec0971accf9fa4e521e1283732a
DIST elektra-0.8.7.tar.gz 1566800 SHA256 698ebd41d540eb0c6427c17c13a6a0f03eef94655fbd40655c9b42d612ea1c9b SHA512 37b34abeb392e170f89a97f825153f925d7b11ea980832cb8f1bf8dbd8b098f8bd553b3998728ef84ce4f4c53ea1f420824984fe670f6752c1b50e98821eb07e WHIRLPOOL 7f3f290f9064488fd1c9927a76d3f9e235e144b1ebe91a02b392ee468b2bcc4881906a71b88822a75ac1506200c3c8d5857c31f35bdc8f9832eae67c2647a768
DIST elektra-0.8.15.tar.gz 2338297 SHA256 6a406986cecb8d4a44485ced118ee803bc039b0824b72298e123b4dd47eb0b22 SHA512 86a408dd546b33e3b437f92f415de7aee6a235189f9eab0762b3f44ab4c453ee369a53de10a9f5b0df1b446460b12c57c6b8b77c282648ec2a49f2328d9af13d WHIRLPOOL c4f77903f9340c665f4c484c0b700b048358691873031ae5e62e63f0acf9a5fc5efb3c307331712497c59172ad202780280abfa8b717f523fabda73564a0005e

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -6,7 +6,7 @@ EAPI=5
inherit autotools autotools-multilib eutils multilib
DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/${P}.tar.gz"

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -6,7 +6,7 @@ EAPI=5
inherit cmake-multilib eutils java-pkg-opt-2
DESCRIPTION="Universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"

@ -0,0 +1,120 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit cmake-multilib eutils java-pkg-opt-2
DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
RDEPEND="dev-libs/libltdl:0[${MULTILIB_USEDEP}]
>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
augeas? ( app-admin/augeas )
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
java? ( >=virtual/jdk-1.8.0 )
qt5? (
>=dev-qt/qtdeclarative-5.3:5
>=dev-qt/qtgui-5.3:5
>=dev-qt/qttest-5.3:5
>=dev-qt/qtwidgets-5.3:5
)
uname? ( sys-apps/coreutils )
systemd? ( sys-apps/systemd[${MULTILIB_USEDEP}] )
yajl? ( >=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
test? ( >=dev-cpp/gtest-1.7.0 )"
DOCS=( README.md doc/AUTHORS doc/CODING.md doc/NEWS.md doc/todo/TODO )
# tries to write to user's home directory (and doesn't respect HOME)
RESTRICT="test"
MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
PATCHES=( "${FILESDIR}/${P}"-conditional-glob-tests.patch )
src_prepare() {
cmake-utils_src_prepare
einfo remove bundled libs
# TODO: Remove bundled inih from src/plugins/ini (add to portage):
# https://code.google.com/p/inih/
rm -rf src/external || die
# move doc files to correct location
sed -e "s/elektra-api/${PF}/" \
-i cmake/ElektraCache.cmake || die
# avoid useless build time, nothing ends up installed
comment_add_subdirectory benchmarks
comment_add_subdirectory examples
}
multilib_src_configure() {
local my_plugins="ALL"
if multilib_is_native_abi ; then
use augeas || my_plugins+=";-augeas"
use java || my_plugins+=";-jni"
else
my_plugins+=";-augeas;-jni"
fi
use dbus || my_plugins+=";-dbus"
use iconv || my_plugins+=";-iconv"
use ini || my_plugins+=";-ini" # bundles inih
use simpleini || my_plugins+=";-simpleini"
use syslog || my_plugins+=";-syslog"
use systemd || my_plugins+=";-journald"
use tcl || my_plugins+=";-tcl"
use uname || my_plugins+=";-uname"
use xml || my_plugins+=";-xmltool"
use yajl || my_plugins+=";-yajl"
# Disabling for good (?):
# counter - Only useful for debugging the plugin framework
# doc - Explaining basic makeup of a function //bug #514402
# noresolver - Does not resolve, but can act as one
# template - Template for new plugin written in C
# wresolver - Resolver for non-POSIX, e.g. w32/w64 systems
my_plugins+=";-counter;-doc;-noresolver;-template;-wresolver"
local my_tools
if multilib_is_native_abi ; then
my_tools="kdb"
use qt5 && my_tools+=";qt-gui"
fi
mycmakeargs=(
"-DBUILD_SHARED=ON"
"-DPLUGINS=${my_plugins}"
"-DTOOLS=${my_tools}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use test ENABLE_TESTING)
)
cmake-utils_src_configure
}
multilib_src_install_all() {
einfo remove test_data
rm -rvf "${D}/usr/share/${PN}" || die "Failed to remove test_data"
einfo remove tool_exec
rm -rvf "${D}/usr/$(get_libdir)/${PN}/tool_exec" || die "Failed to remove tool_exec"
}

@ -1,92 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit cmake-multilib eutils
DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dbus doc examples iconv inifile simpleini static-libs syslog tcl test xml yajl"
RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
yajl? (
<dev-libs/yajl-2[${MULTILIB_USEDEP}]
>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
sys-devel/libtool
doc? ( app-doc/doxygen )"
# tries to write to user's home directory (and doesn't respect HOME)
RESTRICT="test"
src_prepare() {
#fix QA issues with upstream patches
epatch "${FILESDIR}/${P}-introduce-attributes.patch"
epatch "${FILESDIR}/${P}-fix-yajl-if-user-config.patch"
#move doc files to correct location
sed -e "s/elektra-api/${PF}/" \
-i cmake/ElektraCache.cmake || die
cmake-utils_src_prepare
}
multilib_src_configure() {
local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
use dbus && my_plugins+=";dbus"
use doc && my_plugins+=";doc"
use iconv && my_plugins+=";iconv"
use inifile && my_plugins+=";simpleini"
use syslog && my_plugins+=";syslog"
use tcl && my_plugins+=";tcl"
use xml && my_plugins+=";xmltool"
use yajl && my_plugins+=";yajl"
mycmakeargs=(
"-DPLUGINS=${my_plugins}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
|| echo -DBUILD_EXAMPLES=OFF)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
)
cmake-utils_src_configure
}
src_compile() {
dodir /usr/share/man/man3
cmake-multilib_src_compile
}
multilib_src_install() {
cmake-utils_src_install
if multilib_is_native_abi && use doc; then
rm -rf "${D}/usr/share/doc/${PF}/man" || die
cd doc/man/man3 || die
local my_f
for my_f in *.3 ; do
newman ${my_f} ${PN}-${my_f}
elog "installed /usr/share/man/man3/${my_f} as ${PN}-${my_f}"
done
fi
}
multilib_src_install_all() {
dodoc doc/{AUTHORS,CHANGES,NEWS,README,todo/TODO}
}

@ -1,69 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit cmake-multilib eutils
DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dbus doc examples iconv simpleini static-libs syslog tcl test +uname xml yajl"
RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
uname? ( sys-apps/coreutils )
yajl? (
<dev-libs/yajl-2[${MULTILIB_USEDEP}]
>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
sys-devel/libtool
doc? ( app-doc/doxygen )"
DOCS="doc/AUTHORS doc/CHANGES doc/NEWS doc/README doc/todo/TODO"
# tries to write to user's home directory (and doesn't respect HOME)
RESTRICT="test"
src_prepare() {
#move doc files to correct location
sed -e "s/elektra-api/${PF}/" \
-i cmake/ElektraCache.cmake || die
cmake-utils_src_prepare
}
multilib_src_configure() {
local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
use dbus && my_plugins+=";dbus"
use doc && my_plugins+=";doc"
use iconv && my_plugins+=";iconv"
use simpleini && my_plugins+=";simpleini"
use syslog && my_plugins+=";syslog"
use tcl && my_plugins+=";tcl"
use uname && my_plugins+=";uname"
use xml && my_plugins+=";xmltool"
use yajl && my_plugins+=";yajl"
mycmakeargs=(
"-DPLUGINS=${my_plugins}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
|| echo -DBUILD_EXAMPLES=OFF)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
)
cmake-utils_src_configure
}

@ -1,86 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit cmake-multilib eutils
DESCRIPTION="universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
SRC_URI="ftp://ftp.markus-raab.org/${PN}/releases/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="dbus doc examples iconv ini keytometa simpleini static-libs syslog tcl test +uname xml yajl"
RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
uname? ( sys-apps/coreutils )
yajl? (
<dev-libs/yajl-2[${MULTILIB_USEDEP}]
>=dev-libs/yajl-1.0.11-r1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
sys-devel/libtool
doc? ( app-doc/doxygen )"
DOCS="README.md doc/AUTHORS doc/CHANGES doc/NEWS doc/todo/TODO"
# tries to write to user's home directory (and doesn't respect HOME)
RESTRICT="test"
src_prepare() {
epatch "${FILESDIR}/${P}-conditional-glob-tests.patch"
einfo remove bundled libs
# TODO: Remove bundled inih from src/plugins/ini (add to portage):
# https://code.google.com/p/inih/
rm -rf src/external || die
local tests="augeas fstab hosts ini yajl"
if ! use test ; then
einfo remove test data
for test in ${tests}; do
sed -e '/TARGET_TEST_DATA_FOLDER/ s/^#*/#/' \
-i src/plugins/${test}/CMakeLists.txt || die
done
fi
#move doc files to correct location
sed -e "s/elektra-api/${PF}/" \
-i cmake/ElektraCache.cmake || die
cmake-utils_src_prepare
}
multilib_src_configure() {
local my_plugins="ccode;dump;error;fstab;glob;hexcode;hidden;hosts;network;ni;null;path;resolver;struct;success;template;timeofday;tracer;type;validation"
use dbus && my_plugins+=";dbus"
use iconv && my_plugins+=";iconv"
use ini && my_plugins+=";ini" #bundles inih
use keytometa && my_plugins+=";keytometa"
use simpleini && my_plugins+=";simpleini"
use syslog && my_plugins+=";syslog"
use tcl && my_plugins+=";tcl"
use uname && my_plugins+=";uname"
use xml && my_plugins+=";xmltool"
use yajl && my_plugins+=";yajl"
mycmakeargs=(
"-DPLUGINS=${my_plugins}"
"-DLATEX_COMPILER=OFF"
"-DTARGET_CMAKE_FOLDER=share/cmake/Modules"
$(multilib_is_native_abi && cmake-utils_use doc BUILD_DOCUMENTATION \
|| echo -DBUILD_DOCUMENTATION=OFF)
$(multilib_is_native_abi && cmake-utils_use examples BUILD_EXAMPLES \
|| echo -DBUILD_EXAMPLES=OFF)
$(cmake-utils_use static-libs BUILD_STATIC)
$(cmake-utils_use test BUILD_TESTING)
$(cmake-utils_use test ENABLE_TESTING)
)
cmake-utils_src_configure
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -6,12 +6,12 @@ EAPI=5
inherit cmake-multilib eutils java-pkg-opt-2 git-r3
DESCRIPTION="Universal and secure framework to store config parameters in a hierarchical key-value pair mechanism"
DESCRIPTION="Framework to store config parameters in hierarchical key-value pairs"
HOMEPAGE="http://freedesktop.org/wiki/Software/Elektra"
EGIT_REPO_URI="git://github.com/ElektraInitiative/libelektra.git"
LICENSE="BSD"
SLOT="0"
SLOT="0/${PV}"
KEYWORDS=""
PLUGIN_IUSE="augeas iconv ini java simpleini syslog systemd tcl +uname xml yajl";
IUSE="dbus doc qt5 static-libs test ${PLUGIN_IUSE}"
@ -41,7 +41,7 @@ RESTRICT="test"
MULTILIB_WRAPPED_HEADERS=( /usr/include/elektra/kdbconfig.h )
PATCHES=( "${FILESDIR}/${PN}"-0.8.11-conditional-glob-tests.patch )
PATCHES=( "${FILESDIR}/${PN}"-0.8.15-conditional-glob-tests.patch )
src_prepare() {
cmake-utils_src_prepare

@ -0,0 +1,15 @@
--- elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
+++ elektra-0.8.15/src/libs/tools/tests/CMakeLists.txt
@@ -4,6 +4,7 @@
add_cppheaders (HDR_FILES)
add_toolheaders (HDR_FILES)
+if (ENABLE_TESTING)
include (LibAddTest)
file (GLOB TESTS testtool_*.cpp)
@@ -11,3 +12,4 @@
get_filename_component (name ${file} NAME_WE)
add_gtest (${name} LINK_TOOLS)
endforeach (file ${TESTS})
+endif (ENABLE_TESTING)

@ -1,31 +0,0 @@
--- a/src/plugins/yajl/yajl.c
+++ b/src/plugins/yajl/yajl.c
@@ -23,6 +23,10 @@
***************************************************************************/
+#ifndef HAVE_KDBCONFIG
+# include "kdbconfig.h"
+#endif
+
#include "yajl.h"
#include <kdberrors.h>
@@ -340,7 +344,7 @@
KeySet *config= elektraPluginGetConfig(handle);
// ksClear (returned);
- if (keyIsUser(parentKey))
+ if (!strncmp(keyName(parentKey), "user", 4))
{
const Key * lookup = ksLookupByName(config, "/user_path", 0);
if (!lookup)
@@ -422,7 +426,7 @@
return 1; /* success */
}
-int elektraYajlSet(Plugin *handle, KeySet *returned, Key *parentKey)
+int elektraYajlSet(Plugin *handle ELEKTRA_UNUSED, KeySet *returned, Key *parentKey)
{
yajl_gen_config conf = { 1, " " };
yajl_gen g = yajl_gen_alloc(&conf, NULL);

@ -1,27 +0,0 @@
--- a/src/include/CMakeLists.txt
+++ b/src/include/CMakeLists.txt
@@ -22,6 +22,9 @@
check_include_file(time.h HAVE_TIME_H)
check_include_file(unistd.h HAVE_UNISTD_H)
+set (ELEKTRA_DEPRECATED "__attribute__ ((deprecated))")
+set (ELEKTRA_UNUSED "__attribute__ ((unused))")
+
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/kdb.h"
"${CMAKE_CURRENT_BINARY_DIR}/kdb.h"
--- a/src/include/kdbconfig.h
+++ b/src/include/kdbconfig.h
@@ -30,6 +30,12 @@
* to search for user configuration. */
#define KDB_DB_HOME "@KDB_DB_HOME@"
+/** Declares a parameter as unused. */
+#define ELEKTRA_UNUSED @ELEKTRA_UNUSED@
+
+/** Declares an API as deprecated. */
+#define ELEKTRA_DEPRECATED @ELEKTRA_DEPRECATED@
+
/* disable debug output messages */
#define DEBUG @DEBUG@

@ -1,21 +0,0 @@
--- elektra-0.87/src/libtools/tests/CMakeLists.txt
+++ elektra-0.87/src/libtools/tests/CMakeLists.txt
@@ -4,10 +4,12 @@
add_cppheaders (HDR_FILES)
add_toolheaders(HDR_FILES)
-include (LibAddTest)
+if (ENABLE_TESTING)
+ include (LibAddTest)
-file (GLOB TESTS testtool_*.cpp)
-foreach (file ${TESTS})
- get_filename_component (name ${file} NAME_WE)
- add_gtest (${name})
-endforeach (file ${TESTS})
+ file (GLOB TESTS testtool_*.cpp)
+ foreach (file ${TESTS})
+ get_filename_component (name ${file} NAME_WE)
+ add_gtest (${name})
+ endforeach (file ${TESTS})
+endif (ENABLE_TESTING)

@ -9,7 +9,6 @@
<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
<flag name="ini">Enable new, advanced ini support</flag>
<flag name="gcov">Enable coverage support</flag>
<flag name="keytometa">Enable keytometa support</flag>
<flag name="simpleini">Enable simpleini support</flag>
<flag name="uname">Enable uname information for the key database</flag>
<flag name="yajl">Enable yajl support</flag>

@ -4,11 +4,11 @@
EAPI=5
inherit autotools base eutils
inherit autotools eutils
DESCRIPTION="Simple LaTeX editor for GTK+ users"
HOMEPAGE="https://github.com/alexandervdm/gummi"
SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/alexandervdm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"

@ -0,0 +1,30 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
if [[ ${PV} = *9999* ]]; then
inherit git-2 autotools
EGIT_REPO_URI="git://anongit.freedesktop.org/spice/spice-protocol"
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="Headers defining the SPICE protocol"
HOMEPAGE="http://spice-space.org/"
LICENSE="BSD"
SLOT="0"
IUSE=""
DEPEND=""
RDEPEND="${DEPEND}"
src_prepare() {
[[ ${PV} = *9999* ]] && eautoreconf
default
}

@ -0,0 +1,68 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils git-r3 python-any-r1 autotools
DESCRIPTION="SPICE server"
HOMEPAGE="http://spice-space.org/"
SRC_URI=""
EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS=""
IUSE="libressl sasl smartcard static-libs"
RDEPEND="
>=dev-libs/glib-2.22:2[static-libs(+)?]
>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
media-libs/opus[static-libs(+)?]
sys-libs/zlib[static-libs(+)?]
virtual/jpeg:0=[static-libs(+)?]
>=x11-libs/pixman-0.17.7[static-libs(+)?]
!libressl? ( dev-libs/openssl:0[static-libs(+)?] )
libressl? ( dev-libs/libressl[static-libs(+)?] )
smartcard? ( >=app-emulation/libcacard-0.1.2 )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )"
DEPEND="
=app-emulation/spice-protocol-9999
virtual/pkgconfig
$(python_gen_any_dep '
>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
')
smartcard? ( app-emulation/qemu[smartcard] )
${RDEPEND}"
python_check_deps() {
has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
has_version "dev-python/six[${PYTHON_USEDEP}]"
}
pkg_setup() {
[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
}
src_prepare() {
eautoreconf
default
}
src_configure() {
econf \
$(use_enable static-libs static) \
$(use_with sasl) \
$(use_enable smartcard) \
--disable-gui
}
src_install() {
default
use static-libs || prune_libtool_files
}

@ -9,7 +9,9 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
DIST libreoffice-5.0.5.2.tar.xz 167135308 SHA256 1ee729db840cf98bb00fed8c65550ccd6ced03123e3befcc511fe8df6f671b88 SHA512 f469d2faccd3e445324b0e8219a8a31b4dc8314a9b0559bfff06dd422eb6e6a9194dd4777391e71daa9bddf362cccca958defe165805f91e8334f95f36a011d2 WHIRLPOOL df4d74171c95f57a1a0fc7d25b7668abde5bb4eb8b326fd2179b4f311f5e63408919ca69bf2efe7effb2700488e11a0b4dc2059a5ce9c6a2de81d8f80314f598
DIST libreoffice-5.1.0.3.tar.xz 175720564 SHA256 b41b03f008dab3439bde31c1918f0477c035eab629166a79eeebb0bb6e8757b3 SHA512 ff068df64ca3a566d709e00e30d12d81095c88e9f05f785db805387ae5ff47dc7f8cd801ec6657a121fc6683fc7e32ff9abc508cae3b4f06d6ad22404a875de8 WHIRLPOOL 68930103295c2136915c015e0b62388586413fb62bc9c7bf2bb6cea7c7820449438af151c64a9efbd00e205b60e5860ee26a2b288495562a8bab1a33f008d064
DIST libreoffice-5.1.1.3.tar.xz 175820100 SHA256 2c5afb77e10daaf02b0521f0a3027345a9cfc02fa7a152f4a2e5d7a74abc8e38 SHA512 5aa5be15732808cce56eeb9274de35c15b31b56995ebbb9dfbfc19be23798576889e7276f42cb95cf9b8b1e0f755943ceb1994525bbbaedc24a28ac3345c6fe6 WHIRLPOOL b79ded47ed673f82df2bdbe1689b8d7fe272072e797868e2712d0f5b14f3cc8cd1cc5ac6437e695e48630504d4630e4e83b3bc03a8ed6f432bfbe7707a7dd078
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
DIST libreoffice-help-5.0.5.2.tar.xz 1882884 SHA256 6664496d23d3e7e56dbca22b7cd9a2cf66e0e91609a20976870e0e235540c02a SHA512 63a27a160a98360d04f062c4a9b123ed0e89a4e081aaa03e50b0df7ef04c4396977401f909541a5f3510a3c2d7dbfc4c52839a1a4adc1a29bae8dd6a8056a170 WHIRLPOOL b9aae3d2f622ebb27bd9943d8111ec9c3fcfc77b35b1b93f294ed8fe7106ab001a10260c7f9ed45b5f9ca65229d15f25a3a92f6000682b6ae651c0cf16e81fed
DIST libreoffice-help-5.1.0.3.tar.xz 1903996 SHA256 c2e9dff6a930637ca9b203dc31b7f87b17a03419891201a386e81bfbbdc1b447 SHA512 5a7f9b59d14aa8b3f760abc835f7541d2458b6c2239a42653db91681d82a8f90bfc5c593c74ed086a64de8078eea6367ecd27f0ba07ce37fb13f6dd935f5a438 WHIRLPOOL 6d650f0faf230184a2db7e20440e755b0d05bbda1374bb4fc1bb3ed832d89b4f115bda4fad9f0a280d91d12aec1730b5b9dd76ef1d6acb417a03f7d3f6c4f320
DIST libreoffice-help-5.1.1.3.tar.xz 1904764 SHA256 ce5df97b26d25bf73cf29f122f9f453ca54055ce37a8bb3dc25e4c298b5d3da9 SHA512 2d2400850e0e734df8eb884df2edfabd6dd31c1ef8f43652feca3cc573c1acf6d73716eadf3ded39e2b15f010ec486835830f020aec7b47529064d5cdab4fde0 WHIRLPOOL 1a39adf1b424876b58a5ad8c3e3e625c0e54ad525d93d309698fed33549c40cae00543311f68fe22e39b9f871587811b6867633e741724d61e994d6ad8518cb2

@ -0,0 +1,589 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
KDE_REQUIRED="optional"
QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old
# Usually the tarballs are moved a lot so this should make
# everyone happy.
DEV_URI="
http://dev-builds.libreoffice.org/pre-releases/src
http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
http://download.documentfoundation.org/libreoffice/old/${PV}/
"
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
# PATCHSET="${P}-patchset-01.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="A full office productivity suite"
HOMEPAGE="http://www.libreoffice.org"
SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
# Split modules following git/tarballs
# Core MUST be first!
# Help is used for the image generator
MODULES="core help"
# Only release has the tarballs
if [[ ${PV} != *9999* ]]; then
for i in ${DEV_URI}; do
for mod in ${MODULES}; do
if [[ ${mod} == core ]]; then
SRC_URI+=" ${i}/${P}.tar.xz"
else
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
fi
done
unset mod
done
unset i
fi
unset DEV_URI
# Really required addons
# These are bundles that can't be removed for now due to huge patchsets.
# If you want them gone, patches are welcome.
ADDONS_SRC=(
"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
# no release for 8 years, should we package it?
"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
# Does not build with 1.6 rhino at all
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
# requirement of rhino
"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
# not packageable
"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
)
SRC_URI+=" ${ADDONS_SRC[*]}"
unset ADDONS_URI
unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
+gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
# numbertext, typo, validator, watch-window: ^^
# oooblogger: no homepage or anything
# Extensions that need extra work:
for lo_xt in ${LO_EXTS}; do
IUSE+=" libreoffice_extensions_${lo_xt}"
done
unset lo_xt
LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
[[ ${PV} == *9999* ]] || \
KEYWORDS=""
# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
COMMON_DEPEND="
${PYTHON_DEPS}
app-arch/zip
app-arch/unzip
>=app-text/hunspell-1.3.2-r3
app-text/mythes
>=app-text/libabw-0.1.0
>=app-text/libexttextcat-3.4.4
>=app-text/libebook-0.1
>=app-text/libetonyek-0.1
app-text/liblangtag
>=app-text/libmspub-0.1.0
>=app-text/libmwaw-0.3.1
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
>=app-text/libwps-0.4
>=app-text/poppler-0.16:=[cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
dev-db/unixODBC
>=dev-libs/boost-1.55:=
dev-libs/expat
>=dev-libs/hyphen-2.7.1
>=dev-libs/icu-4.8.1.1:=
=dev-libs/liborcus-0.9*
>=dev-libs/librevenge-0.0.1
>=dev-libs/nspr-4.8.8
>=dev-libs/nss-3.12.9
>=dev-lang/perl-5.0
!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
libressl? ( dev-libs/libressl )
>=dev-libs/redland-1.0.16
media-gfx/graphite2
>=media-libs/fontconfig-2.8.0
media-libs/freetype:2
>=media-libs/glew-1.10
>=media-libs/harfbuzz-0.9.18:=[icu(+)]
media-libs/lcms:2
>=media-libs/libpng-1.4:0=
>=media-libs/libcdr-0.1.0
>=media-libs/libfreehand-0.1.0
media-libs/libpagemaker
>=media-libs/libvisio-0.1.0
>=net-misc/curl-7.21.4
net-libs/neon
net-nds/openldap
sci-mathematics/lpsolve
virtual/jpeg:0
>=x11-libs/cairo-1.10.0[X,-xlib-xcb]
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
virtual/glu
virtual/opengl
bluetooth? ( net-wireless/bluez )
coinmp? ( sci-libs/coinor-mp )
collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
cups? ( net-print/cups )
dbus? ( >=dev-libs/dbus-glib-0.92 )
eds? (
dev-libs/glib:2
gnome-extra/evolution-data-server
)
firebird? ( >=dev-db/firebird-2.5 )
gltf? ( media-libs/libgltf )
gtk? (
x11-libs/gdk-pixbuf[X]
>=x11-libs/gtk+-2.24:2
)
gtk3? (
dev-libs/glib:2
dev-libs/gobject-introspection
>=x11-libs/gtk+-3.8:3
)
gstreamer? (
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
jemalloc? ( dev-libs/jemalloc )
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
telepathy? ( >=net-libs/telepathy-glib-0.18.0 )
"
RDEPEND="${COMMON_DEPEND}
!app-office/libreoffice-bin
!app-office/libreoffice-bin-debug
!<app-office/openoffice-bin-3.4.0-r1
!app-office/openoffice
media-fonts/libertine
media-fonts/liberation-fonts
media-fonts/urw-fonts
java? ( >=virtual/jre-1.6 )
kde? ( $(add_kdeapps_dep kioclient) )
vlc? ( media-video/vlc )
"
if [[ ${PV} != *9999* ]]; then
PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
else
# Translations are not reliable on live ebuilds
# rather force people to use english only.
PDEPEND="!app-office/libreoffice-l10n"
fi
# FIXME: cppunit should be moved to test conditional
# after everything upstream is under gbuild
# as dmake execute tests right away
DEPEND="${COMMON_DEPEND}
>=dev-libs/libatomic_ops-7.2d
>=dev-libs/libxml2-2.7.8
dev-libs/libxslt
dev-perl/Archive-Zip
dev-util/cppunit
>=dev-util/gperf-3
dev-util/intltool
>=dev-util/mdds-0.12.0:0=
media-libs/glm
net-misc/npapi-sdk
sys-devel/bison
sys-devel/flex
sys-devel/gettext
!<sys-devel/make-3.82
sys-devel/ucpp
sys-libs/zlib
virtual/pkgconfig
x11-libs/libXt
x11-libs/libXtst
x11-proto/randrproto
x11-proto/xextproto
x11-proto/xineramaproto
x11-proto/xproto
java? (
>=virtual/jdk-1.6
>=dev-java/ant-core-1.7
)
odk? ( >=app-doc/doxygen-1.8.4 )
test? ( dev-util/cppunit )
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
bluetooth? ( dbus )
collada? ( gltf )
eds? ( gnome )
gnome? ( gtk )
telepathy? ( gtk )
libreoffice_extensions_nlpsolver? ( java )
libreoffice_extensions_scripting-beanshell? ( java )
libreoffice_extensions_scripting-javascript? ( java )
libreoffice_extensions_wiki-publisher? ( java )
"
PATCHES=(
# submitted upstream
"${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
# not upstreamable stuff
"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
)
CHECKREQS_MEMORY="512M"
if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
pkg_pretend() {
local pgslot
use java || \
ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
if [[ ${MERGE_TYPE} != binary ]]; then
check-reqs_pkg_pretend
if [[ $(gcc-major-version) -lt 4 ]] || {
[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; }
then
eerror "Compilation with gcc older than 4.7 is not supported"
die "Too old gcc found."
fi
fi
# Ensure pg version but we have to be sure the pg is installed (first
# install on clean system)
if use postgres && has_version dev-db/postgresql; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} -lt 90 ]] ; then
eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
fi
}
pkg_setup() {
java-pkg-opt-2_pkg_setup
kde4-base_pkg_setup
python-single-r1_pkg_setup
[[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
}
src_unpack() {
local mod
[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
use branding && unpack "${BRANDING}"
if [[ ${PV} != *9999* ]]; then
unpack "${P}.tar.xz"
for mod in ${MODULES}; do
[[ ${mod} == core ]] && continue
unpack "${PN}-${mod}-${PV}.tar.xz"
done
else
local base_uri branch checkout mypv
base_uri="git://anongit.freedesktop.org"
for mod in ${MODULES}; do
branch="master"
mypv=${PV/.9999}
[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
[[ ${mod} != core ]] && checkout="${S}/${mod}"
[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
done
fi
}
src_prepare() {
# patchset
if [[ -n ${PATCHSET} ]]; then
EPATCH_FORCE="yes" \
EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
EPATCH_SUFFIX="patch" \
epatch
fi
epatch "${PATCHES[@]}"
epatch_user
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh
touch autogen.lastrun
# system pyuno mess
sed -i \
-e "s:%eprefix%:${EPREFIX}:g" \
-e "s:%libdir%:$(get_libdir):g" \
pyuno/source/module/uno.py \
pyuno/source/officehelper.py || die
# sed in the tests
sed -i \
-e "s#all : build unitcheck#all : build#g" \
solenv/gbuild/Module.mk || die
sed -i \
-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
Makefile.in || die
if use branding; then
# hack...
mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
fi
}
src_configure() {
local java_opts
local internal_libs
local lo_ext
local ext_opts
# optimization flags
export GMAKE_OPTIONS="${MAKEOPTS}"
# System python enablement:
export PYTHON_CFLAGS=$(python_get_CFLAGS)
export PYTHON_LIBS=$(python_get_LIBS)
if use collada; then
export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
fi
# sane: just sane.h header that is used for scan in writer, not
# linked or anything else, worthless to depend on
# vigra: just uses templates from there
# it is serious pain in the ass for packaging
# should be replaced by boost::gil if someone interested
internal_libs+="
--without-system-sane
--without-system-vigra
"
# libreoffice extensions handling
for lo_xt in ${LO_EXTS}; do
if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
else
ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
fi
done
if use java; then
# hsqldb: system one is too new
java_opts="
--without-junit
--without-system-hsqldb
--with-ant-home="${ANT_HOME}"
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
--with-jvm-path="${EPREFIX}/usr/lib/"
"
use libreoffice_extensions_scripting-beanshell && \
java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
use libreoffice_extensions_scripting-javascript && \
java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
fi
# system headers/libs/...: enforce using system packages
# --enable-cairo: ensure that cairo is always required
# --enable-graphite: disabling causes build breakages
# --enable-*-link: link to the library rather than just dlopen on runtime
# --enable-release-build: build the libreoffice as release
# --disable-fetch-external: prevent dowloading during compile phase
# --disable-systray: quickstarter does not actually work at all so do not
# promote it
# --enable-extension-integration: enable any extension integration support
# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
# --disable-report-builder: too much java packages pulled in without pkgs
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
--with-system-headers \
--with-system-libs \
--with-system-jars \
--with-system-dicts \
--enable-cairo-canvas \
--enable-graphite \
--enable-largefile \
--enable-mergelibs \
--enable-neon \
--enable-python=system \
--enable-randr \
--enable-randr-link \
--enable-release-build \
--disable-hardlink-deliver \
--disable-ccache \
--disable-crashdump \
--disable-dependency-tracking \
--disable-epm \
--disable-fetch-external \
--disable-gstreamer-0-10 \
--disable-report-builder \
--disable-online-update \
--disable-systray \
--with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
--with-build-version="Gentoo official package" \
--enable-extension-integration \
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
--with-external-tar="${DISTDIR}" \
--with-lang="" \
--with-parallelism=$(makeopts_jobs) \
--with-system-ucpp \
--with-vendor="Gentoo Foundation" \
--with-x \
--without-fonts \
--without-myspell-dicts \
--without-help \
--with-helppack-integration \
--without-sun-templates \
$(use_enable bluetooth sdremote-bluetooth) \
$(use_enable coinmp) \
$(use_enable collada) \
$(use_enable cups) \
$(use_enable debug) \
$(use_enable dbus) \
$(use_enable eds evolution2) \
$(use_enable firebird firebird-sdbc) \
$(use_enable gltf) \
$(use_enable gnome gio) \
$(use_enable gstreamer gstreamer-1-0) \
$(use_enable gtk) \
$(use_enable gtk3) \
$(use_enable kde kde4) \
$(use_enable mysql ext-mariadb-connector) \
$(use_enable odk) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable vlc) \
$(use_with coinmp system-coinmp) \
$(use_with collada system-opencollada) \
$(use_with gltf system-libgltf) \
$(use_with java) \
$(use_with mysql system-mysql-cppconn) \
$(use_with odk doxygen) \
${internal_libs} \
${java_opts} \
${ext_opts}
}
src_compile() {
# more and more LO stuff tries to use OpenGL, including tests during build
# bug 501508, bug 540624, bug 545974 and probably more
addpredict /dev/dri
addpredict /dev/ati
addpredict /dev/nvidiactl
# hack for offlinehelp, this needs fixing upstream at some point
# it is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
(
grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
source "${T}/config_host.mk" 2&> /dev/null
local path="${WORKDIR}/helpcontent2/source/auxiliary/"
mkdir -p "${path}" || die
echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-dir=icon-themes/galaxy/res/helpimg \
> "${path}/helpimg.ilst"
[[ -s "${path}/helpimg.ilst" ]] || \
ewarn "The help images list is empty, something is fishy, report a bug."
)
local target
use test && target="build" || target="build-nocheck"
# this is not a proper make script
make ${target} || die
}
src_test() {
make unitcheck || die
make slowcheck || die
}
src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install -o build -o check || die
# Fix bash completion placement
newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
rm -rf "${ED}"etc/ || die
if use branding; then
insinto /usr/$(get_libdir)/${PN}/program
newins "${WORKDIR}/branding-sofficerc" sofficerc
dodir /etc/env.d
echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
fi
# Hack for offlinehelp, this needs fixing upstream at some point.
# It is broken because we send --without-help
# https://bugs.freedesktop.org/show_bug.cgi?id=46506
insinto /usr/$(get_libdir)/libreoffice/help
doins xmlhelp/util/*.xsl
# Remove desktop files for support to old installs that can't parse mime
rm -r "${ED}"usr/share/mimelnk/ || die
# FIXME: Hack add missing file
exeinto /usr/$(get_libdir)/${PN}/program
doexe "${S}"/instdir/program/libsaxlo.so
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
# Cache updates - all handled by kde eclass for all environments
kde4-base_pkg_preinst
}
pkg_postinst() {
kde4-base_pkg_postinst
}
pkg_postrm() {
kde4-base_pkg_postrm
}

@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_COMPAT=( python{3_4,3_5} )
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old

@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
KDE_SCM="git"
CMAKE_REQUIRED="never"
PYTHON_COMPAT=( python{3_4,3_5} )
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
PYTHON_REQ_USE="threads,xml"
# experimental ; release ; old

@ -1,4 +1,2 @@
DIST zathura-cb-0.1.2.tar.gz 6636 SHA256 72b20e2de452ccb8428fe0007bf12cee06c3422eac8e5e3b2c0ecbc9848850e0 SHA512 bc2c8c846e40ee17aa9df989ca019382d1e4b3074376431c1a2f8190607c4d200ed159de161b8cbb1800bd1f494a770691fec803bc8ce661fe317cf753efc4b7 WHIRLPOOL b0f8c3e67842c7e9469b4d3d21f27fb15ad29bfef5540556c8ae6c23e1bbecc368e3cb60b9f4f8882cdb9d26ddf88f9d75613463acacde23d415f8b4c9857061
DIST zathura-cb-0.1.3.tar.gz 7191 SHA256 7c9b744201ee690b6d3667481bd5ae97de27abeb4d594a80ecaf4ee8a041023f SHA512 13d64e4e508c35e170db33f5a3fa29894ab26a0ede5a9c55ec4e546faee570a13791af1a48f335c506833d706823554a0fbaeb950a60d6332f3bff41668ce294 WHIRLPOOL b11f7278ddfa7102169eb74863a894846d220238fd289efcc240b10cd34687ff75414641c2565e15c3e9bc4357e00a303737f94a5e8436b02a95a872ba5a54a4
DIST zathura-cb-0.1.4.tar.gz 7205 SHA256 f21cb140cce02b3ef8b23eff479a7f66285667ab47cdc099c10cd62eaf239626 SHA512 e36b6adad6bb9cfb2f5e5536db6a9392318c000408336376881dae537a1978eaefd3aea99a0de1e33599f433ef6bb14dc0273d1f6c12bce16570a1f544296e77 WHIRLPOOL 86aeb768f717ff7bfd01a5ed00fdbfa368a53098017682e5a3fee2f328638a2f4e886e3d9c0f7eefe7ab990f3e9fececc445b11b8edbdf85fe6ba2c69fcedfc7
DIST zathura-cb-0.1.5.tar.gz 7193 SHA256 375f6912bd79648603bad51c3635ce28eaca7bf4df521c00ff9673d9b4ff6afd SHA512 bb57f1af3813bf9414dc6843f0e9766179a28d0d0756b3c2402e2872d0f35e09fe69c17f9740635da61099407c1335856351d95788738f3820790f3158ff935d WHIRLPOOL a7288ac461a691727914832c9fed90ba4a5e11f47bbdd597d77f0c3cdf539469a4a44028bb2e7d7b9f5cec0b0a822567ee4ab6a566553727921b702e116f3a45

@ -1,56 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils toolchain-funcs
[[ ${PV} == 9999* ]] && inherit git-2
DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
HOMEPAGE="http://pwmt.org/projects/zathura/"
if ! [[ ${PV} == 9999* ]]; then
SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
fi
EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
EGIT_BRANCH="develop"
LICENSE="ZLIB"
SLOT="0"
if ! [[ ${PV} == 9999* ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
KEYWORDS=""
fi
IUSE=""
COMMON_DEPEND=">=app-text/zathura-0.3.1
dev-libs/glib:2=
app-arch/libarchive:=
x11-libs/cairo:=
x11-libs/gdk-pixbuf:="
RDEPEND="${COMMON_DEPEND}
app-arch/p7zip
app-arch/tar
app-arch/unrar
app-arch/unzip"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
pkg_setup() {
myzathuraconf=(
CC="$(tc-getCC)"
LD="$(tc-getLD)"
VERBOSE=1
DESTDIR="${D}"
)
}
src_compile() {
emake "${myzathuraconf[@]}"
}
src_install() {
emake "${myzathuraconf[@]}" install
dodoc AUTHORS
}

@ -1,56 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils toolchain-funcs
[[ ${PV} == 9999* ]] && inherit git-2
DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
HOMEPAGE="http://pwmt.org/projects/zathura/"
if ! [[ ${PV} == 9999* ]]; then
SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
fi
EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
EGIT_BRANCH="develop"
LICENSE="ZLIB"
SLOT="0"
if ! [[ ${PV} == 9999* ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
KEYWORDS=""
fi
IUSE=""
COMMON_DEPEND=">=app-text/zathura-0.3.1
dev-libs/glib:2=
app-arch/libarchive:=
x11-libs/cairo:=
x11-libs/gdk-pixbuf:="
RDEPEND="${COMMON_DEPEND}
app-arch/p7zip
app-arch/tar
app-arch/unrar
app-arch/unzip"
DEPEND="${COMMON_DEPEND}
virtual/pkgconfig"
pkg_setup() {
myzathuraconf=(
CC="$(tc-getCC)"
LD="$(tc-getLD)"
VERBOSE=1
DESTDIR="${D}"
)
}
src_compile() {
emake "${myzathuraconf[@]}"
}
src_install() {
emake "${myzathuraconf[@]}" install
dodoc AUTHORS
}

@ -1,3 +1,2 @@
DIST zathura-djvu-0.2.3.tar.gz 11181 SHA256 c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89 SHA512 6fd9c1d367d02402bc5eaedd853ed0d37aee61a682772c3c2dd543d98c03d85b32cd2b4af4b7f7a6390e97206aa881ebd6df9783e7abf4222352fb4d57de4850 WHIRLPOOL 447aee58bf3c0e9baed6d9d60505245777fd38be8bb2ae4c2f387a98afe334a01cd870995884f99d073904ba6812120c6660d88864bc3d38798d94e1c7d9cd76
DIST zathura-djvu-0.2.4.tar.gz 11197 SHA256 ac10b8c07fd9f58281225e1a4cb026634cd03bf6b549eaceeea02f99ab5334bc SHA512 192df545b686259089342044ab682c2517f8e377667a9d44f6f416e1ac7fb7b2e45fa22d34004583c6081650a15d2becb350296a39a647a8dcd2ccc7ef1066d8 WHIRLPOOL ca0cf5570ee5529233110b7db1c29e5572ba321b7dbe59a4632ce23861cb15e0b6e85118bd5159c94a7e5d715c10bafc856a4eb4070413eb66601513eaf26542
DIST zathura-djvu-0.2.5.tar.gz 11137 SHA256 08b7110af13e17a9d221bd7a0f7d3b479b3e31631d78bc6c5efb46271a299c0d SHA512 475ad916ed4b1cb1f7d79cf3417a68084bf00d737ffd5436c8079012dff2c8a3c4af28753dd42ad412269ea340e3844f2f781eee080f5487a13ee3a272ffa55a WHIRLPOOL 1304e9a74e0c8d0703f71e5243a112fbe1fe32fd71df64204770b4b0e1dd74e97a0a6a4a0fa258f5e56d5609ded0bb7b5ab097bc1446edb38b27cd4643e6be00

@ -1,50 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils toolchain-funcs
[[ ${PV} == 9999* ]] && inherit git-2
DESCRIPTION="DjVu plug-in for zathura"
HOMEPAGE="http://pwmt.org/projects/zathura/"
if ! [[ ${PV} == 9999* ]]; then
SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
fi
EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
EGIT_BRANCH="develop"
LICENSE="ZLIB"
SLOT="0"
if ! [[ ${PV} == 9999* ]]; then
KEYWORDS="~amd64 ~arm ~x86"
else
KEYWORDS=""
fi
IUSE=""
RDEPEND=">=app-text/djvu-3.5.24-r1:=
>=app-text/zathura-0.3.1
dev-libs/glib:2=
x11-libs/cairo:="
DEPEND="${RDEPEND}
virtual/pkgconfig"
pkg_setup() {
myzathuraconf=(
CC="$(tc-getCC)"
LD="$(tc-getLD)"
VERBOSE=1
DESTDIR="${D}"
)
}
src_compile() {
emake "${myzathuraconf[@]}"
}
src_install() {
emake "${myzathuraconf[@]}" install
dodoc AUTHORS
}

@ -1,4 +1,7 @@
DIST icedtea-bin-core-3.0.0_pre09-amd64.tar.xz 56906864 SHA256 9251511101ddd520578b7a737d56825810f66dd3789b3105d2f69d47e20ed4e0 SHA512 5d4c6dae4c5d0da6d8c05cfcf13183f03bc26253e5d3cc134a088769d651292071acb0e00c3f6427222db3db31fe25e93c4693c800e03f7aa92bdc714647ec05 WHIRLPOOL 0395ebc3bb8950fb70920cac9477c43b1dc8a5294742ae21899c0aacec3cfa640a4d2a9c369e533b16fe3c9f31029417d3d708099f65c997c8a86a078b5ac905
DIST icedtea-bin-core-3.0.0_pre09-arm.tar.xz 48944988 SHA256 d54bf1c9d4ae4158af928ced84bc1c0c5e1de4b7788012ab1f67568680d47334 SHA512 7a1b5169124a63294f19a1de9e126901c4c88c6af8221fee55adeab4a1f8f00d68736bb003122b1bb5f780d7442a6b5bd7739b837b79ab4964d410fc138d4c8e WHIRLPOOL a1f3acf8bd8ba26ad2219f3d3a6dfcd73a0ccfdf9e11b62072e6f213218e0b0fef1e26b3be3f56e5b980cb7768e4a8fa16a90c34084a1060d753edcaca69a545
DIST icedtea-bin-core-3.0.0_pre09-ppc64.tar.xz 49946420 SHA256 363b17b13a0608e39140316753805311b4c4132c6e7a868072ef37bb8d727735 SHA512 36932e613aa896588dc81fcbc70f85a84c836290ba86376aa9b13f45e2c1b65b0bae0b9c18428fdf814916ab96d46130baf7ba1b8113e44f5c36c802304b9f44 WHIRLPOOL a7d41789ea73dd8dc684e9fe7e19f969df26b885f9339c99f5adea136715aa8061e4ad2ca3ae4b180649512b8b48c03070365c249721206d37e214dc4b1f1454
DIST icedtea-bin-core-3.0.0_pre09-x86.tar.xz 56347004 SHA256 c0c0db770f78877e14e5c91d0ce9f0e5f1b6c341eafdcbbad47dcc336e1ee3d2 SHA512 7f245fb2e6242d5a416f988ee79cac894a2b4736b73fd5f4985bfec83de919c8d3904c06382b972ca1645bd8b3b2e44c8b0b3d10be09a290545d03810e3cd0b0 WHIRLPOOL ff11fa15cb9eb301145f96edf3ae9ef6f15097c88582bf1bdc0cbd2ff1a33b5e64bcf9d3b96a2a5b9f4112fea901986775b2e2dc348b5087a198ae6cade95205
DIST icedtea-bin-core-6.1.13.9-amd64.tar.xz 49472280 SHA256 3faf62158a33cf1021f63f137a5b35c1c04bc4366d40d7288a6745911bf15034 SHA512 237266a1843b5d1ed0b4553fa36e88d7dce7f6a9bf6e13277d38bc83bb85cfac9b031ed5b362e73e5bc24464893cfdb37bfe67fcf3d4e218a87f101ab56afae7 WHIRLPOOL dd067ee66e2ce7ebbf08d4187d4699198d9759d6571c7d3bf127b7c8ff3a8eb1bea48bf45ed5d480df8de7320ab4f9a00ed6608935f2b3b794a99141568aa57a
DIST icedtea-bin-core-6.1.13.9-x86.tar.xz 50947228 SHA256 fbef618f82fc640553bf69383ddf6a4ffb4da5191426d040f0186538fdb3ab2f SHA512 04a066493a0e742da0508fa7e010e7663e73a48e0663939884d22a2f7fa4d440d3680f6a38d7909b2b2f569bbd35facabe838a275cdd589556570601484d443c WHIRLPOOL 9e144546554bf0de5c7cc280fe20a3cd97554d0745b071d0c3f5f97a394556c71246423a39d10de207d0058889ddc010fd367813f4d10fe888d49924b4d7bac7
DIST icedtea-bin-core-7.2.6.4-amd64.tar.xz 53010708 SHA256 16e33d1f686c657c9b16c63d206bfbc6b079dd2112108f4205057e6998291345 SHA512 ee6674d99d2ffcc9c9209eb22f9efc0f2ff4a57e1cdf6763de7ff505e312cc740068a68c4ad77ff8f9941ebc5407cd2b3cacb17dda22fefb77c9a0dab4ea66a6 WHIRLPOOL e86c06eefd6f7eb605c7a39c6865f8eb56260febe595527cbbd6db41ea2fcb7c0a65bb60846dd2bfaaf6b2ee3548297a0bb3af61df900d10b8c5a7605d95737e
@ -8,7 +11,10 @@ DIST icedtea-bin-core-7.2.6.4-x86.tar.xz 54661536 SHA256 9329914ee4a6072afb940e2
DIST icedtea-bin-doc-3.0.0_pre09.tar.xz 11648012 SHA256 98e2d1940a5042d5ea9752a5e2783f37e7996cccad20e84a499838a929681f41 SHA512 f577153f2158a6a8984ff21049716981c5ec6e5a524c81d516890b5eef55a457b1071d6a1a05e7df19902a0e6033eb96a4c65f9927680903162c2abae1283ab7 WHIRLPOOL 126e967ae2298951f1b090152a3833fe7ebc1defde34267ea19c613c69fa72d0c4ac566c4b63a9515e8bb0e7b16d096b827bae5e0e099140c806b21e097b945a
DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907
DIST icedtea-bin-doc-7.2.6.4.tar.xz 10603692 SHA256 07e1bf90c61b56bf311d528891f30ed0cd67f073e6019aa92c8907c86bf1c6ac SHA512 6c97c37926989b1a36bb1fe9712caf6270c539646aeb76d30a10e9479ecbf734f2f56ef934f774a9cfe4d713651fd0b8c99872f6651f2d7e3c86a18294f9ea79 WHIRLPOOL 023eb8ee8851882101cff967d7ee58f69aa569257f113e512faef2ba3eebf066f01b80440cfbb59c7ed67b36630426ea88300724e7348611ae80c498e5da8b84
DIST icedtea-bin-examples-3.0.0_pre09-amd64.tar.xz 1811968 SHA256 2a497aaec02378dccf7141dccf926afe43f6089832404f7f3bb5e4152ebc67c9 SHA512 c87d7449d556be739b634c44331ca51eb975c8ebb9c3932cf463969898d7ce41169849c1c52273d40ce9701264a1292b8fac45eb81302ed2fe65abc223072719 WHIRLPOOL 581aa58ecfd454e4347aa8733ca12fc6730a4165ac2eb494ff86b061aa3ab5b887abe812f837f4f3599d8f9e351e3b332d276bd6454b1cf0f8dcf9be69ecd8ba
DIST icedtea-bin-examples-3.0.0_pre09-arm.tar.xz 1794592 SHA256 ad6ab000a0f727a9ed6a6d2b9d35ab553a261586af20238698fed75e33f1027b SHA512 c15ab276a4534b741111cc1628e5bb3893f1dadd03b18c084ff48b41d1a5426060aa63b6025bf9d9e28f2861c8789ba6e22ea4b70b6c401917a70fc7df9d017d WHIRLPOOL 2cd72d7ea034e0b775c3ecad27025c77c4ac01de7e5040a47514a738ed11837099c04dcffba8afd2b0de60c9210ef834a3bd3af8b3b1cdae5d026ebd3175e4a0
DIST icedtea-bin-examples-3.0.0_pre09-ppc64.tar.xz 1804896 SHA256 8364f463b5a424a7e60ed724ee90b2af0ad30ac6fe2616a96eb5969893474d8e SHA512 dc2feeaa920145f007c29d17ee0cdb6de9d316f2515c2fef4ce5a4db1439895c2fcd7802061ef37e1655bbd617b26f3391ac73574bd75980697d953df6760b59 WHIRLPOOL 0c412aef95eec0c5b0ed2164c2ebb6b82cf9ba98fa830414cbb71227d18f66ee53deb0ef3bd299c04f3b9101aead027fdc783dbb618be4306cc091fa894df07a
DIST icedtea-bin-examples-3.0.0_pre09-x86.tar.xz 1817136 SHA256 bc3c6adee9d2a50f98bc2262852859252b52d61ecfc55610541cb765f401191e SHA512 3c8e671bdb2e5e0e52a5a15db38e99b7dc79198df05cd630e0cd10773203e41587956b05e6baf7c0dcc8c277379f9e531513eaa87c44df207d559e07b8e35cba WHIRLPOOL d4465cd26ff220686e4ad6e949b0c09a96c75ac9d8978fbd53e2c78b5fc56ad52a143cc2f099a058c92c9f1eb565b9ae8fc7776aea3134dbedd6425770540ccc
DIST icedtea-bin-examples-6.1.13.9-amd64.tar.xz 1904980 SHA256 aa10b253ba35e14d83852c80999c04bfee7c6ffee7b1baa9df502e253a6a87a1 SHA512 f9be25093aed5b762a268a5fc2cd943fa010bab469e1fd0cc9c39c927a9a154041e637036bfa804cc826f1c674b661ee6d4a5dd7d29820df1de4390db403a229 WHIRLPOOL 121122c84abe3ddbddf5faf6e163ce9a34331cdddfc8cd0ca746d8ba94a79af31c1dadba711aa4bb709edd91605d81785de4fe4ff1e3edd526d4aff592b18816
DIST icedtea-bin-examples-6.1.13.9-x86.tar.xz 1904548 SHA256 1aaaaa4ba6c37b5f03ecea8a978c9bdac371e5891dd02459cd7f4174286b182a SHA512 fcdae8dc62376f60a19a3de1fbba867fcbcaa069b5d669120e53d1792119a147566ce59e3e3205ca1db0afea3e6809f339a4a443ff0d21cb1a7c4aa8eb5060df WHIRLPOOL 5625b1af755e79c1e4360ac3fcbf786664525c9508f6fe902788f95a1be9b94d429a61ef0e475fa9d0e2c4ea386fe251a299305961e7936f932c8e2c0abcaa3e
DIST icedtea-bin-examples-7.2.6.4-amd64.tar.xz 1796924 SHA256 1cba4146c597bd9cae873965b2f198fa944a368fe4bd39deb0e0a06df8638143 SHA512 10be9af6a44e0e10fff7df279e4c0912df4f53e48b6fbb3891a1f9b72eb4ca7c696019eee780ad7bfd2cf9001e8acdc44739ba8c95706a46e33278e104c1bbbd WHIRLPOOL d5272f7a711dbf69d976b83623b64e1f55cb1d459a081aa5c71dffb585675c2b05b00798fe034007e7f58d94f7dabb0c8a47c9ffec740c2d55bfbfbec35326cd

@ -14,7 +14,7 @@ HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
for arch in ppc64; do
for arch in amd64 arm ppc64 x86; do
SRC_URI+="
${arch}? (
${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
@ -24,7 +24,7 @@ done
LICENSE="GPL-2-with-linking-exception"
SLOT="8"
KEYWORDS="-* ~ppc64"
KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin pulseaudio selinux source +webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription lang="en">
JSON (JavaScript Object Notation) is a lightweight data-interchange format.

@ -1 +1,2 @@
DIST v0.10.1.zip 296228 SHA256 05de4cd5a15ea37e505049c5d7e9c75fbb61ce1bcabec39d762df3dbeda7d814 SHA512 94719b42ecf6dc5505ea649df00b255b1e901d6104426192f34692e2f7bc85940b96b39fd1bfa00577b63c17e10d8fd51d3de743c02d8ac2263abe2fb47d4498 WHIRLPOOL a3c4420421afd45bf6a0908a3a0f42319a094d4d186636eebe5f58b4f2d11192c0a7cbc6eee7dbc1aa48f326fed8c1869932e4d277c41387f790006675f4985d
DIST v0.7a.zip 216133 SHA256 c494135bf50a8dd62723e026a6b4cf4c5c4d6b8a01e59b6e41bbb6daf5c25dd3 SHA512 93f1b0e81275af21d3dbee73f364f4b67d4ce2d6beb7fe2c17e17d5f5330ec8762d63978ae291267ddd92d311b2ad7d2572854b5e3da9c884f4c706e23551aaa WHIRLPOOL 44067ac8e529d54e66cb18d0ae11c3f7d3a489b530f995e90eb000aae9e212ce79abc57388c515a681265a0242f568ae7efb3e1307e937c3aad55438b6d7b0da

@ -0,0 +1,37 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit multilib
DESCRIPTION="Lisp-flavoured Erlang"
HOMEPAGE="http://lfe.github.io/"
SRC_URI="https://github.com/rvirding/lfe/archive/v${PV}.zip"
LICENSE="BSD-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-lang/erlang"
DEPEND="${RDEPEND}"
src_prepare() {
export PATH="${S}/bin:$PATH"
}
src_compile() {
emake compile -j1
}
src_install() {
dobin bin/lfe
dobin bin/lfec
dobin bin/lfescript
dodir /usr/$(get_libdir)/erlang/lib/lfe/ebin/
dodir /usr/$(get_libdir)/erlang/lib/lfe/emacs/
cp -R "${S}/ebin" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
cp -R "${S}/emacs" "${D}/usr/$(get_libdir)/erlang/lib/lfe/"
}

@ -1,4 +1,6 @@
DIST ocaml-3.12.1.tar.bz2 2949124 SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d SHA512 cbb050aabcbe19a4aa070d6cb74f3774cb136692dfd9433ca977f0f9520ad2f583b6cfb1a9cedfedc92e7dc794ac4a869e20aa5a67a4739002feb290435dc7e7 WHIRLPOOL b7bf4844452ab52027e6b785159df6e4defc548d2f3d31eb73dc0dc05214e7c19ed654c8b3ff234a85691599df0be568ba02fafe257856be7f603177584a7ca0
DIST ocaml-4.02.3.tar.xz 2058552 SHA256 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 SHA512 a815421f6a320b18e7f351bd66884024ad4a33525ba161a198ea356892ce331be6c1ddf4cd07d120ebe9a902bcf815ce1b17e45f405e4e0b2d55ce1b6d2adada WHIRLPOOL 1104cdcf23b773ebf0c0ef8d8ee36b2b4b58b1fab10a41ff7f2d522c34ae6161bc6cba28b279eea03ac183a111fc332557084b017d0c2ad6f9c969204e309597
DIST ocaml-4.03.0+beta1.tar.xz 2277268 SHA256 ef7e50846b101229f0c2a3a3699c719400c90f1ecdf7d4e038459612e9de6116 SHA512 9d02bfc5bc1f0d412bf026a826c6411ff96c5fbb93118c64103787a17279c42fb5e4f51e5a0e54580f87a9e4a5ba0db536549ba45adddcb974efd7c8285f0a5b WHIRLPOOL 7e68702fd64a14e4ae7221d48ef9baff4e4b2850812002a067711a248c273406ba74109ac23ea78fb2a3f9cb0ec86b9490a50530105d908500c1cccfc6290717
DIST ocaml-patches-3.tar.bz2 4101 SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658 SHA512 8be5c44de5a6b0b7c14723e41d92fe807b881b218cc5eee38ea7519c0f971415cb7fe30035303da275089dcb8a61c4f334c4a88e0bdbced3953503794b8308a7 WHIRLPOOL f1920606785702c44dead01b1426145653bc1931acba2d614c6818baddc051e4f74ca0322cae66ade63ba0cd0df5651cfd67f511fca5f12973b67a0c50ebab6d
DIST ocaml-patches-7.tar.bz2 2194 SHA256 71e9496af89ded9852d8e1f32be18a5f0d7e11270958fb4bc8c588420b1e9156 SHA512 63bca96f009e2de24ff6f7a4b37b97c5b7655d5ad6196f06cc2b18ca213e87878a310d169378c341c00aaac698530e458e301620bcc21284bc8b9ea143f642dd WHIRLPOOL 02d17436f901c70b2fa8a104d8b7a6526c65ab9b40408b549c4f4dfe7a1eeae8213620d151fb181833782504e4d7cb6fa3ff7ddebe77efcb88d32fe057cbd8cc
DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be

@ -0,0 +1,116 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit flag-o-matic eutils multilib versionator toolchain-funcs
PATCHLEVEL="7"
MY_P="${P/_/+}"
DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
HOMEPAGE="http://www.ocaml.org/"
SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs latex ncurses +ocamlopt X xemacs"
RDEPEND="
ncurses? ( sys-libs/ncurses:0= )
X? ( x11-libs/libX11 x11-proto/xproto )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
# results in relocations if gcc wants to create a PIE executable
if gcc-specs-pie ; then
append-ldflags -nopie
ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
ewarn "We have appended -nopie to ocaml build options"
ewarn "because linking an executable with pie while the objects are not pic will not work"
fi
}
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
}
src_configure() {
export LC_ALL=C
local myconf=""
# Causes build failures because it builds some programs with -pg,
# bug #270920
filter-flags -fomit-frame-pointer
# Bug #285993
filter-mfpmath sse
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
use ncurses || myconf="${myconf} -no-curses"
use X || myconf="${myconf} -no-graph"
# ocaml uses a home-brewn configure script, preventing it to use econf.
RAW_LDFLAGS="$(raw-ldflags)" ./configure \
--prefix "${EPREFIX}"/usr \
--bindir "${EPREFIX}"/usr/bin \
--target-bindir "${EPREFIX}"/usr/bin \
--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
--mandir "${EPREFIX}"/usr/share/man \
--no-ocamlbuild \
-target "${CHOST}" \
-host "${CBUILD}" \
-cc "$(tc-getCC)" \
-as "$(tc-getAS)" \
-aspp "$(tc-getCC) -c" \
-partialld "$(tc-getLD) -r" \
--with-pthread ${myconf} || die "configure failed!"
# http://caml.inria.fr/mantis/view.php?id=4698
export CCLINKFLAGS="${LDFLAGS}"
}
src_compile() {
emake world
# Native code generation can be disabled now
if use ocamlopt ; then
# bug #279968
emake opt
emake opt.opt
fi
}
src_install() {
emake BINDIR="${ED}"/usr/bin \
LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
MANDIR="${ED}"/usr/share/man \
install
# Symlink the headers to the right place
dodir /usr/include
dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
dodoc Changes INSTALL README
# Create and envd entry for latex input files
if use latex ; then
echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
doenvd "${T}"/99ocamldoc
fi
# Install ocaml-rebuild portage set
insinto /usr/share/portage/config/sets
doins "${FILESDIR}/ocaml.conf"
}

@ -0,0 +1,115 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
inherit flag-o-matic eutils multilib versionator toolchain-funcs
PATCHLEVEL="8"
MY_P="${P/_/+}"
DESCRIPTION="Fast modern type-inferring functional programming language descended from the ML family"
HOMEPAGE="http://www.ocaml.org/"
SRC_URI="http://caml.inria.fr/pub/distrib/ocaml-$(get_version_component_range 1-2)/${MY_P}.tar.xz
mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs latex ncurses +ocamlopt X xemacs"
RDEPEND="
ncurses? ( sys-libs/ncurses:0= )
X? ( x11-libs/libX11 x11-proto/xproto )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
# results in relocations if gcc wants to create a PIE executable
if gcc-specs-pie ; then
append-ldflags -nopie
ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
ewarn "We have appended -nopie to ocaml build options"
ewarn "because linking an executable with pie while the objects are not pic will not work"
fi
}
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
}
src_configure() {
export LC_ALL=C
local myconf=""
# Causes build failures because it builds some programs with -pg,
# bug #270920
filter-flags -fomit-frame-pointer
# Bug #285993
filter-mfpmath sse
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
use ncurses || myconf="${myconf} -no-curses"
use X || myconf="${myconf} -no-graph"
# ocaml uses a home-brewn configure script, preventing it to use econf.
RAW_LDFLAGS="$(raw-ldflags)" ./configure \
--prefix "${EPREFIX}"/usr \
--bindir "${EPREFIX}"/usr/bin \
--target-bindir "${EPREFIX}"/usr/bin \
--libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
--mandir "${EPREFIX}"/usr/share/man \
-target "${CHOST}" \
-host "${CBUILD}" \
-cc "$(tc-getCC)" \
-as "$(tc-getAS)" \
-aspp "$(tc-getCC) -c" \
-partialld "$(tc-getLD) -r" \
--with-pthread ${myconf} || die "configure failed!"
# http://caml.inria.fr/mantis/view.php?id=4698
export CCLINKFLAGS="${LDFLAGS}"
}
src_compile() {
emake world
# Native code generation can be disabled now
if use ocamlopt ; then
# bug #279968
emake opt
emake opt.opt
fi
}
src_install() {
emake BINDIR="${ED}"/usr/bin \
LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
MANDIR="${ED}"/usr/share/man \
install
# Symlink the headers to the right place
dodir /usr/include
dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
dodoc Changes README.adoc
# Create and envd entry for latex input files
if use latex ; then
echo "TEXINPUTS=${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:" > "${T}"/99ocamldoc
doenvd "${T}"/99ocamldoc
fi
# Install ocaml-rebuild portage set
insinto /usr/share/portage/config/sets
doins "${FILESDIR}/ocaml.conf"
}

@ -1,2 +1,3 @@
DIST openssl-0.9.8zh.tar.gz 3818524 SHA256 f1d9f3ed1b85a82ecf80d0e2d389e1fda3fca9a4dba0bf07adbf231e1a5e2fd6 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 WHIRLPOOL 8ed3362e6aed89cd6ae02438bc3fb58ff3a91afb8a2d401d1d66c1ee4fd96f4befb50558131dd03a60fc15b588172fc1ede5d56bb1f68e184453bfe3b34f9abf
DIST openssl-1.0.2f.tar.gz 5258384 SHA256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c SHA512 50abf6dc94cafd06e7fd20770808bdc675c88daa369e4f752bd584ab17f72a57357c1ca1eca3c83e6745b5a3c9c73c99dce70adaa904d73f6df4c75bc7138351 WHIRLPOOL 179e1b5ad38c50a4c8110024aa7b33c53634c39690917e3bf5c2099548430beef96132ae9f9588ff0cedd6e08bb216a8d36835baaaa04e506fb3fbaed37d31c9
DIST openssl-1.0.2g.tar.gz 5266102 SHA256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 SHA512 4d96b6c8a232203483d6e8bee81da01ba10977bfbac92f25304a36dec9ea584b7ef917bc45e097cc7dbe681d71a4570d649c22244c178393ae91fab48323f735 WHIRLPOOL aedbd82af0a550e8329a84312fae492f3bb3cb04af763fc9ef532099b2b2e61a55e4a7cfb06085f045740e2b692bbdb3ecb8bf5ca82f46325c3caf22d2317ffb

@ -0,0 +1,318 @@
--- openssl-1.0.2g/crypto/Makefile
+++ openssl-1.0.2g/crypto/Makefile
@@ -85,11 +85,11 @@
@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
subdirs:
- @target=all; $(RECURSIVE_MAKE)
+ +@target=all; $(RECURSIVE_MAKE)
files:
$(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
- @target=files; $(RECURSIVE_MAKE)
+ +@target=files; $(RECURSIVE_MAKE)
links:
@$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
@@ -100,7 +100,7 @@
# lib: $(LIB): are splitted to avoid end-less loop
lib: $(LIB)
@touch lib
-$(LIB): $(LIBOBJ)
+$(LIB): $(LIBOBJ) | subdirs
$(AR) $(LIB) $(LIBOBJ)
test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
$(RANLIB) $(LIB) || echo Never mind.
@@ -111,7 +111,7 @@
fi
libs:
- @target=lib; $(RECURSIVE_MAKE)
+ +@target=lib; $(RECURSIVE_MAKE)
install:
@[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
@@ -120,7 +120,7 @@
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
done;
- @target=install; $(RECURSIVE_MAKE)
+ +@target=install; $(RECURSIVE_MAKE)
lint:
@target=lint; $(RECURSIVE_MAKE)
--- openssl-1.0.2g/engines/Makefile
+++ openssl-1.0.2g/engines/Makefile
@@ -72,7 +72,7 @@
all: lib subdirs
-lib: $(LIBOBJ)
+lib: $(LIBOBJ) | subdirs
@if [ -n "$(SHARED_LIBS)" ]; then \
set -e; \
for l in $(LIBNAMES); do \
@@ -89,7 +89,7 @@
subdirs:
echo $(EDIRS)
- @target=all; $(RECURSIVE_MAKE)
+ +@target=all; $(RECURSIVE_MAKE)
files:
$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
@@ -128,7 +128,7 @@
mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
done; \
fi
- @target=install; $(RECURSIVE_MAKE)
+ +@target=install; $(RECURSIVE_MAKE)
tags:
ctags $(SRC)
--- openssl-1.0.2g/Makefile.org
+++ openssl-1.0.2g/Makefile.org
@@ -279,17 +279,17 @@
build_libssl: build_ssl libssl.pc
build_crypto:
- @dir=crypto; target=all; $(BUILD_ONE_CMD)
+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
build_ssl: build_crypto
- @dir=ssl; target=all; $(BUILD_ONE_CMD)
+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
build_engines: build_crypto
- @dir=engines; target=all; $(BUILD_ONE_CMD)
+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
build_apps: build_libs
- @dir=apps; target=all; $(BUILD_ONE_CMD)
+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
build_tests: build_libs
- @dir=test; target=all; $(BUILD_ONE_CMD)
+ +@dir=test; target=all; $(BUILD_ONE_CMD)
build_tools: build_libs
- @dir=tools; target=all; $(BUILD_ONE_CMD)
+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
all_testapps: build_libs build_testapps
build_testapps:
@@ -544,7 +544,7 @@
(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
done;
- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
@set -e; liblist="$(LIBS)"; for i in $$liblist ;\
do \
if [ -f "$$i" ]; then \
--- openssl-1.0.2g/Makefile.shared
+++ openssl-1.0.2g/Makefile.shared
@@ -105,6 +105,7 @@
SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
$${SHAREDCMD} $${SHAREDFLAGS} \
-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
@@ -122,6 +123,7 @@
done; \
fi; \
if [ -n "$$SHLIB_SOVER" ]; then \
+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
fi; \
--- openssl-1.0.2g/test/Makefile
+++ openssl-1.0.2g/test/Makefile
@@ -139,7 +139,7 @@
tags:
ctags $(SRC)
-tests: exe apps $(TESTS)
+tests: exe $(TESTS)
apps:
@(cd ..; $(MAKE) DIRS=apps all)
@@ -421,130 +421,130 @@
link_app.$${shlib_target}
$(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
- @target=$(RSATEST); $(BUILD_CMD)
+ +@target=$(RSATEST); $(BUILD_CMD)
$(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
- @target=$(BNTEST); $(BUILD_CMD)
+ +@target=$(BNTEST); $(BUILD_CMD)
$(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
- @target=$(ECTEST); $(BUILD_CMD)
+ +@target=$(ECTEST); $(BUILD_CMD)
$(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
- @target=$(EXPTEST); $(BUILD_CMD)
+ +@target=$(EXPTEST); $(BUILD_CMD)
$(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
- @target=$(IDEATEST); $(BUILD_CMD)
+ +@target=$(IDEATEST); $(BUILD_CMD)
$(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
- @target=$(MD2TEST); $(BUILD_CMD)
+ +@target=$(MD2TEST); $(BUILD_CMD)
$(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
- @target=$(SHATEST); $(BUILD_CMD)
+ +@target=$(SHATEST); $(BUILD_CMD)
$(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
- @target=$(SHA1TEST); $(BUILD_CMD)
+ +@target=$(SHA1TEST); $(BUILD_CMD)
$(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
- @target=$(SHA256TEST); $(BUILD_CMD)
+ +@target=$(SHA256TEST); $(BUILD_CMD)
$(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
- @target=$(SHA512TEST); $(BUILD_CMD)
+ +@target=$(SHA512TEST); $(BUILD_CMD)
$(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
- @target=$(RMDTEST); $(BUILD_CMD)
+ +@target=$(RMDTEST); $(BUILD_CMD)
$(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
- @target=$(MDC2TEST); $(BUILD_CMD)
+ +@target=$(MDC2TEST); $(BUILD_CMD)
$(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
- @target=$(MD4TEST); $(BUILD_CMD)
+ +@target=$(MD4TEST); $(BUILD_CMD)
$(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
- @target=$(MD5TEST); $(BUILD_CMD)
+ +@target=$(MD5TEST); $(BUILD_CMD)
$(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
- @target=$(HMACTEST); $(BUILD_CMD)
+ +@target=$(HMACTEST); $(BUILD_CMD)
$(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
- @target=$(WPTEST); $(BUILD_CMD)
+ +@target=$(WPTEST); $(BUILD_CMD)
$(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
- @target=$(RC2TEST); $(BUILD_CMD)
+ +@target=$(RC2TEST); $(BUILD_CMD)
$(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
- @target=$(BFTEST); $(BUILD_CMD)
+ +@target=$(BFTEST); $(BUILD_CMD)
$(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
- @target=$(CASTTEST); $(BUILD_CMD)
+ +@target=$(CASTTEST); $(BUILD_CMD)
$(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
- @target=$(RC4TEST); $(BUILD_CMD)
+ +@target=$(RC4TEST); $(BUILD_CMD)
$(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
- @target=$(RC5TEST); $(BUILD_CMD)
+ +@target=$(RC5TEST); $(BUILD_CMD)
$(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
- @target=$(DESTEST); $(BUILD_CMD)
+ +@target=$(DESTEST); $(BUILD_CMD)
$(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
- @target=$(RANDTEST); $(BUILD_CMD)
+ +@target=$(RANDTEST); $(BUILD_CMD)
$(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
- @target=$(DHTEST); $(BUILD_CMD)
+ +@target=$(DHTEST); $(BUILD_CMD)
$(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
- @target=$(DSATEST); $(BUILD_CMD)
+ +@target=$(DSATEST); $(BUILD_CMD)
$(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
- @target=$(METHTEST); $(BUILD_CMD)
+ +@target=$(METHTEST); $(BUILD_CMD)
$(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
$(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
- @target=$(ENGINETEST); $(BUILD_CMD)
+ +@target=$(ENGINETEST); $(BUILD_CMD)
$(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
- @target=$(EVPTEST); $(BUILD_CMD)
+ +@target=$(EVPTEST); $(BUILD_CMD)
$(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
- @target=$(EVPEXTRATEST); $(BUILD_CMD)
+ +@target=$(EVPEXTRATEST); $(BUILD_CMD)
$(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
- @target=$(ECDSATEST); $(BUILD_CMD)
+ +@target=$(ECDSATEST); $(BUILD_CMD)
$(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
- @target=$(ECDHTEST); $(BUILD_CMD)
+ +@target=$(ECDHTEST); $(BUILD_CMD)
$(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
- @target=$(IGETEST); $(BUILD_CMD)
+ +@target=$(IGETEST); $(BUILD_CMD)
$(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
- @target=$(JPAKETEST); $(BUILD_CMD)
+ +@target=$(JPAKETEST); $(BUILD_CMD)
$(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
- @target=$(ASN1TEST); $(BUILD_CMD)
+ +@target=$(ASN1TEST); $(BUILD_CMD)
$(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
- @target=$(SRPTEST); $(BUILD_CMD)
+ +@target=$(SRPTEST); $(BUILD_CMD)
$(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
- @target=$(V3NAMETEST); $(BUILD_CMD)
+ +@target=$(V3NAMETEST); $(BUILD_CMD)
$(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
$(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
- @target=$(CONSTTIMETEST) $(BUILD_CMD)
+ +@target=$(CONSTTIMETEST) $(BUILD_CMD)
$(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o
- @target=$(VERIFYEXTRATEST) $(BUILD_CMD)
+ +@target=$(VERIFYEXTRATEST) $(BUILD_CMD)
$(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o
- @target=$(CLIENTHELLOTEST) $(BUILD_CMD)
+ +@target=$(CLIENTHELLOTEST) $(BUILD_CMD)
$(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o
- @target=$(SSLV2CONFTEST) $(BUILD_CMD)
+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD)
#$(AESTEST).o: $(AESTEST).c
# $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
@@ -557,7 +557,7 @@
# fi
dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
- @target=dummytest; $(BUILD_CMD)
+ +@target=dummytest; $(BUILD_CMD)
# DO NOT DELETE THIS LINE -- make depend depends on it.

@ -0,0 +1,267 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal
MY_P=${P/_/-}
DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)"
HOMEPAGE="http://www.openssl.org/"
SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
# subslot set to 1.0.2g version as this is the first release without SSLv2
# support and thus breaks nearly every openssl consumer (see bug #575548)
SLOT="0/1.0.2g"
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="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
# The blocks are temporary just to make sure people upgrade to a
# version that lack runtime version checking. We'll drop them in
# the future.
RDEPEND=">=app-misc/c_rehash-1.7-r1
gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )
kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)
!<net-misc/openssh-5.9_p1-r4
!<net-libs/neon-0.29.6-r1"
DEPEND="${RDEPEND}
>=dev-lang/perl-5
sctp? ( >=net-misc/lksctp-tools-1.0.12 )
test? (
sys-apps/diffutils
sys-devel/bc
)"
PDEPEND="app-misc/ca-certificates"
S="${WORKDIR}/${MY_P}"
MULTILIB_WRAPPED_HEADERS=(
usr/include/openssl/opensslconf.h
)
src_prepare() {
# keep this in sync with app-misc/c_rehash
SSL_CNF_DIR="/etc/ssl"
# Make sure we only ever touch Makefile.org and avoid patching a file
# that gets blown away anyways by the Configure script in src_configure
rm -f Makefile
if ! use vanilla ; then
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
epatch "${FILESDIR}"/${PN}-1.0.2g-parallel-build.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028
epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch
epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618
epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338
epatch_user #332661
fi
# disable fips in the build
# make sure the man pages are suffixed #302165
# don't bother building man pages if they're disabled
sed -i \
-e '/DIRS/s: fips : :g' \
-e '/^MANSUFFIX/s:=.*:=ssl:' \
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
|| echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
Makefile.org \
|| die
# show the actual commands in the log
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
# since we're forcing $(CC) as makedep anyway, just fix
# the conditional as always-on
# helps clang (#417795), and versioned gcc (#499818)
sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die
# quiet out unknown driver argument warnings since openssl
# doesn't have well-split CFLAGS and we're making it even worse
# and 'make depend' uses -Werror for added fun (#417795 again)
[[ ${CC} == *clang* ]] && append-flags -Qunused-arguments
# allow openssl to be cross-compiled
cp "${FILESDIR}"/gentoo.config-1.0.2 gentoo.config || die
chmod a+rx gentoo.config
append-flags -fno-strict-aliasing
append-flags $(test-flags-CC -Wa,--noexecstack)
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
# The config script does stupid stuff to prompt the user. Kill it.
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
./config --test-sanity || die "I AM NOT SANE"
multilib_copy_sources
}
multilib_src_configure() {
unset APPS #197996
unset SCRIPTS #312551
unset CROSS_COMPILE #311473
tc-export CC AR RANLIB RC
# Clean out patent-or-otherwise-encumbered code
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
# RC5: Expired http://en.wikipedia.org/wiki/RC5
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
echoit() { echo "$@" ; "$@" ; }
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
# See if our toolchain supports __uint128_t. If so, it's 64bit
# friendly and can use the nicely optimized code paths. #460790
local ec_nistp_64_gcc_128
# Disable it for now though #469976
#if ! use bindist ; then
# echo "__uint128_t i;" > "${T}"/128.c
# if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then
# ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128"
# fi
#fi
local sslout=$(./gentoo.config)
einfo "Use configuration ${sslout:-(openssl knows best)}"
local config="Configure"
[[ -z ${sslout} ]] && config="config"
echoit \
./${config} \
${sslout} \
$(use cpu_flags_x86_sse2 || echo "no-sse2") \
enable-camellia \
$(use_ssl !bindist ec) \
${ec_nistp_64_gcc_128} \
enable-idea \
enable-mdc2 \
enable-rc5 \
enable-tlsext \
$(use_ssl asm) \
$(use_ssl gmp gmp -lgmp) \
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
$(use_ssl rfc3779) \
$(use_ssl sctp) \
$(use_ssl tls-heartbeat heartbeats) \
$(use_ssl zlib) \
--prefix="${EPREFIX}"/usr \
--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
shared threads \
|| die
# Clean out hardcoded flags that openssl uses
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
-e 's:^CFLAG=::' \
-e 's:-fomit-frame-pointer ::g' \
-e 's:-O[0-9] ::g' \
-e 's:-march=[-a-z0-9]* ::g' \
-e 's:-mcpu=[-a-z0-9]* ::g' \
-e 's:-m[a-z0-9]* ::g' \
)
sed -i \
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
Makefile || die
}
multilib_src_compile() {
# depend is needed to use $confopts; it also doesn't matter
# that it's -j1 as the code itself serializes subdirs
emake -j1 depend
emake all
# rehash is needed to prep the certs/ dir; do this
# separately to avoid parallel build issues.
emake rehash
}
multilib_src_test() {
emake -j1 test
}
multilib_src_install() {
emake INSTALL_PREFIX="${D}" install
}
multilib_src_install_all() {
# openssl installs perl version of c_rehash by default, but
# we provide a shell version via app-misc/c_rehash
rm "${ED}"/usr/bin/c_rehash || die
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
dohtml -r doc/*
use rfc3779 && dodoc engines/ccgost/README.gost
# This is crappy in that the static archives are still built even
# when USE=static-libs. But this is due to a failing in the openssl
# build system: the static archives are built as PIC all the time.
# Only way around this would be to manually configure+compile openssl
# twice; once with shared lib support enabled and once without.
use static-libs || rm -f "${ED}"/usr/lib*/lib*.a
# create the certs directory
dodir ${SSL_CNF_DIR}/certs
cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die
rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired}
# Namespace openssl programs to prevent conflicts with other man pages
cd "${ED}"/usr/share/man
local m d s
for m in $(find . -type f | xargs grep -L '#include') ; do
d=${m%/*} ; d=${d#./} ; m=${m##*/}
[[ ${m} == openssl.1* ]] && continue
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
mv ${d}/{,ssl-}${m}
# fix up references to renamed man pages
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
ln -s ssl-${m} ${d}/openssl-${m}
# locate any symlinks that point to this man page ... we assume
# that any broken links are due to the above renaming
for s in $(find -L ${d} -type l) ; do
s=${s##*/}
rm -f ${d}/${s}
ln -s ssl-${m} ${d}/ssl-${s}
ln -s ssl-${s} ${d}/openssl-${s}
done
done
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
dodir /etc/sandbox.d #254521
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl
diropts -m0700
keepdir ${SSL_CNF_DIR}/private
}
pkg_preinst() {
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
}
pkg_postinst() {
ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069"
c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null
eend $?
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
}

@ -0,0 +1,223 @@
From: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Date: Mon, 29 Feb 2016 14:59:51 +0200
Subject: [PATCH] build: fix ./configure --disable-dtd-validation
When configured with --disable-dtd-validation:
CPPAS src/dtddata.o
src/dtddata.S: Assembler messages:
src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed
Makefile:1520: recipe for target 'src/dtddata.o' failed
This is because the variable name used does not match the implicit
variable name in autoconf.
Fix the variable name, making both --disable-dtd-validation and
--enable-dtd-validation to what they should.
Do not try to build dtddata.S if dtd-validation is disabled. It depends
on wayland.dtd.embed which is created by configure only if
dtd-validation is enabled.
If not building dtddata.S, also make sure the extern definitions in
scanner.c are compiled out.
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212
Reported-by: leio@gentoo.org
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Tested-by: Bryce Harrington <bryce@osg.samsung.com>
[Mart: Added Makefile.in and configure changes to patch file to avoid autoreconf]
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---
Makefile.am | 5 ++++-
Makefile.in | 20 ++++++++++++--------
configure | 18 ++++++++++++++++--
configure.ac | 5 +++--
src/scanner.c | 6 +++---
5 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e850abc..49e25a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,14 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
bin_PROGRAMS = wayland-scanner
-wayland_scanner_SOURCES = src/scanner.c src/dtddata.S
+wayland_scanner_SOURCES = src/scanner.c
wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
pkgconfig_DATA += src/wayland-scanner.pc
+if DTD_VALIDATION
+wayland_scanner_SOURCES += src/dtddata.S
+endif
src/dtddata.o: protocol/wayland.dtd
if USE_HOST_SCANNER
diff --git a/Makefile.in b/Makefile.in
index 6d9ffb2..32e6d51 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,8 +82,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = wayland-scanner$(EXEEXT)
-@ENABLE_LIBRARIES_TRUE@am__append_1 = libwayland-private.la
-@ENABLE_LIBRARIES_TRUE@am__append_2 = src/wayland-client.pc \
+@DTD_VALIDATION_TRUE@am__append_1 = src/dtddata.S
+@ENABLE_LIBRARIES_TRUE@am__append_2 = libwayland-private.la
+@ENABLE_LIBRARIES_TRUE@am__append_3 = src/wayland-client.pc \
@ENABLE_LIBRARIES_TRUE@ src/wayland-server.pc \
@ENABLE_LIBRARIES_TRUE@ cursor/wayland-cursor.pc
@ENABLE_LIBRARIES_TRUE@TESTS = array-test$(EXEEXT) \
@@ -101,7 +102,7 @@ bin_PROGRAMS = wayland-scanner$(EXEEXT)
@ENABLE_LIBRARIES_TRUE@ resources-test$(EXEEXT) \
@ENABLE_LIBRARIES_TRUE@ message-test$(EXEEXT) \
@ENABLE_LIBRARIES_TRUE@ headers-test$(EXEEXT) $(am__EXEEXT_1)
-@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_3 = cpp-compile-test
+@ENABLE_CPP_TEST_TRUE@@ENABLE_LIBRARIES_TRUE@am__append_4 = cpp-compile-test
@ENABLE_LIBRARIES_TRUE@check_PROGRAMS = $(am__EXEEXT_2) \
@ENABLE_LIBRARIES_TRUE@ exec-fd-leak-checker$(EXEEXT)
@ENABLE_LIBRARIES_TRUE@noinst_PROGRAMS = fixed-benchmark$(EXEEXT)
@@ -382,8 +383,10 @@ am__socket_test_SOURCES_DIST = tests/socket-test.c
@ENABLE_LIBRARIES_TRUE@ tests/socket-test.$(OBJEXT)
socket_test_OBJECTS = $(am_socket_test_OBJECTS)
@ENABLE_LIBRARIES_TRUE@socket_test_DEPENDENCIES = libtest-runner.la
+am__wayland_scanner_SOURCES_DIST = src/scanner.c src/dtddata.S
+@DTD_VALIDATION_TRUE@am__objects_1 = src/dtddata.$(OBJEXT)
am_wayland_scanner_OBJECTS = src/wayland_scanner-scanner.$(OBJEXT) \
- src/dtddata.$(OBJEXT)
+ $(am__objects_1)
wayland_scanner_OBJECTS = $(am_wayland_scanner_OBJECTS)
wayland_scanner_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libwayland-util.la
@@ -491,7 +494,8 @@ DIST_SOURCES = $(am__libtest_runner_la_SOURCES_DIST) \
$(am__resources_test_SOURCES_DIST) \
$(am__sanity_test_SOURCES_DIST) \
$(am__signal_test_SOURCES_DIST) \
- $(am__socket_test_SOURCES_DIST) $(wayland_scanner_SOURCES)
+ $(am__socket_test_SOURCES_DIST) \
+ $(am__wayland_scanner_SOURCES_DIST)
RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
ctags-recursive dvi-recursive html-recursive info-recursive \
install-data-recursive install-dvi-recursive \
@@ -918,8 +922,8 @@ dist_pkgdata_DATA = \
protocol/wayland.dtd
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = src/wayland-scanner.pc $(am__append_2)
-wayland_scanner_SOURCES = src/scanner.c src/dtddata.S
+pkgconfig_DATA = src/wayland-scanner.pc $(am__append_3)
+wayland_scanner_SOURCES = src/scanner.c $(am__append_1)
wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
@USE_HOST_SCANNER_FALSE@wayland_scanner = $(top_builddir)/wayland-scanner
@@ -929,7 +933,7 @@ libwayland_util_la_SOURCES = \
src/wayland-util.c \
src/wayland-util.h
-noinst_LTLIBRARIES = libwayland-util.la $(am__append_1)
+noinst_LTLIBRARIES = libwayland-util.la $(am__append_2)
@ENABLE_LIBRARIES_TRUE@lib_LTLIBRARIES = libwayland-server.la \
@ENABLE_LIBRARIES_TRUE@ libwayland-client.la \
@ENABLE_LIBRARIES_TRUE@ libwayland-cursor.la
diff --git a/configure.ac b/configure.ac
index f54a8b9..b27f34b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_ARG_ENABLE([dtd-validation],
[AC_HELP_STRING([--disable-dtd-validation],
[Disable DTD validation of the protocol])],
[],
- [enable_dtdvalidation=yes])
+ [enable_dtd_validation=yes])
AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
@@ -112,7 +112,8 @@ PKG_CHECK_MODULES(EXPAT, [expat], [],
AC_SUBST(EXPAT_LIBS)
])
-if test "x$enable_dtdvalidation" = "xyes"; then
+AM_CONDITIONAL([DTD_VALIDATION], [test "x$enable_dtd_validation" = "xyes"])
+if test "x$enable_dtd_validation" = "xyes"; then
PKG_CHECK_MODULES(LIBXML, [libxml-2.0])
AC_DEFINE(HAVE_LIBXML, 1, [libxml-2.0 is available])
AC_CONFIG_LINKS([src/wayland.dtd.embed:protocol/wayland.dtd])
diff --git a/configure b/configure
index 83e4971..6340d4f 100755
--- a/configure
+++ b/configure
@@ -711,6 +711,8 @@ HAVE_XSLTPROC_TRUE
XSLTPROC
LIBXML_LIBS
LIBXML_CFLAGS
+DTD_VALIDATION_FALSE
+DTD_VALIDATION_TRUE
EXPAT_LIBS
EXPAT_CFLAGS
FFI_LIBS
@@ -15728,7 +15730,7 @@ fi
if test "${enable_dtd_validation+set}" = set; then :
enableval=$enable_dtd_validation;
else
- enable_dtdvalidation=yes
+ enable_dtd_validation=yes
fi
@@ -16114,7 +16116,15 @@ $as_echo "yes" >&6; }
fi
-if test "x$enable_dtdvalidation" = "xyes"; then
+ if test "x$enable_dtd_validation" = "xyes"; then
+ DTD_VALIDATION_TRUE=
+ DTD_VALIDATION_FALSE='#'
+else
+ DTD_VALIDATION_TRUE='#'
+ DTD_VALIDATION_FALSE=
+fi
+
+if test "x$enable_dtd_validation" = "xyes"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML" >&5
@@ -16669,6 +16679,10 @@ if test -z "${ENABLE_LIBRARIES_TRUE}" && test -z "${ENABLE_LIBRARIES_FALSE}"; th
as_fn_error $? "conditional \"ENABLE_LIBRARIES\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${DTD_VALIDATION_TRUE}" && test -z "${DTD_VALIDATION_FALSE}"; then
+ as_fn_error $? "conditional \"DTD_VALIDATION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/src/scanner.c b/src/scanner.c
index d3e2328..04747e3 100644
--- a/src/scanner.c
+++ b/src/scanner.c
@@ -40,13 +40,13 @@
#if HAVE_LIBXML
#include <libxml/parser.h>
-#endif
-
-#include "wayland-util.h"
/* Embedded wayland.dtd file, see dtddata.S */
extern char DTD_DATA_begin;
extern int DTD_DATA_len;
+#endif
+
+#include "wayland-util.h"
enum side {
CLIENT,
--
2.6.4

@ -29,7 +29,8 @@ SLOT="0"
IUSE="doc static-libs"
RDEPEND=">=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]"
>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
dev-libs/libxml2:="
DEPEND="${RDEPEND}
doc? (
>=app-doc/doxygen-1.6[dot]
@ -39,19 +40,19 @@ DEPEND="${RDEPEND}
)
virtual/pkgconfig"
src_configure() {
# dtd validation configure patch is upstream and will be part of 1.11
PATCHES=( "${FILESDIR}/${PV}-build-fix-configure-disable-dtd-validation.patch" )
multilib_src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
$(use_enable doc documentation)
$(multilib_native_use_enable doc documentation)
$(multilib_native_enable dtd-validation)
)
if tc-is-cross-compiler ; then
myeconfargs+=( --with-host-scanner )
fi
if ! multilib_is_native_abi; then
myeconfargs+=( --disable-documentation )
fi
autotools-multilib_src_configure
autotools-utils_src_configure
}
src_test() {

@ -15,9 +15,11 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc"
DEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
RDEPEND="${DEPEND}"
RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]
dev-ml/camlp4:="
DEPEND="${RDEPEND}
dev-ml/ocamlbuild
"
src_configure() {
sh configure

@ -1 +1,2 @@
DIST camlp4-4.02.1_p3.tar.gz 646389 SHA256 c28058b20016dac51d492b1a98e6453d2c7097100542c99a0593cc240a3eeada SHA512 59d196be0bb7410ffd48a3d2debff4502ca58e7b032027b27b9d126381c02336f177a47585a7d7a3142049930c21dbe075068852e6369fe7e8a58e3339d96041 WHIRLPOOL bedcbaa86a1282bed6d51a64b1877575e727cbf2485abf38bcbed49b18cbad9e8548e0fb413daf216f3d78fde2710c95de49a5055cbb3548eb284515148a3e7d
DIST camlp4-4.03_p1.tar.gz 648030 SHA256 6eefeacced81cca59ddf90c2538505fd5cd6596a3fc1acf4971e9796c2e7f2ae SHA512 0a329e18deffebb5245415f822f91e692076fca4dbe38748f18e72f417ce7354faed744fdff25f9976659192cb02d56ceb2cf1be5c64da463413ec4a28a9d3ac WHIRLPOOL a9aa6ff12957025ab796b02eec2268d51f71ebd64d395b0b5cad2d9d8bde91da4129f4f6606514c0e1b9480cf2e648158b0bdd6878ee29c3adadee64937bc87d

@ -20,6 +20,8 @@ DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
RDEPEND="${DEPEND}
!<dev-lang/ocaml-4.02
!<dev-ml/findlib-1.5.5-r1"
DEPEND="${DEPEND}
|| ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )"
S=${WORKDIR}/${P/_p/-}

@ -0,0 +1,44 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MY_PV=${PV/_p/+}
MY_P=${PN}-${MY_PV}
DESCRIPTION="System for writing extensible parsers for programming languages"
HOMEPAGE="https://github.com/ocaml/camlp4"
SRC_URI="https://github.com/ocaml/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
DEPEND=">=dev-lang/ocaml-4.03_beta:=[ocamlopt?]"
RDEPEND="${DEPEND}
!<dev-lang/ocaml-4.02
!<dev-ml/findlib-1.5.5-r1"
DEPEND="${DEPEND}
|| ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )"
S=${WORKDIR}/${P/_p/-}
src_configure() {
./configure \
--bindir="${EPREFIX}/usr/bin" \
--libdir="$(ocamlc -where)" \
--pkgdir="$(ocamlc -where)" \
|| die
}
src_compile() {
emake byte
use ocamlopt && emake native
}
src_install() {
emake DESTDIR="${D}" install install-META
dodoc CHANGES.md README.md
}

@ -1,2 +1 @@
DIST cmdliner-0.9.7.tbz 50343 SHA256 9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a SHA512 ea1ee186f6072dc836e23a7fcc0756d016c61d4d34ef2416842d1e6e73707b2bbd6aaccd8f57472560dbeab75d3d26159ad8276813882726a11e4530dc6f45e6 WHIRLPOOL 79acdf4807cc5befad01fa1f22a214bc2c6a66dbba4b2b2c041ba72c0b2982d7ca61c632766bfe498987f61d6636a818fae1c96df1bf02e87073c9247b6babf0
DIST cmdliner-0.9.8.tbz 53249 SHA256 7dfaafdd88ec9d96abf8ded4c0ea7111948194400220a56e4bb44a1edfa4bd41 SHA512 6c71c360eaba7f7127e422a71a00a830a086f1d6750897bea0ebc1cc10f8fdaf9e9532d354abd84dbc6c5fcc1878f19d3f424fd9335e7226b625b63b51c89cab WHIRLPOOL 25739c09f78cc8ade6d0e5805f48eb14a6c42f0891832747caef44fc6135c81feaa0055b2874256bde2270753106c60accd50c24771333c2cb16913d9bd38c3d

@ -1,37 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit findlib
DESCRIPTION="Declarative definition of command line interfaces for OCaml"
HOMEPAGE="http://erratique.ch/software/cmdliner"
SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc +ocamlopt"
DEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
RDEPEND="${DEPEND}"
src_compile() {
ocaml pkg/build.ml \
native=$(usex ocamlopt true false) \
native-dynlink=$(usex ocamlopt true false) \
|| die
}
src_install() {
# Can't use opam-installer here as it is an opam dep...
findlib_src_preinst
local nativelibs=""
use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
ocamlfind install cmdliner _build/pkg/META \
_build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
dodoc README.md TODO.md CHANGES.md
use doc && dohtml -r doc/
}

@ -15,8 +15,9 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc +ocamlopt"
DEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
RDEPEND="${DEPEND}"
RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild"
src_compile() {
ocaml pkg/build.ml \

@ -17,7 +17,8 @@ KEYWORDS="~amd64"
IUSE="examples"
RDEPEND=">=dev-lang/ocaml-3.12:="
DEPEND="${RDEPEND}"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild"
src_install() {
findlib_src_preinst

@ -1,2 +1 @@
DIST cudf-0.7.tar.gz 54821 SHA256 92c8a9ed730bbac73f3513abab41127d966c9b9202ab2aaffcd02358c030a701 SHA512 6adf17c076c0308416f6f8bccb361d03645909f535e6cd0ba34860706e5f26628d33ab4f208fb8def28de1499649279febafd895bdde498f35a77e06128e64fa WHIRLPOOL 798ca87c1cc48d00e62a1e6d627fe6d35839fb16d6b2b10ba42f3eea29e3a48e2f5b070b93647a53833a471b1a6a665e759ab3b7cc2bda238d2dec4a8eb0866e
DIST cudf-0.8.tar.gz 55147 SHA256 06f8ce019c87893e27d545b5cf8dc38041657a4c4856c02be4e99e8175874229 SHA512 cea9e51094076089b1beb657f6b2ccc6ac5f49660e06743f8ec646b277beb4c830f90156ae240a6903de55d09caee78fb0dc75efd76ca65fd2b40ab8756301e3 WHIRLPOOL 2834b5a3d15bbbefc51cd5e54c1ee2155481cecbc91838fca94470b06750576c0719504e51e858145bdae657de739809007bb5b5958469d71010492f245651af

@ -1,65 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit multilib toolchain-funcs
DESCRIPTION="Library to parse, pretty print, and evaluate CUDF documents"
HOMEPAGE="http://www.mancoosi.org/cudf/"
SRC_URI="https://gforge.inria.fr/frs/download.php/file/33593/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="+ocamlopt test"
RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?]
dev-ml/extlib:=
dev-libs/glib:2
|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
"
DEPEND="${RDEPEND}
test? ( dev-ml/ounit )
dev-ml/findlib
dev-lang/perl
"
src_prepare() {
sed -i \
-e 's|make|$(MAKE)|g' \
Makefile || die
sed -i \
-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
c-lib/Makefile || die
sed -i \
-e 's|-lcurses|$(shell ${PKG_CONFIG} --libs ncurses glib-2.0)|g' \
c-lib/Makefile.variants || die
tc-export CC PKG_CONFIG
sed -i \
-e "s|-lncurses|$( $(tc-getPKG_CONFIG) --libs ncurses)|g" \
c-lib/cudf.pc.in || die
}
src_compile() {
emake -j1 all
emake c-lib
if use ocamlopt ; then
emake -j1 opt
emake c-lib-opt
fi
}
src_test() {
emake test
emake c-lib-test
}
src_install() {
emake DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)" install
dodoc BUGS ChangeLog README TODO
}

@ -19,11 +19,12 @@ RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?]
dev-ml/extlib:=
dev-libs/glib:2
|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
dev-ml/camlp4:=
"
DEPEND="${RDEPEND}
test? ( dev-ml/ounit )
dev-ml/findlib
dev-ml/ocamlbuild
dev-lang/perl
"

@ -32,6 +32,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
dev-ml/findlib
dev-ml/ocamlbuild
test? ( dev-python/pyyaml[libyaml] )
"
# missing test data

@ -1,2 +1 @@
DIST eliom-4.2.tar.gz 699337 SHA256 30d180b72d21177d09b311785e08e54cc221b148d969f17334f8be6eecfb783d SHA512 c7c75dc00defe0c269aba4e4fbdc00a824b781b124e3f51747e29533c4aeedaecb68c7ebcb38b4cc9a51c3796abdfa680ba0702a83415911406b25cd07ad66c7 WHIRLPOOL 2a36deeb10cbf3b29c76b33185de1c848615293830f7a3701c2d87025be0ed575cdadf238c696ad4716e50f2b0258febef7b7039a1980aafeaf6e1c483ec46ca
DIST eliom-5.0.0.tar.gz 728278 SHA256 6726500f9a54478def95875d04098dc8dc829d4a10e06896ff4f037bb1c03cbd SHA512 1c5297e376c3a46935de369b418638a772304246b73756f8bc052301b48d62a37af527274bf1a05064f33b60ff9dcde057a0030f083136fa4e1c0cfa07f01887 WHIRLPOOL ca1186787a8f938cf029f9a5c9904ed0324a3d24d2f0d0834dd1e2b2f995de6d57d1040b4d128de8233255ca385478f0ba3bf597c2f0315ab2f1894118755dca

@ -1,60 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib findlib
DESCRIPTION="A web framework to program client/server applications"
HOMEPAGE="http://ocsigen.org/eliom/"
SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="doc +ocamlopt"
RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
>=dev-ml/js_of_ocaml-2.5-r1:=
>=www-servers/ocsigenserver-2.5:=
>=dev-ml/tyxml-3.6:=
>=dev-ml/deriving-0.6:=
dev-ml/reactiveData:=
dev-ml/ocaml-ipaddr:=
dev-ml/react:=
dev-ml/ocaml-ssl:=
>=dev-ml/lwt-2.5.0:=
dev-ml/calendar:="
DEPEND="${RDEPEND}
dev-ml/opam"
src_prepare() {
epatch "${FILESDIR}/tyxml36.patch"
}
src_compile() {
if use ocamlopt ; then
emake all
else
emake byte
fi
use doc && emake doc
emake man
}
src_install() {
opam-installer \
--prefix="${ED}/usr" \
--libdir="${D}/$(ocamlc -where)" \
--docdir="${ED}/usr/share/doc/${PF}" \
--mandir="${ED}/usr/share/man" \
|| die
dodoc CHANGES README
if use doc ; then
docinto client/html
dodoc -r _build/src/lib/client/api.docdir/*
docinto server/html
dodoc -r _build/src/lib/server/api.docdir/*
fi
}

@ -28,6 +28,7 @@ RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?]
dev-ml/calendar:=
ppx? ( >=dev-ml/ppx_tools-0.99.3:= )"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild
dev-ml/opam"
src_compile() {

@ -1,125 +0,0 @@
Backported from:
commit e55552629e9affcaefbe9e0f36212fe3f385a780
Author: Vasilis Papavasileiou <git@vasilis.airpost.net>
Date: Thu Aug 6 13:23:29 2015 +0200
update for new-style TyXML wrapping
Index: eliom-4.2/src/lib/eliom_content.client.mli
===================================================================
--- eliom-4.2.orig/src/lib/eliom_content.client.mli
+++ eliom-4.2/src/lib/eliom_content.client.mli
@@ -74,7 +74,7 @@ module Svg : sig
(** Creation of reactive content *)
module R : sig
- module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
+ module Raw : Svg_sigs.Make(Eliom_content_core.Xml_wed).T
with type +'a elt = 'a elt
and type +'a attrib = 'a attrib
@@ -397,7 +397,7 @@ module Html5 : sig
val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
(** Cf. {% <<a_api project="tyxml" | module Html5_sigs.T >> %}. *)
- module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
+ module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T
with type +'a elt = 'a elt
and type +'a attrib = 'a attrib
Index: eliom-4.2/src/lib/eliom_content_core.client.ml
===================================================================
--- eliom-4.2.orig/src/lib/eliom_content_core.client.ml
+++ eliom-4.2/src/lib/eliom_content_core.client.ml
@@ -26,6 +26,7 @@ open Eliom_lib
module Xml = struct
include RawXML
+ module W = Xml_wrap.NoWrap
type 'a wrap = 'a
type 'a list_wrap = 'a list
type econtent =
@@ -163,8 +164,9 @@ end
module Xml_wed =
struct
- type 'a wrap = 'a Tyxml_js.Xml_wrap.t
- type 'a list_wrap = 'a Tyxml_js.Xml_wrap.tlist
+ module W = Tyxml_js.Xml_wrap
+ type 'a wrap = 'a W.t
+ type 'a list_wrap = 'a W.tlist
type uri = Xml.uri
let string_of_uri = Xml.string_of_uri
let uri_of_string = Xml.uri_of_string
@@ -250,7 +252,7 @@ module Svg = struct
end
module R = struct
- module Raw = Svg_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)
+ module Raw = Svg_f.Make(Xml_wed)
include Raw
end
@@ -322,7 +324,7 @@ module Html5 = struct
let node s = Xml.make_react s
- module Raw = Html5_f.MakeWrapped(Tyxml_js.Xml_wrap)(Xml_wed)(Svg.R)
+ module Raw = Html5_f.Make(Xml_wed)(Svg.R)
let filter_attrib (name,a) on =
let v = match a with
| Xml.RA a -> Xml.RAReact (React.S.map (function
Index: eliom-4.2/src/lib/eliom_content_core.client.mli
===================================================================
--- eliom-4.2.orig/src/lib/eliom_content_core.client.mli
+++ eliom-4.2/src/lib/eliom_content_core.client.mli
@@ -22,6 +22,8 @@
module Xml : sig
+ module W : Xml_wrap.T with type 'a t = 'a and type 'a tlist = 'a list
+
type uri = string
val uri_of_string : uri -> string
val string_of_uri : string -> uri
@@ -147,6 +149,8 @@ module Xml : sig
val set_classes_of_elt : elt -> elt
end
+module Xml_wed : Xml_sigs.T with module W = Tyxml_js.Xml_wrap
+
(** Building SVG tree. *)
module Svg : sig
@@ -197,7 +201,7 @@ module Svg : sig
(** Typed interface for building valid reactive SVG tree. *)
module R : sig
- module Raw : Svg_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml).T
+ module Raw : Svg_sigs.Make(Xml_wed).T
with type +'a elt = 'a elt
and type +'a attrib = 'a attrib
@@ -298,7 +302,7 @@ module Html5 : sig
val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib
- module Raw : Html5_sigs.MakeWrapped(Tyxml_js.Xml_wrap)(Xml)(Svg.R.Raw).T
+ module Raw : Html5_sigs.Make(Xml_wed)(Svg.R.Raw).T
with type +'a elt = 'a elt
and type +'a attrib = 'a attrib
Index: eliom-4.2/src/lib/eliom_content_core.server.ml
===================================================================
--- eliom-4.2.orig/src/lib/eliom_content_core.server.ml
+++ eliom-4.2/src/lib/eliom_content_core.server.ml
@@ -28,6 +28,7 @@ open Eliom_lib
module Xml = struct
include RawXML
+ module W = Xml_wrap.NoWrap
type 'a wrap = 'a
type 'a list_wrap = 'a list

@ -1,4 +1,3 @@
DIST findlib-1.4.tar.gz 231526 SHA256 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 SHA512 7ee5bee74f6fc14c8d85496e673d42b63e056d35a724fe4f78fd1010a5af4506a9a962c0403fd96d5bf51f2278bfbe98a60aad65a171803cbde935cc3889157b WHIRLPOOL 31f1d0b9f1605a9a536ae996fb4abe5e1d5c47012759cb7bb45185d58a81e827d80285628b113f79d51b8b260cdff181c3eb05596adeea9a87070994058fce17
DIST findlib-1.5.5.tar.gz 240247 SHA256 aafaba4f7453c38347ff5269c6fd4f4c243ae2bceeeb5e10b9dab89329905946 SHA512 051817ae897a53b705ad641ae7e9010474f2320d3cc7cfd15edc9345f50566932cb44bf6f45772260706b5f9e9e91194802600c770c9c96f772985678db7209d WHIRLPOOL f1ad9b77c1f38f6d733f2a17c14649d4ca9f05215b5fa8124e71dc3e05b229c34af10415471d56964384c1fe0b0b0db453638d7e1238af916e5ff854b931cd76
DIST findlib-1.5.6.tar.gz 250865 SHA256 7743b3dcaf8a344c882e89f61601f7f086d46c0f2ea4fcc3e54069236825e3f8 SHA512 18d23861a25b1508cb419af4cdd6e3cd83d51bef259f162c86b91460cf3dad75d6c2fc11173f60fe36b61ce3f81b78e69344f093adb9a82c36256d95180e93d8 WHIRLPOOL eb374e60c3f2fcc6172ec08803fbc5b0e83ea0d38644b4c13cb3d27b3dc13c7240a4f49a9ee51f9465ac6ff6075140c3e98b3eb0ea48690f260f139f37dfb63c
DIST findlib-1.6.1.tar.gz 254797 SHA256 411c816e89d17d1b5b454e3d42f9b261cf929fc468f9f6e2787273ab69784b09 SHA512 b781d117ff033e8b91b6610c562382c5868a25ceed51f0a5947a77bfdd5825723ad32adcbe1636d4f7952d4c7535093f5c8ad3b954bebb1dcf4738f7a16d3ef8 WHIRLPOOL 1c3ed89aeb53cd95c0eaa82f1df8c364ad79403cf89ca19245620819998353da089daf5d3377919f2b4676c48f4d926d384e5a80312884f84e1efc41307f88fd

@ -0,0 +1,16 @@
Avoid installing META files for labltk, camlp4 and ocamlbuild: Those are provided by their
respective packages now.
Index: findlib-1.5.5/configure
===================================================================
--- findlib-1.5.5.orig/configure
+++ findlib-1.5.5/configure
@@ -515,7 +515,7 @@ fi
# Generate the META files now.
-l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $llabltk $lcamlp4 $lobuild $lcomplibs $lbytes"
+l="$ldbm dynlink graphics num num-top str threads unix stdlib bigarray $lcomplibs $lbytes"
for dir in site-lib-src/*; do
# We do not really know if $dir is a directory.

@ -1,70 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit multilib
DESCRIPTION="OCaml tool to find/use non-standard packages"
HOMEPAGE="http://projects.camlcity.org/projects/findlib.html"
SRC_URI="http://download.camlcity.org/download/${P}.tar.gz"
IUSE="doc +ocamlopt tk"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?,tk?]"
RDEPEND="${DEPEND}"
ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
stublibs="${ocamlfind_destdir}/stublibs"
src_configure() {
local myconf
use tk && myconf="-with-toolbox"
./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \
-sitelib ${ocamlfind_destdir} \
-config ${ocamlfind_destdir}/findlib/findlib.conf \
-no-custom \
${myconf} || die "configure failed"
}
src_compile() {
emake -j1 all
if use ocamlopt; then
emake -j1 opt # optimized code
fi
}
src_install() {
emake prefix="${D}" install
dodir "${stublibs#${EPREFIX}}"
cd "${S}/doc"
dodoc QUICKSTART README DOCINFO
use doc && dohtml -r ref-html guide-html
}
check_stublibs() {
local ocaml_stdlib=`ocamlc -where`
local ldconf="${ocaml_stdlib}/ld.conf"
if [ ! -e ${ldconf} ]
then
echo "${ocaml_stdlib}" > ${ldconf}
echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
fi
if [ -z `grep -e ${stublibs} ${ldconf}` ]
then
echo ${stublibs} >> ${ldconf}
fi
}
pkg_postinst() {
check_stublibs
}

@ -24,7 +24,8 @@ ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
stublibs="${ocamlfind_destdir}/stublibs"
src_prepare() {
epatch "${FILESDIR}/externalmeta.patch"
epatch "${FILESDIR}/externalmeta2.patch" \
"${FILESDIR}/quoting.patch"
}
src_configure() {

@ -1,2 +1 @@
DIST js_of_ocaml-2.6.tar.gz 1291882 SHA256 c1f066d09524c6be2d40cfb387de49b337837dcc8f2f746a207f37706ca66460 SHA512 2c4e294b7946757d9b05ec640e130cbee6a0130c03eb3a2188988fb956c1f0e2738c32e97abc461e748e667e7d31e386c5470942df84ddbcf5903d41b133e8c8 WHIRLPOOL abf477caa49edc65b5e577a90dd86641f12b6757e6f2c9034fe08d51cc1ac11209b73e8fdd88de420ed0277d8715bb085c10d29b237854cdebb8a9e36f8e22fe
DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b WHIRLPOOL 278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4

@ -1,30 +0,0 @@
commit f11959da5a630a7dca47497c9543231d9698b406
Author: Vasilis Papavasileiou <git@vasilis.airpost.net>
Date: Fri Aug 7 11:16:20 2015 +0200
Tyxml_js: ft constructor in Xml_wrap (forward-compatibility)
diff --git a/lib/tyxml/tyxml_js.ml b/lib/tyxml/tyxml_js.ml
index 4799600..cdf7cd2 100644
--- a/lib/tyxml/tyxml_js.ml
+++ b/lib/tyxml/tyxml_js.ml
@@ -164,6 +164,7 @@ module Html5 = Html5_f.Make(Xml)(Svg)
module Xml_wrap = struct
type 'a t = 'a React.signal
type 'a tlist = 'a ReactiveData.RList.t
+ type ('a, 'b) ft = 'a -> 'b
let return = React.S.const
let fmap f = React.S.map f
let nil () = ReactiveData.RList.nil
diff --git a/lib/tyxml/tyxml_js.mli b/lib/tyxml/tyxml_js.mli
index 8cb33c5..db2183e 100644
--- a/lib/tyxml/tyxml_js.mli
+++ b/lib/tyxml/tyxml_js.mli
@@ -50,6 +50,7 @@ module Xml : XML with module W = Xml_wrap.NoWrap
module Xml_wrap : Xml_wrap.T
with type 'a t = 'a React.signal
and type 'a tlist = 'a ReactiveData.RList.t
+ and type ('a, 'b) ft = 'a -> 'b
module Util : sig
val update_children : Dom.node Js.t -> Dom.node Js.t ReactiveData.RList.t -> unit

@ -1,158 +0,0 @@
commit ebf7150f41c64ac0e18e9f89d1e565b6c3115414
Author: Vasilis Papavasileiou <git@vasilis.airpost.net>
Date: Thu Aug 6 11:52:11 2015 +0200
up-to-date version of @drup's new-style wrapping (ocsigen/tyxml#58)
diff --git a/lib/tyxml/tyxml_js.ml b/lib/tyxml/tyxml_js.ml
index 0143219..4799600 100644
--- a/lib/tyxml/tyxml_js.ml
+++ b/lib/tyxml/tyxml_js.ml
@@ -20,8 +20,19 @@
let js_string_of_float f = (Js.number_of_float f)##toString()
let js_string_of_int i = (Js.number_of_float (float_of_int i))##toString()
+
+module type XML =
+ Xml_sigs.T
+ with type uri = string
+ and type event_handler = Dom_html.event Js.t -> bool
+ and type mouse_event_handler = Dom_html.mouseEvent Js.t -> bool
+ and type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> bool
+ and type elt = Dom.node Js.t
+
+
module Xml = struct
+ module W = Xml_wrap.NoWrap
type 'a wrap = 'a
type 'a list_wrap = 'a list
@@ -162,7 +173,6 @@ module Xml_wrap = struct
let append x y = ReactiveData.RList.concat x y
end
-
module Util = struct
open ReactiveData
open RList
@@ -226,9 +236,23 @@ end
module R = struct
- module Xml_wed = struct
- type 'a wrap = 'a Xml_wrap.t
- type 'a list_wrap = 'a Xml_wrap.tlist
+
+ let filter_attrib (name,a) on =
+ match a with
+ | Xml.Event _ ->
+ raise (Invalid_argument "filter_attrib not implemented for event handler")
+ | Xml.Attr a ->
+ name,
+ Xml.Attr
+ (React.S.l2
+ (fun on a -> if on then a else None) on a)
+
+ let attach_attribs = Xml.attach_attribs
+
+ module Xml = struct
+ module W = Xml_wrap
+ type 'a wrap = 'a W.t
+ type 'a list_wrap = 'a W.tlist
type uri = Xml.uri
let string_of_uri = Xml.string_of_uri
let uri_of_string = Xml.uri_of_string
@@ -239,7 +263,7 @@ module R = struct
type attrib = Xml.attrib
let attr name f s =
- let a = Xml_wrap.fmap f s in
+ let a = W.fmap f s in
name,Xml.Attr a
let float_attrib name s = attr name (fun f -> Some (js_string_of_float f)) s
@@ -267,7 +291,7 @@ module R = struct
let leaf = Xml.leaf
let node ?(a=[]) name l =
let e = Dom_html.document##createElement(Js.string name) in
- Xml.attach_attribs e a;
+ attach_attribs e a;
Util.update_children (e :> Dom.node Js.t) l;
(e :> Dom.node Js.t)
let cdata = Xml.cdata
@@ -275,30 +299,22 @@ module R = struct
let cdata_style = Xml.cdata_style
end
- module Xml_wed_svg = struct
- include Xml_wed
+ module Xml_Svg = struct
+ include Xml
let leaf = Xml_Svg.leaf
let node ?(a = []) name l =
let e =
Dom_html.document##createElementNS(Dom_svg.xmlns,Js.string name) in
- Xml.attach_attribs e a;
+ attach_attribs e a;
Util.update_children (e :> Dom.node Js.t) l;
(e :> Dom.node Js.t)
end
- module Svg = Svg_f.MakeWrapped(Xml_wrap)(Xml_wed_svg)
- module Html5 = Html5_f.MakeWrapped(Xml_wrap)(Xml_wed)(Svg)
- let filter_attrib (name,a) on =
- match a with
- | Xml.Event _ ->
- raise (Invalid_argument "filter_attrib not implemented for event handler")
- | Xml.Attr a ->
- name,
- Xml.Attr
- (React.S.l2
- (fun on a -> if on then a else None) on a)
+ module Svg = Svg_f.Make(Xml_Svg)
+ module Html5 = Html5_f.Make(Xml)(Svg)
+
end
module To_dom = Tyxml_cast.MakeTo(struct
diff --git a/lib/tyxml/tyxml_js.mli b/lib/tyxml/tyxml_js.mli
index b3323cc..8cb33c5 100644
--- a/lib/tyxml/tyxml_js.mli
+++ b/lib/tyxml/tyxml_js.mli
@@ -37,13 +37,16 @@
@see <https://ocsigen.org/tyxml/dev/api/Html5_sigs.T> Html5_sigs.T to have a list of available functions to build HTML.
*)
-module Xml : Xml_sigs.T
+module type XML =
+ Xml_sigs.T
with type uri = string
and type event_handler = Dom_html.event Js.t -> bool
and type mouse_event_handler = Dom_html.mouseEvent Js.t -> bool
and type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> bool
and type elt = Dom.node Js.t
+module Xml : XML with module W = Xml_wrap.NoWrap
+
module Xml_wrap : Xml_wrap.T
with type 'a t = 'a React.signal
and type 'a tlist = 'a ReactiveData.RList.t
@@ -57,10 +60,13 @@ module Svg : Svg_sigs.Make(Xml).T
module Html5 : Html5_sigs.Make(Xml)(Svg).T
module R : sig
- module Svg : Svg_sigs.MakeWrapped(Xml_wrap)(Xml).T
+ module Xml : XML with module W = Xml_wrap
+
+ module Svg : Svg_sigs.Make(Xml).T
with type +'a elt = 'a Svg.elt
and type +'a attrib = 'a Svg.attrib
- module Html5 : Html5_sigs.MakeWrapped(Xml_wrap)(Xml)(Svg).T
+
+ module Html5 : Html5_sigs.Make(Xml)(Svg).T
with type +'a elt = 'a Html5.elt
and type +'a attrib = 'a Html5.attrib
val filter_attrib : 'a Html5.attrib -> bool React.signal -> 'a Html5.attrib

@ -1,52 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit findlib eutils
DESCRIPTION="A compiler from OCaml bytecode to javascript"
HOMEPAGE="http://ocsigen.org/js_of_ocaml/"
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="+ocamlopt doc +deriving"
DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
>=dev-ml/lwt-2.4.4:=
dev-ml/react:=
dev-ml/reactiveData:=
>=dev-ml/tyxml-3.6:=
dev-ml/cmdliner:=
dev-ml/menhir:=
dev-ml/ocaml-base64:=
dev-ml/camlp4:=
dev-ml/cppo:=
deriving? ( >=dev-ml/deriving-0.6:= )"
RDEPEND="${DEPEND}"
src_prepare() {
epatch \
"${FILESDIR}/tyxml36.patch" \
"${FILESDIR}/tyxml36-2.patch"
}
src_configure() {
use ocamlopt || echo "BEST := byte" >> Makefile.conf
use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
}
src_compile() {
emake
use doc && emake doc
}
src_install() {
findlib_src_preinst
emake BINDIR="${ED}/usr/bin/" install
dodoc CHANGES README.md
use doc && dohtml -r doc/api/html/
}

@ -15,7 +15,7 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
DEPEND="
RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=
react? ( dev-ml/react:= dev-ml/reactiveData:= )
@ -28,7 +28,8 @@ DEPEND="
dev-ml/camlp4:=
dev-ml/cppo:=
deriving? ( >=dev-ml/deriving-0.6:= )"
RDEPEND="${DEPEND}"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild"
src_configure() {
printf "\n\n" >> Makefile.conf

@ -15,8 +15,9 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE=""
DEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]"
RDEPEND="${DEPEND}"
RDEPEND=">=dev-lang/ocaml-3.11:=[ocamlopt]"
DEPEND="${RDEPEND}
|| ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )"
src_configure() {
chmod +x configure

@ -0,0 +1,13 @@
Index: menhir-20151112/src/Makefile
===================================================================
--- menhir-20151112.orig/src/Makefile
+++ menhir-20151112/src/Makefile
@@ -19,7 +19,7 @@ endif
# ----------------------------------------------------------------------------
# Ocamlbuild tool and settings.
-OCAMLBUILD := ocamlbuild -classic-display -j 0 -cflags "-safe-string -bin-annot"
+OCAMLBUILD := ocamlbuild -no-hygiene -classic-display -j 0 -cflags "-safe-string -bin-annot"
# ----------------------------------------------------------------------------
# For everyday development.

@ -4,7 +4,7 @@
EAPI=5
inherit findlib
inherit findlib eutils
DESCRIPTION="LR(1) parser generator for the OCaml language"
HOMEPAGE="http://gallium.inria.fr/~fpottier/menhir/"
@ -15,8 +15,13 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="examples +ocamlopt"
DEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
RDEPEND="${DEPEND}"
RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild"
src_prepare() {
epatch "${FILESDIR}/ocamlbuild.patch"
}
src_configure() {
if ! use ocamlopt ; then

@ -19,7 +19,8 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE=""
RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:="
RDEPEND=">=dev-ml/ocaml-data-notation-0.0.11:=
dev-ml/ocamlbuild:=[ocamlopt]"
DEPEND="${RDEPEND}
>=dev-ml/findlib-1.3.1
dev-ml/ocamlify

@ -0,0 +1 @@
DIST ocamlbuild-0.9.1.tar.gz 160896 SHA256 7a31fde2d863768372851665e3ce64064c35e38d2b2f3cbd060a6df426f16ee8 SHA512 07da313f896fd31fab42881515f33544a587f831aa0928540af2351bf8d59b14115a144b17d156cb2599ce5d568684192a922f9f85f86ddd7299b8e194fd85c6 WHIRLPOOL f28e3ce19371dc26d6992035e47a72cb82adde2869dd5188a8ea0ed6aee481633e0ada4ec28428a2f58e51582f60c3a486066d0f7e09dda4e8c374f977f420a8

@ -0,0 +1,13 @@
Index: ocamlbuild-0.9.1/Makefile
===================================================================
--- ocamlbuild-0.9.1.orig/Makefile
+++ ocamlbuild-0.9.1/Makefile
@@ -202,7 +202,7 @@ beforedepend:: src/ocamlbuild_config.ml
install-bin-byte:
mkdir -p $(INSTALL_BINDIR)
$(CP) ocamlbuild.byte $(INSTALL_BINDIR)/ocamlbuild.byte$(EXE)
-ifeq ($(OCAML_NATIVE), true)
+ifneq ($(OCAML_NATIVE), true)
$(CP) ocamlbuild.byte $(INSTALL_BINDIR)/ocamlbuild$(EXE)
endif

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,38 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils
DESCRIPTION="OCamlbuild"
HOMEPAGE="https://github.com/ocaml/ocamlbuild"
SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="+ocamlopt"
DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}/installbin.patch"
}
src_configure() {
emake -f configure.make Makefile.config \
PREFIX="${EPREFIX}/usr" \
BINDIR="${EPREFIX}/usr/bin" \
LIBDIR="$(ocamlc -where)" \
OCAML_NATIVE=$(usex ocamlopt true false) \
OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
NATDYNLINK=$(usex ocamlopt true false)
}
src_install() {
emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
dodoc Changes
}

@ -1,2 +1 @@
DIST parmap-1.0_rc6.tar.gz 97083 SHA256 25e2eeb2ec8b1dedc8067443ddcddf4ab0ff2e3821da888338146af69e8fd9e6 SHA512 5378a8ce03d3a4d139d06093bd29fa83eca13b6e74be14d379337c9a08ebac39b23920925375c753c63c7f62970f7f899a9d6cbf8a5001b262293cf52e9ea5c1 WHIRLPOOL 28c11c3ef9d4b0fb56fde988dc62e2993a313445005b657838cad41e9768a13a65535d69d81cac792bc8a95038521fe130488e25dcf87ef25d61d9533fea6729
DIST parmap-1.0_rc7.tar.gz 97799 SHA256 b993d47b8b8e5342839b851b46aba52264b4f8c527db08f3124ed7a7de7e1912 SHA512 50ac96f0f8b835298958f1a8ca65a2e488eab9c86f5fd57b43d5cd8145c71594a537add568dbe8f471d41157701769e35d0e992b07b430252623b72d7488d562 WHIRLPOOL 54842d45a7495316f42ae63de08db88512adddc1ee743a70de5a899d4c35e7a2e062bfc6f9456c65a32d2279784eb291f0299fd9b785e59e3607dec193f7f01d

@ -1,16 +0,0 @@
Author: Rémi Cardona
https://bugs.gentoo.org/show_bug.cgi?id=553596
https://github.com/rdicosmo/parmap/pull/36
--- configure.ac 2015-07-03 23:59:19.361723234 +0200
+++ configure.ac 2015-07-03 23:59:48.161216749 +0200
@@ -27,7 +27,7 @@
AC_CONFIG_HEADERS([config.h])
-t=`$OCAMLBUILD -use-ocamlfind &> /dev/null; echo $?`
-if test $t == 0 ; then
+t=`$OCAMLBUILD -use-ocamlfind > /dev/null 2>&1 ; echo $?`
+if test "$t" = 0 ; then
AC_MSG_RESULT(ocaml version $OCAMLVERSION. Use standard Makefile)
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

@ -1,51 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit multilib eutils autotools
MY_PV="${PV/_/-}"
DESCRIPTION="Library allowing to exploit multicore architectures for OCaml programs with minimal modifications"
HOMEPAGE="http://www.dicosmo.org/code/parmap/"
SRC_URI="https://github.com/rdicosmo/parmap/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
IUSE="+ocamlopt"
RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
DEPEND="${RDEPEND}
dev-ml/findlib
dev-ml/ocaml-autoconf"
S="${WORKDIR}/${PN}-${MY_PV}"
src_prepare() {
epatch "${FILESDIR}/${P}-fix-bashisms.patch"
eautoreconf
}
src_test() {
mkdir "${WORKDIR}/tmpinstall" || die
emake \
OCAMLLIBDIR="ocaml" \
DESTDIR="${WORKDIR}/tmpinstall" \
install
export OCAMLPATH="${WORKDIR}/tmpinstall/ocaml"
emake tests
cd _build/tests || die
for i in $(find . -type f -executable) ; do
${i} || die
done
}
src_install() {
emake \
OCAMLLIBDIR="$(get_libdir)/ocaml" \
MANDIR="${ED}/usr/share/man/man3o" \
DESTDIR="${ED}/usr" \
install
dodoc AUTHORS ChangeLog README
}

@ -19,6 +19,7 @@ IUSE="+ocamlopt"
RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]"
DEPEND="${RDEPEND}
dev-ml/findlib
dev-ml/ocamlbuild
dev-ml/ocaml-autoconf"
S="${WORKDIR}/${PN}-${MY_PV}"

@ -17,8 +17,8 @@ IUSE=""
DEPEND="dev-ml/ppx_tools:=
dev-ml/ppx_core:=
dev-ml/ocamlbuild:=[ocamlopt?]
dev-ml/ppx_optcomp:="
RDEPEND="${DEPEND}"
DEPEND="${DEPEND} dev-ml/opam"

@ -1,2 +1 @@
DIST reactiveData-0.1.tar.gz 17074 SHA256 fc755843daaf3bdf1190d9fbfb63e760d4a0378dea2ae4da7b371b696c4cde14 SHA512 4c1d000d7c8713d365473e924ad22cc285a0d30009e4f3a4c23cb2fed9678209860cbfe9787b4aef24c9d1fe3b8bf2f71609e45bd52abdff5e27adc3afa651c0 WHIRLPOOL 4d9de7aca80f7ed6c1f83247170eec7289da9af2030f462a7a5bfe153d532621c1d1ec38dfd4237654da43694bd5972e55a44224513125117b2e7e24d725a95b
DIST reactiveData-0.2.tar.gz 21063 SHA256 d80d425d2746ffc7bd1b88e9528b8236a5ca13cca636662dee1a59e96d675367 SHA512 ed6c82b499f7a740dcf3c39825dd9a98b73ab32d15159e372253a2ca9c8406301cd569654d02f5be2530b491b101587bb628984b0b6f1ce1cc21aab010e518cf WHIRLPOOL 819a6d999d84056967c34c9e451655b86840d30bf88903eb1a55bff41dbf552c6bac9dfa61b2d1a6c76c7806f6f61e307b27f382fc66ee7f380c2da5a4f72817

@ -1,37 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
DESCRIPTION="Functional reactive programming with incremental changes in data structures"
HOMEPAGE="https://github.com/hhugo/reactiveData"
SRC_URI="https://github.com/hhugo/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1-with-linking-exception"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="+ocamlopt"
RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
dev-ml/react:="
DEPEND="${RDEPEND}
dev-ml/findlib
dev-ml/opam
"
src_compile() {
ocaml pkg/build.ml \
native=$(usex ocamlopt true false) \
native-dynlink=$(usex ocamlopt true false) \
|| die
}
src_install() {
opam-installer \
--prefix="${ED}/usr" \
--libdir="${D}/$(ocamlc -where)" \
--docdir="${ED}/usr/share/doc/${PF}" \
|| die
dodoc README.md
}

@ -18,6 +18,7 @@ RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
DEPEND="${RDEPEND}
dev-ml/findlib
dev-ml/opam
dev-ml/ocamlbuild
"
src_compile() {

@ -15,9 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="amd64 ppc x86"
IUSE="+ocamlopt"
DEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
RDEPEND="${DEPEND}"
RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
dev-ml/camlp4:="
DEPEND="${RDEPEND}
|| ( dev-ml/ocamlbuild <dev-lang/ocaml-4.02.3-r1 )"
src_compile() {
emake all

@ -18,6 +18,7 @@ IUSE="doc utftrip +ocamlopt test"
RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
utftrip? ( dev-ml/cmdliner:= )"
DEPEND="${RDEPEND}
dev-ml/ocamlbuild
test? ( dev-ml/cmdliner )"
src_compile() {

@ -0,0 +1,30 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=DMAKI
DIST_VERSION=0.00012
inherit perl-module
DESCRIPTION="Crypt::DH Using GMP Directly"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
>=virtual/perl-XSLoader-0.20.0
>=dev-libs/gmp-4.0.0:0
"
DEPEND="${RDEPEND}
>=dev-perl/Devel-CheckLib-0.400.0
>=virtual/perl-Devel-PPPort-3.190.0
>=virtual/perl-ExtUtils-MakeMaker-6.590.0
>=virtual/perl-ExtUtils-ParseXS-3.180.0
test? (
dev-perl/Test-Requires
virtual/perl-Test-Simple
)
"

@ -0,0 +1 @@
DIST Crypt-DH-GMP-0.00012.tar.gz 34421 SHA256 51e7a47ae594cf55f66c0762f669215486e7d8b3460bdadfe79350ccf26daf38 SHA512 f799017db780613b6d971f626659765f282debe63207bdbc36db223030bcd8f7f478c6331372d9794bcc8207d71bfae6d62048439766916478f4b61f42c5bb6e WHIRLPOOL d3bd49dd04ad1ee73c3facbb8cccc32d13680b383711208e257c0a5919816378ae137945eb9d43c87105d60e96322e6c2744ffa40c695a0db0515d4f7a7580fd

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>perl@gentoo.org</email>
<name>Gentoo Perl Project</name>
</maintainer>
<upstream>
<remote-id type="cpan">Crypt-DH-GMP</remote-id>
<remote-id type="cpan-module">Crypt::DH::GMP</remote-id>
<remote-id type="cpan-module">Crypt::DH::GMP::Compat</remote-id>
</upstream>
</pkgmetadata>

@ -1,23 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_AUTHOR=MLEHMANN
MODULE_VERSION=4.32
inherit perl-module
DESCRIPTION="Asynchronous Input/Output"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
RDEPEND="dev-perl/common-sense"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
# Tests trigger stack overflow in sandbox code, see bug 553918
SRC_TEST=skip

@ -1,3 +1,2 @@
DIST IO-AIO-4.31.tar.gz 149718 SHA256 b68582588e2c89035cad19c1b0ee84d331ee801f0b4fb521ec23aa1e1010a09e SHA512 f1e564595201ba46506d9aea4f8e54d8aae55b8b018ad8fddcd3eeba3b3a5f6814df21f5dee68a3a30cee7509de22a4440afcec73d6df15d20f44ef5e5496a27 WHIRLPOOL 6a265606d4609b67812382bbcf1f804ba1477634bdec198770245015ff854e3fd48b37967cc2c5563db85a4f316319dd23a93db08bdcb1d932013fd603942291
DIST IO-AIO-4.32.tar.gz 150475 SHA256 1cee61f494a6390c43e5768818d80e3aee65151df4a1fdda16ca52e6260e2f75 SHA512 fd0e4e047f5e2ba735758fb8ab32608c4a2dc1c2e9e6498484e2fc6bbf2357bc53ec0054f79c15f61b0e310ad0764ef0abfb1f5c6e7c81ba720faec479b371d7 WHIRLPOOL 5360ba49284c470d0311f68389f3459e3abc623ec2afb8015f1115ee93bd25fbb718b768614aa2b85f712858a6428da0211d3651906fdf8220e2f0e8c7d3440d
DIST IO-AIO-4.33.tar.gz 154120 SHA256 7590320a1c47bcf0b7daf37a756c61501de71f001e50cf74338610d418f66bb0 SHA512 9d59d9ad511bb07178ed760a0387357ade961f9b0e73cdc64861fa3b5674fb4cdb07b44a0c0810cc364909c1bc4fb012c2975269c1e3035cd37ba21a8a029df9 WHIRLPOOL f2ee84da781fae31df183c0c94bf586601306b3b32d97d98cfdc90d5f7a077232a4962d08ce8589a5b3e2b4fef833cf88bf1422c2bb6f8bf35caeee55dc2a1ae

@ -1,2 +1 @@
DIST IO-HTML-1.00.tar.gz 18759 SHA256 04e29fd5f2535e35a9d478f2775471d79e2da6a3cf2bd33befb2dcd7811ad21a SHA512 26c718457d8bcf05f9f6b1e7f6da48557c0288cf0a63f7fcb5e6f022bc5c2f317c46056d7b07eedced252ff434a869b6b781a14344a1c60b3696acabd10dcc4b WHIRLPOOL 60014b779756a594b6c41dd41e4c538e0a2e604461e8e781b5ab5b7fdee0346db56a7b65be3fb54ef16ac366a49b7e4d932745a78e53c2eaaebdaa176dc9e0c3
DIST IO-HTML-1.001.tar.gz 19375 SHA256 ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0 SHA512 fd3780c854e2e4003c80d2399987bbde2ebcc8f110915a74326660036d0860f79123f924c3200bcfa163363d74f53ca742bde973549e5a554e63648ed55dac52 WHIRLPOOL 1437e29aa020e8c612e29ad366392e36857b781ed017c3d329da552a4f3f8286737b14971098d70788e8cd694c8cae45cf412e08ab6e5f2787280d1f4752755d

@ -1,22 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=BDFOY
inherit perl-module
DESCRIPTION="Utilities for interactive I/O"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
virtual/perl-version
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
test? ( virtual/perl-Test-Simple )
"

@ -1,2 +1 @@
DIST IO-Interactive-0.0.6.tar.gz 6487 SHA256 9cc016cbd94b500027e137cb5070d19487e4431bf822f0cb534c38b6b2c1038c SHA512 beee3f3c9c6ad9c9ca34e313a36312a62520c98914c9c405beacee1c2b3bf05ad2b2fe5a53b43abff8dec1dcbccada4718dd8b7b31a98755d96a6ef0f9863863 WHIRLPOOL 6ff16ee09485007d022c5d1a5a9c28ac72bd4540535f37d5093d9dfdde30bc15aa26f50832e1a2ea11a9014c6d553b7ad0322172bb2205f9492bd590ac6c60c7
DIST IO-Interactive-1.021.tar.gz 11751 SHA256 915bd642142649e23f0078341b2c095061c8b6dfa43050ff90f92d3d916234c0 SHA512 16307148e762b6c382dcecef653eab581563fefabd5289d7f3f66a439d17fb496982e24f7e74494f5710749eb11654d366001e016bf50b2e43b1dca7564c24ae WHIRLPOOL d1817af8e69f770cac743eacf7faafc10a94a5b38b687cbb11db0071f305f907a9874230043213259138b79b2cadc1af5545145785c92c7c89fb888d04d1cb08

@ -1,33 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
MODULE_A_EXT=tgz
MODULE_AUTHOR=JPIERCE
MODULE_VERSION=0.34
inherit perl-module
DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="
virtual/perl-File-Spec
dev-perl/File-Which
virtual/perl-IO
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-MakeMaker
"
SRC_TEST="do parallel"
src_prepare() {
rm t.pl || die
sed -i '/^t.pl/d' MANIFEST || die
perl-module_src_prepare
}

@ -1,3 +1,2 @@
DIST IO-Pager-0.31.tgz 15406 SHA256 e5a61ecae2e81f1349293e2246543da42e8ff61c23bf773e87db561f2e83b939 SHA512 c6e66fc59b951d041d19b3bb57c73860e601732e24c4d3e78e84f6532089b511fc11d071aef21c2f46344813479b592c5ead4438aec47dba487e94ae3452b6a3 WHIRLPOOL 8b798f54e4d730e442eee8016b49f21a2255d66dd0085e69bafe83560831b7eb3aa8e2081f33c8b04bb6c108890e98f702f204ca09733f17f5982bdec4377157
DIST IO-Pager-0.34.tgz 17100 SHA256 31569ca0af93139e3ca7ce8aae38992930df95b047cffec2db165befca3ce00b SHA512 ee1145d40cb2b851fd2531c6d5d3e88e9c3d2a79303e682f3ce4bfb7a629293a3983a895026baf678ce5053ed09bfcc2b8dba3cdc816acc38f0b1473ab44897e WHIRLPOOL e2f52d454cd13e545057b57a46dc3e13a908cc61112552c4e0c420c2048b396a50d3dfa4274e6bf99a7c76d7ed99fa4a7bc2296b504fe04e2c67446fd25beccd
DIST IO-Pager-0.35.tgz 17298 SHA256 3aa529089be7a93014cd03ebf469271d6d333eae2d34e3bfd127826a38aa8d45 SHA512 adfb9e7d65941115f3d6376996c3c41682079a02346e1cddda0df2bfa93d46a0deeea42a0109697dd327e19ebf9ed869adc2827f0ea9acf28c69885afa6cd962 WHIRLPOOL 531ee9fc77d95bbe5df7c6ddddd52aed455446cc21ac3fbf419d971d01641bf19859e08560b5e7eb616ef87a528e565fae726d51e750be806900f02704ddbe74

@ -1 +1,2 @@
DIST Net-HTTP-6.06.tar.gz 15609 SHA256 1d4e3ced899efad12431564d93abe73dd2a1224aa208af5f4ab829e7a2dd39d4 SHA512 fefa06eb960b354ec5f760b720d2d7e29820fbc5aad8fd0dbc8a63ec6a7cda0000b8449cce83e38d2f4bf03bf8aa0aa19351c7f5508cb435bb9b938b34ab9e53 WHIRLPOOL 4c2ff0ed5b4fb1299b5928a8dc868fac894fa9992d4e1fa6dc0624e0ebaee4edb28cd58f817696462fa271ecf45a3085646312f7c89d729d45fdedf13484546f
DIST Net-HTTP-6.09.tar.gz 17686 SHA256 52762b939d84806908ba544581c5708375f7938c3c0e496c128ca3fbc425e58d SHA512 ae36c8367206f18190237f9c6db417054b78f99cfa79cc651550d3612505faf9d31e415c8b32e7f87f4fd389ccaa0e23f62c3781f6f27485b7296b2fe48d7e45 WHIRLPOOL e29a0193e607507538d4e6c7e08808a4c5c8a58d035fa3054a82fc9e148105961de8a8b12c5dff485246a0f4b97075832785ddfa992cce7720d7e56047ef631c

@ -1,29 +1,30 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
MODULE_AUTHOR=CJM
MODULE_VERSION=1.00
DIST_AUTHOR=ETHER
DIST_VERSION=6.09
inherit perl-module
DESCRIPTION="Open an HTML file with automatic charset detection"
DESCRIPTION="Low-level HTTP connection (client)"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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="test"
IUSE="minimal"
PATCHES=( "${FILESDIR}/networktest.patch" )
RDEPEND="
>=virtual/perl-Encode-2.100.0
!minimal? (
>=dev-perl/IO-Socket-SSL-1.380.0
)
!<dev-perl/libwww-perl-6
virtual/perl-Compress-Raw-Zlib
virtual/perl-IO
virtual/perl-IO-Compress
dev-perl/URI
"
DEPEND="${RDEPEND}
>=virtual/perl-ExtUtils-MakeMaker-6.300.0
test? (
virtual/perl-Scalar-List-Utils
virtual/perl-File-Temp
>=virtual/perl-Test-Simple-0.880.0
)
virtual/perl-ExtUtils-MakeMaker
"
SRC_TEST=do

@ -0,0 +1,48 @@
diff -Naur Net-HTTP-6.09/Makefile.PL Net-HTTP-6.09b/Makefile.PL
--- Net-HTTP-6.09/Makefile.PL 2015-05-02 03:08:06.000000000 +0000
+++ Net-HTTP-6.09b/Makefile.PL 2016-03-01 03:52:01.412179572 +0000
@@ -3,16 +3,6 @@
require 5.006002;
use strict;
use ExtUtils::MakeMaker;
-use Getopt::Long qw(GetOptions);
-GetOptions(\my %opt, 'live-tests',) or warn "Usage: $0 [--live-tests]\n";
-
-my $flag_file = "t/LIVE_TESTS";
-if ($opt{"live-tests"}) {
- open(my $fh, ">", $flag_file) || die;
-}
-else {
- unlink($flag_file);
-}
WriteMakefile(
NAME => 'Net::HTTP',
diff -Naur Net-HTTP-6.09/t/apache-https.t Net-HTTP-6.09b/t/apache-https.t
--- Net-HTTP-6.09/t/apache-https.t 2015-05-01 18:12:51.000000000 +0000
+++ Net-HTTP-6.09b/t/apache-https.t 2016-03-01 03:51:19.511547486 +0000
@@ -1,8 +1,8 @@
#!perl -w
BEGIN {
- unless (-f "t/LIVE_TESTS" || -f "LIVE_TESTS") {
- print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n";
+ if ($ENV{NO_NETWORK_TESTING}) {
+ print "1..0 # SKIP Live tests disabled\n";
exit;
}
eval {
diff -Naur Net-HTTP-6.09/t/apache.t Net-HTTP-6.09b/t/apache.t
--- Net-HTTP-6.09/t/apache.t 2015-05-01 18:12:51.000000000 +0000
+++ Net-HTTP-6.09b/t/apache.t 2016-03-01 04:01:59.267131963 +0000
@@ -1,8 +1,8 @@
#!perl -w
BEGIN {
- unless (-f "t/LIVE_TESTS" || -f "LIVE_TESTS") {
- print "1..0 # SKIP Live tests disabled; pass --live-tests to Makefile.PL to enable\n";
+ if( $ENV{NO_NETWORK_TESTING} ) {
+ print "1..0 # SKIP Live tests disabled\n";
exit;
}
eval {

@ -1 +1,2 @@
DIST Net-IDN-Encode-2.201.tar.gz 448866 SHA256 1045df339283008974890d6f3db35b9a140b8d09e5182828c2b1cd8ca92ae22f SHA512 e1379a1431ba134c66939e6b14741d2d76e0f32365fce634650747d29069e4af0fd61541bce9d7fb57a5ac6b429ea9eb04983d729d547db6095b1906e1a6242b WHIRLPOOL d72d0845f1ffd8f3684347f52c491feac98a907a328a7bb3b78de6a9c94ad8d04f68de953292158e453251b66fa2b821af1f20b0f111de578becbd24f24c79fb
DIST Net-IDN-Encode-2.300.tar.gz 433068 SHA256 46b18a0a933af6709079eb5090cab2f4b382b07000672708bce0aec9135e56fc SHA512 a9079e510afa83f5c57c07817a6772e85993d1deeb11a3a77faf6c6cef8c1883fd0b15bdee54009384d49a0c5eec80366a77bfda80ae03ee65155f0ff6635997 WHIRLPOOL 5d737f110e7dc17e8b822fbc0152ab8123b4366f50491f227dd9579bb1e55e423f0b75f94bf53bde0d8853bbee315c40a13976a43b2bbd0f1f9f86b02e3d078e

@ -0,0 +1,31 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DIST_AUTHOR=CFAERBER
DIST_VERSION=2.300
inherit perl-module
DESCRIPTION="Internationalizing Domain Names in Applications (IDNA)"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
PERL_RM_FILES=(
"t/10pod.t"
"t/11pod_cover.t"
)
RDEPEND="
virtual/perl-Unicode-Normalize
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-CBuilder
>=dev-perl/Module-Build-0.420.0
test? (
virtual/perl-Test-Simple
dev-perl/Test-NoWarnings
)
"

@ -1 +1,2 @@
DIST Net-LDAPapi-3.0.3.tar.gz 55369 SHA256 8266a0493d6e771635c6788e80ae8e4d480c9a4dd752825e5dc903b9570325fb SHA512 8935233eaf9bf5ba5595ecd8c1659edcb8b032a4b1595ffcc31562b23e9155507183b9f6c4d9a76021257ed074155275ad5d20c23a5d873c7e7a64b7adc41f0a WHIRLPOOL cd7f83950dadbba89097a25cc6c40d370381d40eaada7de69a1afcdfe64f32dd116462e7aa859700f1f58a11c7d6d7d9a977819142833c87a0677ae05b59acb7
DIST Net-LDAPapi-3.0.4.tar.gz 66972 SHA256 99874f6fe1cd1540c267bb33cb28c2f93881d8644bcc09e6e0fc2c039dd774a3 SHA512 9e2153c9f50a8fba1c8e52493c147a9db7e88015fa48739d4762a4cbc1711c24472b031a6c077d46d38285146ff389f07d9f2908016b0e2c07b76aa75ef2d2ca WHIRLPOOL 7dcf54b8ca3dbcb6a6b66f3658e6e589b047bc3961261d0fdcd23488ae0131a7a84fcf4d500dd67088e9737eb1d13c1306c1bfcd2fcc8ca85d7ef106dc597c94

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save