diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest index e01130e447f3..8ff12f5b30ae 100644 --- a/app-accessibility/at-spi2-atk/Manifest +++ b/app-accessibility/at-spi2-atk/Manifest @@ -1 +1,2 @@ DIST at-spi2-atk-2.22.0.tar.xz 306148 SHA256 e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284 WHIRLPOOL 830b19dda735aa1cd03296a852d22117e957b69de20f798f4728993594e7b578558f413f38ddfcf81a8a9ad544480722db7d088f2b38827ca4293b141eb18370 +DIST at-spi2-atk-2.24.1.tar.xz 308576 SHA256 60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23 WHIRLPOOL f946814957e463b746db598909884b688a0cc3bc47a9b48e1f7a10dc9ef1988784246cd6fdecb896f108557c379c611cd8614fa3aea7a74e03a6ed139d198b98 diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild new file mode 100644 index 000000000000..13c9a1bdd7fd --- /dev/null +++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit gnome2 multilib-minimal virtualx + +DESCRIPTION="Gtk module for bridging AT-SPI to Atk" +HOMEPAGE="https://wiki.gnome.org/Accessibility" + +LICENSE="LGPL-2+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" +IUSE="test" + +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}] + >=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}] + >=sys-apps/dbus-1.5[${MULTILIB_USEDEP}] +" +RDEPEND="${COMMON_DEPEND} + ! +Date: Tue, 1 Aug 2017 13:44:32 -0400 +Subject: [PATCH] Add clean_id function to salt.utils.verify.py + +--- + salt/utils/verify.py | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/salt/utils/verify.py b/salt/utils/verify.py +index 5cac0fa651b..a3dc67db336 100644 +--- a/salt/utils/verify.py ++++ b/salt/utils/verify.py +@@ -480,12 +480,21 @@ def clean_path(root, path, subdir=False): + return '' + + ++def clean_id(id_): ++ ''' ++ Returns if the passed id is clean. ++ ''' ++ if re.search(r'\.\.{sep}'.format(sep=os.sep), id_): ++ return False ++ return True ++ ++ + def valid_id(opts, id_): + ''' + Returns if the passed id is valid + ''' + try: +- return bool(clean_path(opts['pki_dir'], id_)) ++ return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_) + except (AttributeError, KeyError, TypeError) as e: + return False + diff --git a/app-admin/salt/salt-2016.11.5.ebuild b/app-admin/salt/salt-2015.8.13-r1.ebuild similarity index 77% rename from app-admin/salt/salt-2016.11.5.ebuild rename to app-admin/salt/salt-2015.8.13-r1.ebuild index e68adad560f9..ed02341af26a 100644 --- a/app-admin/salt/salt-2016.11.5.ebuild +++ b/app-admin/salt/salt-2015.8.13-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -PYTHON_COMPAT=( python2_7 ) +EAPI=5 +PYTHON_COMPAT=(python2_7) inherit eutils systemd distutils-r1 @@ -72,39 +72,30 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] dev-python/timelib[${PYTHON_USEDEP}] >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] + >=dev-python/SaltTesting-2015.2.16[${PYTHON_USEDEP}] ${RDEPEND} )" -DOCS=( README.rst AUTHORS ) +DOCS=(README.rst AUTHORS) REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" PATCHES=( - "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" - "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" + "${FILESDIR}/${PN}-2015.8.0-remove-buggy-tests.patch" + "${FILESDIR}/${PN}-2015.5.5-auth-tests.patch" + "${FILESDIR}/${PN}-2015.5.5-cron-tests.patch" + "${FILESDIR}/${PN}-2015.5.5-remove-buggy-tests.patch" + "${FILESDIR}/${PN}-2015.8.2-tmpdir.patch" + "${FILESDIR}/${PN}-2015.8.10-remove-failing-boto-test.patch" + "${FILESDIR}/${PN}-2015.8.13-failing-gateway-tests.patch" + "${FILESDIR}/${PN}-2015.8.13-sanitize-minion-name.patch" ) python_prepare() { # this test fails because it trys to "pip install distribute" rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # https://github.com/saltstack/salt/issues/39095 - rm tests/unit/utils/parsers_test.py - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die + tests/unit/modules/{rh_ip,win_network,random_org}_test.py } python_install_all() { @@ -114,7 +105,12 @@ python_install_all() { for svc in minion master syndic api; do newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service + if [[ -e pkg/salt-${svc}.service ]]; then + sed -i -r 's/After=(.*)/After=syslog.target \1/' pkg/salt-${svc}.service || die + systemd_dounit pkg/salt-${svc}.service + elif [[ -e "${FILESDIR}"/salt-${svc}.service ]]; then + systemd_dounit "${FILESDIR}"/salt-${svc}.service + fi done insinto /etc/${PN} @@ -124,7 +120,7 @@ python_install_all() { python_test() { local tempdir # testsuite likes lots of files - ulimit -n 3072 || die + ulimit -n 3072 # ${T} is too long a path for the tests to work tempdir="$(mktemp -dup /tmp salt-XXX)" @@ -137,8 +133,7 @@ python_test() { addwrite "${tempdir}" ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ + USE_SETUPTOOLS=1 SHELL="/bin/bash" TMPDIR="${tempdir}" \ ${EPYTHON} tests/runtests.py \ --unit-tests --no-report --verbose diff --git a/app-admin/salt/salt-2016.11.6.ebuild b/app-admin/salt/salt-2016.11.6.ebuild deleted file mode 100644 index e68adad560f9..000000000000 --- a/app-admin/salt/salt-2016.11.6.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit eutils systemd distutils-r1 - -DESCRIPTION="Salt is a remote execution and configuration manager" -HOMEPAGE="https://saltstack.com/community/" - -if [[ ${PV} == 9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git" - EGIT_BRANCH="develop" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~x86 ~amd64" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova" -IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax" - -RDEPEND="sys-apps/pciutils - dev-python/jinja[${PYTHON_USEDEP}] - >=dev-python/msgpack-0.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/requests-1.0.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=www-servers/tornado-4.2.1[${PYTHON_USEDEP}] - virtual/python-futures[${PYTHON_USEDEP}] - libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] ) - mako? ( dev-python/mako[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] ) - openssl? ( - dev-libs/openssl:*[-bindist] - dev-python/pyopenssl[${PYTHON_USEDEP}] - ) - raet? ( - >=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}] - >=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}] - >=dev-python/raet-0.6.0[${PYTHON_USEDEP}] - ) - zeromq? ( - >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] - >=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] - ) - cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] ) - mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] ) - portage? ( sys-apps/portage[${PYTHON_USEDEP}] ) - keyring? ( dev-python/keyring[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) - redis? ( dev-python/redis-py[${PYTHON_USEDEP}] ) - selinux? ( sec-policy/selinux-salt ) - timelib? ( dev-python/timelib[${PYTHON_USEDEP}] ) - nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] ) - neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] ) - gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] ) - profile? ( dev-python/yappi[${PYTHON_USEDEP}] ) - vim-syntax? ( app-vim/salt-vim )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/timelib[${PYTHON_USEDEP}] - >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] - !x86? ( dev-python/boto3[${PYTHON_USEDEP}] ) - >=dev-python/moto-0.3.6[${PYTHON_USEDEP}] - >=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}] - >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] - ${RDEPEND} - )" - -DOCS=( README.rst AUTHORS ) - -REQUIRED_USE="|| ( raet zeromq )" -RESTRICT="x86? ( test )" - -PATCHES=( - "${FILESDIR}/${PN}-2016.11.0-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch" - "${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch" - "${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch" - "${FILESDIR}/${PN}-2016.11.0-broken-tests.patch" -) - -python_prepare() { - # this test fails because it trys to "pip install distribute" - rm tests/unit/{modules,states}/zcbuildout_test.py \ - tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die - - # https://github.com/saltstack/salt/issues/39095 - rm tests/unit/utils/parsers_test.py - - # apparently libcloud does not know about this? - rm tests/unit/cloud/clouds/dimensiondata_test.py || die - - # seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'" - rm tests/unit/cloud/clouds/gce_test.py || die -} - -python_install_all() { - local svc - USE_SETUPTOOLS=1 distutils-r1_python_install_all - - for svc in minion master syndic api; do - newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc} - newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc} - systemd_dounit "${FILESDIR}"/salt-${svc}.service - done - - insinto /etc/${PN} - doins -r conf/* -} - -python_test() { - local tempdir - # testsuite likes lots of files - ulimit -n 3072 || die - - # ${T} is too long a path for the tests to work - tempdir="$(mktemp -dup /tmp salt-XXX)" - mkdir "${T}/$(basename "${tempdir}")" - - ( - cleanup() { rm -f "${tempdir}"; } - trap cleanup EXIT - - addwrite "${tempdir}" - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" - - USE_SETUPTOOLS=1 SHELL="/bin/bash" \ - TMPDIR="${tempdir}" \ - ${EPYTHON} tests/runtests.py \ - --unit-tests --no-report --verbose - - ) || die "testing failed" -} diff --git a/app-admin/salt/salt-2016.11.4.ebuild b/app-admin/salt/salt-2016.11.7.ebuild similarity index 100% rename from app-admin/salt/salt-2016.11.4.ebuild rename to app-admin/salt/salt-2016.11.7.ebuild diff --git a/app-admin/salt/salt-2016.3.6.ebuild b/app-admin/salt/salt-2016.3.7.ebuild similarity index 100% rename from app-admin/salt/salt-2016.3.6.ebuild rename to app-admin/salt/salt-2016.3.7.ebuild diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest index ab90415c9d03..93538fba61ba 100644 --- a/app-dicts/gnome-dictionary/Manifest +++ b/app-dicts/gnome-dictionary/Manifest @@ -1,2 +1,3 @@ DIST gnome-dictionary-3.18.1.tar.xz 864460 SHA256 92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc SHA512 efe4d1f8810bf218bae4d393be1d26938ed3a814ed22fb96c0bded5f874c32229b215351b08462eef1c92b756640a3d4e1c0f5ea1ee49f67e519bcf0d53aba74 WHIRLPOOL c20c73504e8ce0745170ec21296191d14770f252c80b208e4ac08659f80d2ece79cd2d408b4e3bdee992475a67be2ec77f4c16e501e8bbbebe8c0a95c3911e7b DIST gnome-dictionary-3.20.0.tar.xz 871916 SHA256 efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121 SHA512 9be2564b5bf543e80afdb946c16b16e2daf6c31875e352b7c2d7e34436791fc9470eadb42eba3a4c1893e2f2568e6bb88d19ea4a0b8dbb2eca2dd4c95aeaf229 WHIRLPOOL 4c22c0b2f7f668f5efc3857ba4bf33808d52a524b4d8ccbe1ac91839daff97d7271cf5f8196c0fbaa47266bb83f9f0705c83d1fe5949f633bfa50269554e057f +DIST gnome-dictionary-3.24.0.tar.xz 878756 SHA256 41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2 SHA512 1c31149b02978a1840563941767e3ce2be4f6a5e790eb9126c0f0c50d932987f46447fe3bac0e2eb8ce87be1521d13e56d8a14e86407e367a6dd76cd5a77de30 WHIRLPOOL 3daf0e1efcf0783e6ad0d97877ff41037df0c257f60e95920d7dd1948a0f1c495964ee96497c826814d2e5a77a350da5eb0e5b6a49127065abd1264490f35010 diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.0.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.0.ebuild new file mode 100644 index 000000000000..72899df9509a --- /dev/null +++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Dictionary utility for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary" + +LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+" +SLOT="0/10" # subslot = suffix of libgdict-1.0.so +IUSE="debug +introspection ipv6" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" + +COMMON_DEPEND=" + >=dev-libs/glib-2.42:2[dbus] + x11-libs/cairo:= + >=x11-libs/gtk+-3.21.1:3 + x11-libs/pango + introspection? ( >=dev-libs/gobject-introspection-1.42:= ) +" +RDEPEND="${COMMON_DEPEND} + gnome-base/gsettings-desktop-schemas + ! +Date: Tue, 15 Aug 2017 21:04:24 -0400 +Subject: [PATCH] tsk/img/aff: loop initial declarations are not allowed in C89 + +Declaring an integer inside a for loop as in for(int i;;) is not +allowed in C89 and causes a build failure. Fix it by declaring the +variable just before the for loop. +--- + tsk/img/aff.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tsk/img/aff.c b/tsk/img/aff.c +index fd9c4ff..a832bfb 100644 +--- a/tsk/img/aff.c ++++ b/tsk/img/aff.c +@@ -216,7 +216,8 @@ aff_close(TSK_IMG_INFO * img_info) + { + IMG_AFF_INFO *aff_info = (IMG_AFF_INFO *) img_info; + af_close(aff_info->af_file); +- for (int i = 0; i < img_info->num_img; i++) { ++ int i; ++ for (i = 0; i < img_info->num_img; i++) { + if (img_info->images[i]) + free(img_info->images[i]); + } +-- +2.10.2 + diff --git a/app-forensics/sleuthkit/metadata.xml b/app-forensics/sleuthkit/metadata.xml index 43029e296994..827d72c67584 100644 --- a/app-forensics/sleuthkit/metadata.xml +++ b/app-forensics/sleuthkit/metadata.xml @@ -1,12 +1,16 @@ - + + gokturk@gentoo.org + Göktürk Yüksek + Enable extra aff formats Enable libewf support sleuthkit + sleuthkit/sleuthkit diff --git a/app-forensics/sleuthkit/sleuthkit-4.4.2.ebuild b/app-forensics/sleuthkit/sleuthkit-4.4.2.ebuild new file mode 100644 index 000000000000..754294c9377d --- /dev/null +++ b/app-forensics/sleuthkit/sleuthkit-4.4.2.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_BSFIX_NAME="build.xml build-unix.xml" +inherit autotools java-pkg-opt-2 java-ant-2 + +DESCRIPTION="A collection of file system and media management forensic analysis tools" +HOMEPAGE="https://www.sleuthkit.org/sleuthkit/" +# TODO: sqlite-jdbc does not exist in the tree, we bundle it for now +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz + java? ( http://repo1.maven.org/maven2/org/xerial/sqlite-jdbc/3.8.11/sqlite-jdbc-3.8.11.jar )" + +LICENSE="CPL-1.0 GPL-2+ IBM java? ( Apache-2.0 )" +SLOT="0/13" # subslot = major soname version +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +IUSE="aff doc ewf java static-libs test +threads zlib" + +DEPEND=" + dev-db/sqlite:3 + dev-lang/perl:* + aff? ( app-forensics/afflib ) + ewf? ( app-forensics/libewf:= ) + java? ( + >=virtual/jdk-1.8:* + >=dev-java/c3p0-0.9.5:0 + >=dev-java/jdbc-postgresql-9.4:0 + ) + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND} + java? ( >=virtual/jre-1.8:= ) +" +DEPEND="${DEPEND} + doc? ( app-doc/doxygen ) + test? ( >=dev-util/cppunit-1.2.1 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.1.0-tools-shared-libs.patch + "${FILESDIR}"/${PN}-4.4.2-c89-fix.patch +) + +TSK_JAR_DIR="${S}/bindings/java/lib" + +src_unpack() { + local f + + unpack ${P}.tar.gz + + # Copy the jar files that don't exist in the tree yet + if use java; then + mkdir "${TSK_JAR_DIR}" || die + for f in ${A}; do + if [[ ${f} =~ .jar$ ]]; then + cp "${DISTDIR}"/"${f}" "${TSK_JAR_DIR}" || die + fi + done + fi +} + +src_prepare() { + if use java; then + pushd "${S}"/bindings/java &>/dev/null || die + + # Prevent "make install" from installing + # jar files under /usr/share/java + # We'll use the java eclasses for this + sed -e '/^jar_DATA/ d;' -i Makefile.am || die + + # Disable dependency retrieval using ivy + # We will handle it ourselves + sed -e '/name="compile"/ s/, retrieve-deps//' \ + -e '/name="dist-/ s/, init-ivy//g' \ + -i build.xml || die + + # Even if static libs are disabled, the build system looks for + # the static library and fails if not present + # Disable that check + use static-libs || sed -e '//dev/null || die + java-ant-2_src_configure + popd &>/dev/null || die + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + # Create symlinks of jars for the required dependencies + if use java; then + pushd "${S}"/bindings/java &>/dev/null || die + + java-pkg_jar-from --into "${TSK_JAR_DIR}" c3p0 + java-pkg_jar-from --into "${TSK_JAR_DIR}" jdbc-postgresql + + popd &>/dev/null || die + fi + + # Create the doc output dirs if requested + use doc && mkdir -p "${T}"/doc/{api-docs,jni-docs} || die + + emake all $(usex doc api-docs "") +} + +src_install() { + local f + + if use java; then + pushd "${S}"/bindings/java &>/dev/null || die + + java-pkg_dojar dist/Tsk_DataModel.jar + + # Install the bundled jar files + pushd "${TSK_JAR_DIR}" &>/dev/null || die + for f in *; do + # Skip the symlinks java-pkg_jar-from created + [[ -f ${f} ]] || continue + + # Strip the version numbers as per eclass recommendation + [[ ${f} =~ -([0-9].)+.jar$ ]] || continue + + java-pkg_newjar "${f}" "${f/${BASH_REMATCH[0]}/.jar}" + done + popd &>/dev/null || die + + popd &>/dev/null || die + fi + + default + + # It unconditionally builds both api and jni docs + # We install conditionally based on the provided use flags + if use doc; then + dodoc -r "${T}"/doc/api-docs + use java && dodoc -r "${T}"/doc/jni-docs + fi + + find "${D}" -name '*.la' -delete || die +} diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest index 625064bdbab1..0312ffaaeca2 100644 --- a/app-misc/gcalcli/Manifest +++ b/app-misc/gcalcli/Manifest @@ -1,3 +1,4 @@ DIST gcalcli-3.2.tar.gz 1672457 SHA256 9b3465be8e64c291ffe4582f8cb779a7025c700e6a83aae74722d87a3b88d55a SHA512 a2e0d9aea2f27eaee3796acfbfdc08b88a7792002b10f0e44b0db1187a7ecd50aa97f78df7236038c8c18bc1b6dacbfa4b26db6bfb5762c880415c10a5364d83 WHIRLPOOL 66b8e954c5d4527e2725d0f07786262f4365f356e3ef893aa8253d07c41523b5f9c71bffd03acc02b27c57001f0c1e7b3cd92fea7396974b8898b4940abff6fb DIST gcalcli-3.3.2.tar.gz 1674569 SHA256 69c31b5bee1390b4187a48b85b57ba95e40db231489d3deec8c3d387305d2ff3 SHA512 725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0 WHIRLPOOL 86acaf08d36af331524e514c6bfc37e6591ec570dd5c25c0bca6b111aa901636082cc961b70fcadbc32616e72f6c09bbc8460aa97f15a146fa341850fa416d15 +DIST gcalcli-3.4.0.tar.gz 1675456 SHA256 1297f7082b4d33ac6d5ea3edfc11bdd329b8a6f28926aeda412806d45b7afdd1 SHA512 d3844dc34dfd21b1cca6f46bf2b66b6aabfccd4d7b23ad4e076966aeec51681792c0dbe5f61e4cb84a75ce3bbf4fd1c63a2ce759cecdeee3e4608c0238c07a4b WHIRLPOOL 6bbe059a8ef28d8b498006f95f3c31ea0eb244139f39c0b1846f6981e3f05d26b1f49b2ff527f6127d21e3feafcfd1e77285bcb8afae0fe690fe6251483cdb99 DIST gcalcli-4.0.0_alpha3.tar.gz 1675261 SHA256 d295a5c577fd4d202eb59317169e239c07d03c8ab261211ef39549bdcf98e150 SHA512 215860f50d2b32b94124537b3d8dbaebd7af5b9c907d565a58eab5357efa8a8c8bc6c20264811337ddbc33ae75029bf59c782e1dbb317667084f11da8c41ea18 WHIRLPOOL 3fb9817ca408b2513b5bbcaa8ea343132e8e834ac3365cd1a4020c9dc9840f125e59b49b9067f27187b6b7210d4bb4227a79efe80ae1a98e7aad3bfc1177defa diff --git a/app-misc/gcalcli/files/gcalcli-oauth2client.patch b/app-misc/gcalcli/files/gcalcli-oauth2client.patch new file mode 100644 index 000000000000..2ad7a2981f82 --- /dev/null +++ b/app-misc/gcalcli/files/gcalcli-oauth2client.patch @@ -0,0 +1,30 @@ +--- a/gcalcli-3.3.2/gcalcli 2015-09-14 02:26:55.000000000 -0300 ++++ b/gcalcli-3.3.2/gcalcli 2016-09-21 00:20:45.817051537 -0300 +@@ -190,7 +190,8 @@ + from apiclient.errors import HttpError + from oauth2client.file import Storage + from oauth2client.client import OAuth2WebServerFlow +- from oauth2client.tools import run ++ from oauth2client.tools import run_flow ++ from oauth2client.tools import argparser + except ImportError as e: + print "ERROR: Missing module - %s" % e.args[0] + sys.exit(1) +@@ -665,14 +666,15 @@ + credentials = storage.get() + + if credentials is None or credentials.invalid: +- credentials = run( ++ args, unknown = argparser.parse_known_args(sys.argv) ++ credentials = run_flow( + OAuth2WebServerFlow( + client_id=self.client_id, + client_secret=self.client_secret, + scope=['https://www.googleapis.com/auth/calendar', + 'https://www.googleapis.com/auth/urlshortener'], + user_agent=__program__ + '/' + __version__), +- storage) ++ storage,args) + + self.authHttp = credentials.authorize(httplib2.Http()) + diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild b/app-misc/gcalcli/gcalcli-3.2.ebuild index 4a5053542f91..5278106779aa 100644 --- a/app-misc/gcalcli/gcalcli-3.2.ebuild +++ b/app-misc/gcalcli/gcalcli-3.2.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/google-api-python-client[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}] dev-python/gdata[${PYTHON_USEDEP}] dev-python/vobject[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild b/app-misc/gcalcli/gcalcli-3.3.2.ebuild index 4a5053542f91..5278106779aa 100644 --- a/app-misc/gcalcli/gcalcli-3.3.2.ebuild +++ b/app-misc/gcalcli/gcalcli-3.3.2.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="${PYTHON_DEPS} dev-python/python-dateutil[${PYTHON_USEDEP}] - dev-python/google-api-python-client[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}] dev-python/gdata[${PYTHON_USEDEP}] dev-python/vobject[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" diff --git a/app-misc/gcalcli/gcalcli-3.4.0.ebuild b/app-misc/gcalcli/gcalcli-3.4.0.ebuild new file mode 100644 index 000000000000..43c611febff7 --- /dev/null +++ b/app-misc/gcalcli/gcalcli-3.4.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +# python-gflags doesn't support python3 +# parsedatetime doesn't support pypy +PYTHON_COMPAT=( python2_7 ) + +inherit python-r1 + +DESCRIPTION="Google Calendar Command Line Interface" +HOMEPAGE="https://github.com/insanum/gcalcli" +SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="${PYTHON_DEPS} + >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}] + dev-python/parsedatetime[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/python-gflags[${PYTHON_USEDEP}] + dev-python/vobject[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/gcalcli-oauth2client.patch" +} + +src_install() { + dodoc -r ChangeLog README.md docs + python_foreach_impl python_doscript ${PN} +} diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild new file mode 100644 index 000000000000..ee26100ef277 --- /dev/null +++ b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +# python-gflags doesn't support python3 +# parsedatetime doesn't support pypy +PYTHON_COMPAT=( python2_7 ) + +inherit python-r1 versionator + +MY_PV="4.0.0a3" + +DESCRIPTION="Google Calendar Command Line Interface" +HOMEPAGE="https://github.com/insanum/gcalcli" +SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + dev-python/gdata[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}] + dev-python/parsedatetime[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + dev-python/python-gflags[${PYTHON_USEDEP}] + dev-python/vobject[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/gcalcli-${MY_PV}" + +src_install() { + dodoc -r ChangeLog README.md docs + python_foreach_impl python_doscript ${PN} +} diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index b5c03451551e..a04348041287 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1 +1,2 @@ DIST tracker-1.10.5.tar.xz 5033992 SHA256 3b8488f0e372054790f2fd4207227c5b15425bf1ab829d76928ac0b32de9c5b7 SHA512 e26f394681d0da28fb28536655f3c584de4aa7ce38c5a9762f81c9bfd21185d8df542b8d72ab337fb63ab91a1df9c733053fb6fa02cdffdc4edd873e0f70b800 WHIRLPOOL 0ab0a66cee2eb14b7893dd3719b0095e3cb3f49cb4db8bebcaa4f5174e726fb7db5f5706a635ffc71d89ab05494f991d4e8b2e62077c5cf2db85f5d9d7a3f4f8 +DIST tracker-1.12.2.tar.xz 5047740 SHA256 ebeb42ef982d0e45c8b8eea8440dcd1c06cd04c7974440a2012942552882bffd SHA512 32765d5a186b54e691b749af0be9a052d6edf367b759cd9236efb5af84e05e62301ca0d50303ca6d97b92b59e99a3934d3e6444701c07938638d5784f4155dec WHIRLPOOL 5ce2bfb1645e99ba3163811ec44b8b93a18c4387bfd09850462abec4ada3c3ef73edf62e716c48d6c99e68fb7ffffefbf3a36de5b0ee436fd936bbc3ac757a36 diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml index 496f3e3ab659..64efbfdb6eb6 100644 --- a/app-misc/tracker/metadata.xml +++ b/app-misc/tracker/metadata.xml @@ -8,8 +8,8 @@ Enable cue sheet parsing + enabling this by accident; it has some stability problems and + performance implications --> Install bookmark data miner plugin for www-client/firefox and www-client/firefox-bin Enable gnome-extra/libgsf based data extractor and @@ -24,7 +24,7 @@ Add word stemming via dev-libs/snowball-stemmer. Install email data miner plugin for mail-client/thunderbird and - mail-client/thunderbird-bin + mail-client/thunderbird-bin Add support for XPS file format through app-text/libgxps. diff --git a/app-misc/tracker/tracker-1.12.2.ebuild b/app-misc/tracker/tracker-1.12.2.ebuild new file mode 100644 index 000000000000..e404e8c72d2e --- /dev/null +++ b/app-misc/tracker/tracker-1.12.2.ebuild @@ -0,0 +1,249 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python2_7 ) + +inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx + +DESCRIPTION="A tagging metadata database, search tool and indexer" +HOMEPAGE="https://wiki.gnome.org/Projects/Tracker" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/100" +IUSE="cue elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf gstreamer +gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager pdf playlist +rss seccomp stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +REQUIRED_USE=" + ?? ( gstreamer ffmpeg ) + cue? ( gstreamer ) + upnp-av? ( gstreamer ) + !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps ) +" + +# According to NEWS, introspection is non-optional +# glibc-2.12 needed for SCHED_IDLE (see bug #385003) +# seccomp is automagic, though we want to use it whenever possible (linux) +# >=media-libs/libmediaart-1.9:2.0 is suggested to be disabled for 1.10 for security; +# It is disable in configure in 1.12; revisit for 1.14/2 (configure flag) +RDEPEND=" + >=app-i18n/enca-1.9 + >dev-db/sqlite-3.20:= + >=dev-libs/glib-2.44:2 + >=dev-libs/gobject-introspection-0.9.5:= + >=dev-libs/icu-4.8.1.1:= + >=dev-libs/json-glib-1.0 + >=media-libs/libpng-1.2:0= + >=net-libs/libsoup-2.40:2.4 + >=x11-libs/pango-1:= + sys-apps/util-linux + virtual/imagemagick-tools[png,jpeg?] + + cue? ( media-libs/libcue ) + elibc_glibc? ( >=sys-libs/glibc-2.12 ) + exif? ( >=media-libs/libexif-0.6 ) + ffmpeg? ( + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) + ) + firefox-bookmarks? ( || ( + >=www-client/firefox-4.0 + >=www-client/firefox-bin-4.0 ) ) + flac? ( >=media-libs/flac-1.2.1 ) + gif? ( media-libs/giflib:= ) + gsf? ( >=gnome-extra/libgsf-1.14.24 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 ) + gtk? ( + >=x11-libs/gtk+-3:3 ) + iptc? ( media-libs/libiptcdata ) + iso? ( >=sys-libs/libosinfo-0.2.9:= ) + jpeg? ( virtual/jpeg:0 ) + upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) + mp3? ( >=media-libs/taglib-1.6 ) + networkmanager? ( >=net-misc/networkmanager-0.8:= ) + pdf? ( + >=x11-libs/cairo-1:= + >=app-text/poppler-0.16[cairo,utils] + >=x11-libs/gtk+-2.12:2 ) + playlist? ( >=dev-libs/totem-pl-parser-3 ) + rss? ( >=net-libs/libgrss-0.7:0 ) + stemmer? ( dev-libs/snowball-stemmer ) + thunderbird? ( || ( + >=mail-client/thunderbird-5.0 + >=mail-client/thunderbird-bin-5.0 ) ) + tiff? ( media-libs/tiff:0 ) + upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) + vorbis? ( >=media-libs/libvorbis-0.22 ) + xml? ( >=dev-libs/libxml2-2.6 ) + xmp? ( >=media-libs/exempi-2.1 ) + xps? ( app-text/libgxps ) + !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) + seccomp? ( >=sys-libs/libseccomp-2.0 ) +" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + $(vala_depend) + dev-util/gdbus-codegen + >=dev-util/gtk-doc-am-1.8 + >=dev-util/intltool-0.40.0 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + test? ( + >=dev-libs/dbus-glib-0.82-r1 + >=sys-apps/dbus-1.3.1[X] ) +" +PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )" + +function inotify_enabled() { + if linux_config_exists; then + if ! linux_chkconfig_present INOTIFY_USER; then + ewarn "You should enable the INOTIFY support in your kernel." + ewarn "Check the 'Inotify support for userland' under the 'File systems'" + ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config" + die 'missing CONFIG_INOTIFY' + fi + else + einfo "Could not check for INOTIFY support in your kernel." + fi +} + +pkg_setup() { + linux-info_pkg_setup + inotify_enabled + + python-any-r1_pkg_setup +} + +src_prepare() { + # Don't run 'firefox --version' or 'thunderbird --version'; it results in + # access violations on some setups (bug #385347, #385495). + create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh + create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh + + eautoreconf # See bug #367975 + gnome2_src_prepare + vala_src_prepare +} + +src_configure() { + local myconf="" + + if use gstreamer ; then + myconf="${myconf} --enable-generic-media-extractor=gstreamer" + if use upnp-av; then + myconf="${myconf} --with-gstreamer-backend=gupnp-dlna" + else + myconf="${myconf} --with-gstreamer-backend=discoverer" + fi + elif use ffmpeg ; then + myconf="${myconf} --enable-generic-media-extractor=libav" + else + myconf="${myconf} --enable-generic-media-extractor=external" + fi + + # unicode-support: libunistring, libicu or glib ? + # According to NEWS, introspection is required + # is not being generated + # nautilus extension is in a separate package, nautilus-tracker-tags + # miner-evolution disabled as it's incompatible with current eds + gnome2_src_configure \ + --disable-hal \ + --disable-miner-evolution \ + --disable-nautilus-extension \ + --disable-static \ + --enable-abiword \ + --enable-artwork \ + --enable-dvi \ + --enable-enca \ + --enable-guarantee-metadata \ + --enable-icon \ + --enable-introspection \ + --disable-libmediaart \ + --enable-libpng \ + --enable-miner-apps \ + --enable-miner-user-guides \ + --enable-ps \ + --enable-text \ + --enable-tracker-fts \ + --enable-tracker-writeback \ + --with-unicode-support=libicu \ + --with-bash-completion-dir="$(get_bashcompdir)" \ + $(use_enable cue libcue) \ + $(use_enable exif libexif) \ + $(use_enable firefox-bookmarks miner-firefox) \ + $(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \ + FIREFOX="${S}"/firefox-version.sh \ + $(use_enable flac libflac) \ + $(use_enable gif libgif) \ + $(use_enable gsf libgsf) \ + $(use_enable gtk tracker-needle) \ + $(use_enable gtk tracker-preferences) \ + $(use_enable iptc libiptcdata) \ + $(use_enable iso libosinfo) \ + $(use_enable jpeg libjpeg) \ + $(use_enable upower upower) \ + $(use_enable miner-fs) \ + $(use_enable mp3 taglib) \ + $(use_enable mp3) \ + $(use_enable networkmanager network-manager) \ + $(use_enable pdf poppler) \ + $(use_enable playlist) \ + $(use_enable rss miner-rss) \ + $(use_enable stemmer libstemmer) \ + $(use_enable test functional-tests) \ + $(use_enable test unit-tests) \ + $(use_enable thunderbird miner-thunderbird) \ + $(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \ + THUNDERBIRD="${S}"/thunderbird-version.sh \ + $(use_enable tiff libtiff) \ + $(use_enable vorbis libvorbis) \ + $(use_enable xml libxml2) \ + $(use_enable xmp exempi) \ + $(use_enable xps libgxps) \ + ${myconf} +} + +src_test() { + # G_MESSAGES_DEBUG, upstream bug #699401#c1 + virtx emake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all" +} + +src_install() { + gnome2_src_install + + # Manually symlink extensions for {firefox,thunderbird}-bin + if use firefox-bookmarks; then + dosym /usr/share/xul-ext/trackerfox \ + /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@bustany.org + fi + + if use thunderbird; then + dosym /usr/share/xul-ext/trackerbird \ + /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org + fi +} + +create_version_script() { + # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))" + + local v=$(best_version ${1}) + v=${v#${1}-} + local vbin=$(best_version ${1}-bin) + vbin=${vbin#${1}-bin-} + + if [[ -z ${v} ]]; then + v=${vbin} + else + version_compare ${v} ${vbin} + [[ $? -eq 1 ]] && v=${vbin} + fi + + echo -e "#!/bin/sh\necho $2 $v" > "$3" || die + chmod +x "$3" || die +} diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest index a9b526074ec9..b28be85a1f92 100644 --- a/app-portage/elt-patches/Manifest +++ b/app-portage/elt-patches/Manifest @@ -1,2 +1,3 @@ DIST elt-patches-20170317.tar.xz 23356 SHA256 24d2665ba560d01160b955ecf46a17433ee879960e3d914698be170b6698dad4 SHA512 28da9a214cd2bccebad45f464a414fedf80fc6b497d1f6b8f30a0a67570a614065ef67ce43316872d94a144de1a154ecd164a47009ebcd7d39128ccc2dd39618 WHIRLPOOL 944e2a1a92485a93b1b236047d8c6394c76b8b68242f8bf3f683511c0357ee351a2823e77707e2737ea247873fd88287120c3fc3af4ed28488bfafb13a0b163b DIST elt-patches-20170422.tar.xz 27864 SHA256 56c5391b8c6958bca081d1eead516917ac6571da283862b2468fe0e2eb33682c SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc WHIRLPOOL 11e2aa4f74e8648730e7d541d6061ec72f4f2ef40c205a863a381f972931e9441cc2110c7e8d3f71899ffc08d9857a5afa01438d2d2080cc9f2d394cf84c00f5 +DIST elt-patches-20170815.tar.xz 27864 SHA256 caf05e2b3bdf1dfc4188a27c703dc68d66d51ea4274edc6a6ebf9918cf1b2340 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd WHIRLPOOL dcf892154407238cbe7874a1d2b976b8bf8260ab47a18cd8d6e543d98fa47442d83cfefca9431a2e4eebae5156f5e31e4d976831558faff8a79da251d45686f2 diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild new file mode 100644 index 000000000000..84ee7fc57803 --- /dev/null +++ b/app-portage/elt-patches/elt-patches-20170815.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Collection of patches for libtool.eclass" +HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/" +SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="" + +RDEPEND="sys-apps/gentoo-functions" +DEPEND="app-arch/xz-utils" + +src_compile() { + emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)" +} + +src_install() { + emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install +} diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest index 4e09beef6d55..04ff4eca1432 100644 --- a/app-text/poppler-data/Manifest +++ b/app-text/poppler-data/Manifest @@ -1 +1,2 @@ DIST poppler-data-0.4.7.tar.gz 4182339 SHA256 e752b0d88a7aba54574152143e7bf76436a7ef51977c55d6bd9a48dccde3a7de SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2 WHIRLPOOL 4e939252767112723678fe8771f958eeef6d3fd26224c26ecf54feb2a7a29510d86f183f1b8267fcf56848a24fb6e3e3c4c001145edd9751d953cb882585b827 +DIST poppler-data-0.4.8.tar.gz 4209901 SHA256 1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54 WHIRLPOOL f161af2815252d2b8f5d1898be8f325d6c68c3d38188f0a8a90b7b8a001a65f202dac2738a42e94dfd42d9623e4e83903fcbb5f2c2b2e1d2b23018d783870f08 diff --git a/app-text/poppler-data/poppler-data-0.4.8.ebuild b/app-text/poppler-data/poppler-data-0.4.8.ebuild new file mode 100644 index 000000000000..05b8cc6dab63 --- /dev/null +++ b/app-text/poppler-data/poppler-data-0.4.8.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc" +HOMEPAGE="https://poppler.freedesktop.org/" +SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz" + +LICENSE="BSD GPL-2 MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="" + +src_install() { + emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install + + # bug 409361 + dodir /usr/share/poppler/cMaps + cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die + find ../cMap -type f -exec ln -s {} . \; || die +} diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild index 4661b2e001c3..21c876b7995e 100644 --- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild +++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: tmux support for vim" HOMEPAGE="https://github.com/tmux-plugins/vim-tmux" SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.zip -> ${P}.zip" LICENSE="vim.org" -KEYWORDS="amd64 ppc ppc64 x86 ~ia64 ~arm ~mips ~sparc ~alpha ~hppa" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" # Bug 603526. # Remove this line once this version is marked stable diff --git a/dev-db/pgagent/files/pgagent.initd-r1 b/dev-db/pgagent/files/pgagent.initd-r1 new file mode 100644 index 000000000000..a555006d3bd2 --- /dev/null +++ b/dev-db/pgagent/files/pgagent.initd-r1 @@ -0,0 +1,31 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/bin/pgagent" +command_user="pgagent" + +# If pgagent daemonizes itself, it won't write a PID file and +# we have to work a little harder to stop() it. So let it run +# in the foreground, and have OpenRC manage its PID file. +command_args="-f + -t ${PGA_POLL} + -r ${PGA_RETRY} + -s ${PGA_LOG} + -l ${PGA_LEVEL} + hostaddr=${PG_HOST} + dbname=${PG_DBNAME} + user=${PG_USER}" + +command_background="true" +pidfile="/run/pgagent.pid" + +depend() { + use net + need postgresql +} + +start_pre() { + # The log file needs to be writable by the daemon user. + checkpath --file --owner root:pgagent --mode 0660 "${PGA_LOG}" +} diff --git a/dev-db/pgagent/pgagent-3.4.0-r2.ebuild b/dev-db/pgagent/pgagent-3.4.0-r2.ebuild new file mode 100644 index 000000000000..9f44b6fff0f9 --- /dev/null +++ b/dev-db/pgagent/pgagent-3.4.0-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +CMAKE_IN_SOURCE_BUILD=1 +WX_GTK_VER="3.0" + +inherit cmake-utils user wxwidgets + +MY_PN=${PN/a/A} + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="${MY_PN} is a job scheduler for PostgreSQL" +HOMEPAGE="http://www.pgadmin.org/download/pgagent.php" +SRC_URI="mirror://postgresql/pgadmin3/release/${PN}/${MY_PN}-${PV}-Source.tar.gz" +LICENSE="POSTGRESQL GPL-2" +SLOT="0" +IUSE="" + +RDEPEND="dev-db/postgresql:* + x11-libs/wxGTK:${WX_GTK_VER}" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}-Source" + +src_prepare() { + default + sed -e "s:share):share/${P}):" \ + -i CMakeLists.txt || die "failed to patch CMakeLists.txt" + sed -i -e '/SET(WX_VERSION "2.8")/d' CMakeLists.txt || die +} + +src_configure() { + if has_version "x11-libs/wxGTK[X]"; then + need-wxwidgets unicode + else + need-wxwidgets base-unicode + fi + mycmakeargs=( "-DSTATIC_BUILD:BOOLEAN=FALSE" + "-DWX_VERSION=${WX_GTK_VER}" ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + newinitd "${FILESDIR}/pgagent.initd-r1" "${PN}" + newconfd "${FILESDIR}/pgagent.confd" "${PN}" + + rm "${ED}"/usr/{LICENSE,README} || die "failed to remove useless docs" +} + +pkg_preinst() { + # This user needs a real shell, and the daemon will use the + # ~/.pgpass file from its home directory. + enewuser pgagent -1 /bin/bash /home/pgagent +} + +pkg_postinst() { + if [[ -n "${REPLACING_VERSIONS}" ]]; then + # This warning can be removed around a year after this version + # goes stable. + ewarn 'pgAgent now runs as a dedicated "pgagent" user (as' + ewarn 'opposed to root). You may need to move your /root/.pgpass' + ewarn 'file to /home/pgagent/.pgpass, and the new user will' + ewarn 'need permissions on any paths that it will access.' + fi +} diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild index 6a57669a88ac..7ea20e824c78 100644 --- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild +++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz" LICENSE="Apache-2.0" SLOT="4.2" -KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" CDEPEND="dev-java/avalon-logkit:2.0 diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild index 35b170e91a74..ae9c353e3e14 100644 --- a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ DESCRIPTION="Easy-to-use Java logging toolkit" HOMEPAGE="http://avalon.apache.org/" SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" -KEYWORDS="amd64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm64 ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" LICENSE="Apache-2.0" SLOT="2.0" IUSE="" diff --git a/dev-java/db4o-jdk11/db4o-jdk11-7.4-r1.ebuild b/dev-java/db4o-jdk11/db4o-jdk11-7.4-r1.ebuild new file mode 100644 index 000000000000..4aefb7fa3193 --- /dev/null +++ b/dev-java/db4o-jdk11/db4o-jdk11-7.4-r1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core files for the object database for Java" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=virtual/jre-1.6" +DEPEND=">=virtual/jdk-1.6" + +S="${WORKDIR}/${P}" diff --git a/dev-java/db4o-jdk12/db4o-jdk12-7.4-r1.ebuild b/dev-java/db4o-jdk12/db4o-jdk12-7.4-r1.ebuild new file mode 100644 index 000000000000..063fbf5321bf --- /dev/null +++ b/dev-java/db4o-jdk12/db4o-jdk12-7.4-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core files for the object database for Java" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +CDEPEND="dev-java/db4o-jdk11:0" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6" + +S="${WORKDIR}/${P}" + +JAVA_GENTOO_CLASSPATH="db4o-jdk11" + +src_prepare() { + default + rm -rv "${S}/test" || die +} diff --git a/dev-java/db4o-jdk5/db4o-jdk5-7.4-r1.ebuild b/dev-java/db4o-jdk5/db4o-jdk5-7.4-r1.ebuild new file mode 100644 index 000000000000..32f2db19b1a9 --- /dev/null +++ b/dev-java/db4o-jdk5/db4o-jdk5-7.4-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core files for the object database for Java" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="mirror://gentoo/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/${P}" + +CDEPEND=" + dev-java/db4o-jdk11:0 + dev-java/db4o-jdk12:0" + +RDEPEND=" + ${CDEPEND} + >=virtual/jre-1.6" + +DEPEND=" + ${CDEPEND} + >=virtual/jdk-1.6" + +JAVA_GENTOO_CLASSPATH="db4o-jdk11 db4o-jdk12" + +src_prepare() { + default + rm -rv "${S}/test" || die +} diff --git a/dev-lang/fpc/fpc-3.0.2.ebuild b/dev-lang/fpc/fpc-3.0.2.ebuild index 41b229acda54..f8ea1b5b8b4c 100644 --- a/dev-lang/fpc/fpc-3.0.2.ebuild +++ b/dev-lang/fpc/fpc-3.0.2.ebuild @@ -107,10 +107,10 @@ src_install() { #${WORKDIR}/${PN}build-${PV}/utils/fpcm/fpcmake" #fpcbuild-3.0.0/fpcsrc/utils/fpcm/bin/x86_64-linux/fpcmake set -- PP="${pp}" FPCMAKE="${S}/utils/fpcm/bin/${FPC_PARCH}-linux/fpcmake" \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_DOCDIR="${D}"/usr/share/doc/${PF} \ - INSTALL_MANDIR="${D}"/usr/share/man \ - INSTALL_SOURCEDIR="${D}"/usr/lib/fpc/${PV}/source + INSTALL_PREFIX="${ED}"/usr \ + INSTALL_DOCDIR="${ED}"/usr/share/doc/${PF} \ + INSTALL_MANDIR="${ED}"/usr/share/man \ + INSTALL_SOURCEDIR="${ED}"/usr/lib/fpc/${PV}/source emake -j1 "$@" compiler_install rtl_install packages_install utils_install @@ -135,23 +135,23 @@ src_install() { if use source ; then cd "${S}" || die shift - emake -j1 PP="${D}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall - find "${D}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; + emake -j1 PP="${ED}"/usr/bin/ppc${FPC_ARCH} "$@" sourceinstall + find "${ED}"/usr/lib/fpc/${PV}/source -name '*.o' -exec rm {} \; fi - "${D}"/usr/lib/fpc/${PV}/samplecfg "${D}"/usr/lib/fpc/${PV} "${D}"/etc || die + "${ED}"/usr/lib/fpc/${PV}/samplecfg "${ED}"/usr/lib/fpc/${PV} "${ED}"/etc || die - sed -i "s:${D}::g" "${D}"/etc/fpc.cfg || die + sed -i "s:${ED}::g" "${ED}"/etc/fpc.cfg || die if use ide ; then - sed -e "s:${D}::g" \ - -i "${D}"/etc/fppkg.cfg \ - -i "${D}"/etc/fppkg/* \ - -i "${D}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ + sed -e "s:${ED}::g" \ + -i "${ED}"/etc/fppkg.cfg \ + -i "${ED}"/etc/fppkg/* \ + -i "${ED}"/usr/lib/fpc/${PV}/ide/text/fp*.cfg \ || die fi - rm -r "${D}"/usr/lib/fpc/lexyacc || die + rm -r "${ED}"/usr/lib/fpc/lexyacc || die } pkg_postinst() { diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest index b558937b49c8..799d2df52b59 100644 --- a/dev-lang/vala/Manifest +++ b/dev-lang/vala/Manifest @@ -1,3 +1,4 @@ DIST vala-0.32.1.tar.xz 2759528 SHA256 dd0d47e548a34cfb1e4b04149acd082a86414c49057ffb79902eb9a508a161a9 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0 WHIRLPOOL d61a171cacb62f008e15408729b809f9a13f11880395526a9890ddfed1a41d0ad021c57c8d9d93ffdf6f99ee5231fffdb4fa1763d8b7238a8f62ae67f4aa22ca DIST vala-0.34.8.tar.xz 2778228 SHA256 22899bad63436ccfab4abc44face3bf4c1e4e72dea5891d67626dc360078c0a3 SHA512 03739173aa2b4e5d476037c77ac86543b97bd6eeb94f40dcce952da127e32baefa0dfa83f9d6e8ea254d4aee5ecd557964520926239bd119da72c771e30ece14 WHIRLPOOL b5874c5b08427d758fdd0e02f1f431296acc7451c609c75b06017e26ea11c835b89ddd1803de0a24f957b0c7f2ad6f4473c674b8cc76317a84c0d6d3b5ddaf8b DIST vala-0.34.9.tar.xz 2783952 SHA256 36662f77e36abf9ce6f46e3015c4512276e6361553bdcc2d75566ed83a1da19d SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f WHIRLPOOL acd16be2cfea35257f041e5dcf4e5b68fd06f55929b55dcbb95624bc25c3b4230ab6cda98ef5dad7fceb31958a33318897698aec5fdbc5ba33d766cfc083b5c5 +DIST vala-0.36.4.tar.xz 2846516 SHA256 e9f23ce711c1a72ce664d10946fbc5953f01b0b7f2a3562e7a01e362d86de059 SHA512 cc804b9ad0bda4968660084c5d5e38761b0d478a6c504d3d2e6188fdd2deef4a4315d7278191f19b3bcbee66e0b02733deb6050d168305c85cef8f203ecc13ac WHIRLPOOL 9763176101af16ae516e5183000297dcb629805d172be245bea5b02cebc04a7c3dd8227565c29170cd1ad896aef1f4a9bfd52ffebeb2ee024c0bd877a69ce348 diff --git a/dev-lang/vala/vala-0.36.4.ebuild b/dev-lang/vala/vala-0.36.4.ebuild new file mode 100644 index 000000000000..919b19f4a469 --- /dev/null +++ b/dev-lang/vala/vala-0.36.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="Compiler for the GObject type system" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1" +SLOT="0.36" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="test" + +RDEPEND=" + >=dev-libs/glib-2.32:2 + >=dev-libs/vala-common-${PV} +" +DEPEND="${RDEPEND} + !${CATEGORY}/${PN}:0 + dev-libs/libxslt + sys-devel/flex + virtual/pkgconfig + virtual/yacc + test? ( + dev-libs/dbus-glib + >=dev-libs/glib-2.26:2 ) +" + +src_configure() { + # weasyprint enables generation of PDF from HTML + gnome2_src_configure \ + --disable-unversioned \ + VALAC=: \ + WEASYPRINT=: +} diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest index 8ab6fa674b79..e519f56c9eee 100644 --- a/dev-libs/atk/Manifest +++ b/dev-libs/atk/Manifest @@ -1 +1,2 @@ DIST atk-2.22.0.tar.xz 745572 SHA256 d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6 SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba WHIRLPOOL aec1b3944101532b6330f66f2094d3d821a30da10e07d3ba1b793b9063ef18ce8790faa3d016927fe2dd8383c4b5cba9ac4d85244f83fbb73bd06077c299e851 +DIST atk-2.24.0.tar.xz 748972 SHA256 bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49 SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962 WHIRLPOOL 1db8a9bc87021dbfbde769c54e7f1b5547db00138f67690026f948b0202cfec6a29a5c9d3fa7fc19e53c67f973dd57160d0d664c68d1dc27aad88e5be4cc3fa1 diff --git a/dev-libs/atk/atk-2.24.0.ebuild b/dev-libs/atk/atk-2.24.0.ebuild new file mode 100644 index 000000000000..08f8c3c3323a --- /dev/null +++ b/dev-libs/atk/atk-2.24.0.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 multilib-minimal + +DESCRIPTION="GTK+ & GNOME Accessibility Toolkit" +HOMEPAGE="https://wiki.gnome.org/Accessibility" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="+introspection nls test" + +RDEPEND=" + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) +" +DEPEND="${RDEPEND} + >=dev-lang/perl-5 + dev-util/gtk-doc-am + >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + nls? ( >=sys-devel/gettext-0.19.2 ) +" + +src_prepare() { + gnome2_src_prepare + + if ! use test; then + # don't waste time building tests (bug #226353) + sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed failed" + fi + + # Building out of sources fails, https://bugzilla.gnome.org/show_bug.cgi?id=752507 + multilib_copy_sources +} + +multilib_src_configure() { +# ECONF_SOURCE=${S} \ + gnome2_src_configure \ + $(multilib_native_use_enable introspection) + + # work-around gtk-doc out-of-source brokedness +# if multilib_is_native_abi; then +# ln -s "${S}"/docs/html docs/html || die +# fi +} + +multilib_src_install() { + gnome2_src_install +} diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest index 69630b6e3cf9..34e2c7bc1a13 100644 --- a/dev-libs/libgweather/Manifest +++ b/dev-libs/libgweather/Manifest @@ -1 +1,2 @@ DIST libgweather-3.20.4.tar.xz 3342220 SHA256 7dcdc555c48461d07a198bc44e0e6ed39105d8513b12fa97c4590f5b2d912fc2 SHA512 65b28a2bf8e9e7d8b02972d1d2f701ac8668b1e91154ba7ee94e9a08bb98d28ce44e88842e2fe78a13ce9f942d79fd2950d8de266dae28bb262c5fc11328ada9 WHIRLPOOL f01170d5e7790c22b1bfba8b6cd0e7b90708a818be2dc12a698e5ab4babb3efb6dfc368d7538b546a893a1b17b11ed04ebb0050c62b368f8f354ad9102b3c6e8 +DIST libgweather-3.24.1.tar.xz 3350680 SHA256 1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c SHA512 564464d7a18a8e0320871ea418b1163163941c950c5acea5ee65a087e44c4d81e019e2e3e4cb6751989f823cbb7c5691713d3dcef72aeaf6ff264e61b6f7b4b4 WHIRLPOOL 82ac37983c7c8f683b958d005f35b6eef72f5bffdfeebaca4ae903f41816d8fd3f1da6a162689b4880c05739d7d2a1238ff1277dd7694d857087b4c5a488c71f diff --git a/dev-libs/libgweather/libgweather-3.24.1.ebuild b/dev-libs/libgweather/libgweather-3.24.1.ebuild new file mode 100644 index 000000000000..b746855aad33 --- /dev/null +++ b/dev-libs/libgweather/libgweather-3.24.1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VALA_USE_DEPEND="vapigen" + +inherit gnome2 vala + +DESCRIPTION="Library to access weather information from online services" +HOMEPAGE="https://wiki.gnome.org/Projects/LibGWeather" + +LICENSE="GPL-2+" +SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix) + +IUSE="glade +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" + +COMMON_DEPEND=" + >=x11-libs/gtk+-3.13.5:3[introspection?] + >=dev-libs/glib-2.35.1:2 + >=net-libs/libsoup-2.44:2.4 + >=dev-libs/libxml2-2.6.0:2 + sci-geosciences/geocode-glib + >=sys-libs/timezone-data-2010k + + glade? ( >=dev-util/glade-3.16:3.10 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) +" +RDEPEND="${COMMON_DEPEND} + ! "${S}/cmake/HostCFlags.cmake" + sed -i -e "s/LINK_FLAGS_RELWITHDEBINFO \" \"/LINK_FLAGS_RELWITHDEBINFO \" ${LDFLAGS} \"/" cmake/DefaultCFlags.cmake || die + local mycmakeargs=( + "-DUSE_EXTERNAL_URDF=ON" + "-DUSE_EXTERNAL_TINYXML=ON" + ) + cmake-utils_src_configure +} diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest index b558937b49c8..799d2df52b59 100644 --- a/dev-libs/vala-common/Manifest +++ b/dev-libs/vala-common/Manifest @@ -1,3 +1,4 @@ DIST vala-0.32.1.tar.xz 2759528 SHA256 dd0d47e548a34cfb1e4b04149acd082a86414c49057ffb79902eb9a508a161a9 SHA512 d59db1bd9132f93f187c30ccabff9d21fe8685293a6494e5b009d883de4f844cc4b8dc5d3b6eb4e026a93490f2e4ff7ba83ff22a093c6f8f85e68d83f5fe1bb0 WHIRLPOOL d61a171cacb62f008e15408729b809f9a13f11880395526a9890ddfed1a41d0ad021c57c8d9d93ffdf6f99ee5231fffdb4fa1763d8b7238a8f62ae67f4aa22ca DIST vala-0.34.8.tar.xz 2778228 SHA256 22899bad63436ccfab4abc44face3bf4c1e4e72dea5891d67626dc360078c0a3 SHA512 03739173aa2b4e5d476037c77ac86543b97bd6eeb94f40dcce952da127e32baefa0dfa83f9d6e8ea254d4aee5ecd557964520926239bd119da72c771e30ece14 WHIRLPOOL b5874c5b08427d758fdd0e02f1f431296acc7451c609c75b06017e26ea11c835b89ddd1803de0a24f957b0c7f2ad6f4473c674b8cc76317a84c0d6d3b5ddaf8b DIST vala-0.34.9.tar.xz 2783952 SHA256 36662f77e36abf9ce6f46e3015c4512276e6361553bdcc2d75566ed83a1da19d SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f WHIRLPOOL acd16be2cfea35257f041e5dcf4e5b68fd06f55929b55dcbb95624bc25c3b4230ab6cda98ef5dad7fceb31958a33318897698aec5fdbc5ba33d766cfc083b5c5 +DIST vala-0.36.4.tar.xz 2846516 SHA256 e9f23ce711c1a72ce664d10946fbc5953f01b0b7f2a3562e7a01e362d86de059 SHA512 cc804b9ad0bda4968660084c5d5e38761b0d478a6c504d3d2e6188fdd2deef4a4315d7278191f19b3bcbee66e0b02733deb6050d168305c85cef8f203ecc13ac WHIRLPOOL 9763176101af16ae516e5183000297dcb629805d172be245bea5b02cebc04a7c3dd8227565c29170cd1ad896aef1f4a9bfd52ffebeb2ee024c0bd877a69ce348 diff --git a/dev-libs/vala-common/vala-common-0.36.4.ebuild b/dev-libs/vala-common/vala-common-0.36.4.ebuild new file mode 100644 index 000000000000..01ce4db1896f --- /dev/null +++ b/dev-libs/vala-common/vala-common-0.36.4.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME_ORG_MODULE="vala" + +inherit gnome.org + +DESCRIPTION="Build infrastructure for packages that use Vala" +HOMEPAGE="https://wiki.gnome.org/Projects/Vala" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris" +IUSE="" + +# Previously ${PN} was part of dev-lang/vala +RDEPEND=" + ! /dev/null + eend $? + fi + if has_version ' /dev/null + eend $? + fi + if has_version ' /dev/null + eend $? + fi + if has_version ' /dev/null + eend $? + if [[ -f "${EROOT}usr/share/vala-0.16/Makefile.vapigen" ]]; then + ebegin "Removing old vala-0.16 makefile template" + rm "${EROOT}usr/share/vala-0.16/Makefile.vapigen" &> /dev/null + eend $? + fi + fi + if has_version ' /dev/null + eend $? + if [[ -f "${EROOT}usr/share/vala-0.18/Makefile.vapigen" ]]; then + ebegin "Removing old vala-0.18 makefile template" + rm "${EROOT}usr/share/vala-0.18/Makefile.vapigen" &> /dev/null + eend $? + fi + fi +} diff --git a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild index 497abb789619..34c0065754f1 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild +++ b/dev-lua/luafilesystem/luafilesystem-1.6.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/keplerproject/luafilesystem/archive/v${MY_PV}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~x86 ~x86-fbsd" IUSE="luajit" RDEPEND=" diff --git a/dev-ml/capnp-ocaml/Manifest b/dev-ml/capnp-ocaml/Manifest index c751b113fede..306b87f25b91 100644 --- a/dev-ml/capnp-ocaml/Manifest +++ b/dev-ml/capnp-ocaml/Manifest @@ -1 +1,2 @@ DIST capnp-ocaml-2.1.1.tar.gz 189731 SHA256 b4718b650c51ba05292afcbd1cb0ddfbd3efc7e160c65736538434b76c9cd931 SHA512 79083c2f387d6055a2cab45230b97f579a727418d55be13d3ca0135efd8561787b772012ed7f6f3277f9a34df3cb4684242bd754e048fbe77e4c8ba8ff9faf93 WHIRLPOOL c7b697cc8a2e2d26900a2845140d302da8b81aa5cdd8cfc0fd1ff95b8193b3f51185e7da3275b76582d98a7b03808c21e7eafb98d55e3d9ac700aac0ac614f68 +DIST capnp-ocaml-3.0.0.tar.gz 140985 SHA256 01b5380d4d4ec5392c91036787d93a553055ad403ff41d2cf73caff25a9098cc SHA512 5cdf678fa80e67c552f60123f1d04eb5facad81e6c29661c2234c06bbcb98312d1eba96f81f3e747fef0b4de986aff07b69aafcbfde60873ba40452a66d75075 WHIRLPOOL 2b6f04034c81dd0d01089b3ff39c681dab98a665ade944ca5d21014bb2d61b5bcaa4e4545e65d2829e9a837b44423cca580e7c6ca87a62d55c33e81caf859e3e diff --git a/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild new file mode 100644 index 000000000000..7820e1bd3298 --- /dev/null +++ b/dev-ml/capnp-ocaml/capnp-ocaml-3.0.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit opam + +DESCRIPTION="OCaml code generator plugin for the Cap'n Proto serialization framework" +HOMEPAGE="https://github.com/pelzlpj/capnp-ocaml" +SRC_URI="https://github.com/pelzlpj/capnp-ocaml/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD-2" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=" + dev-ml/core_kernel:= + dev-ml/ocaml-extunix:= + dev-ml/ocplib-endian:= + dev-ml/res:= + dev-ml/ocaml-uint:= + dev-libs/capnproto:= +" +DEPEND="${RDEPEND} + test? ( dev-ml/core:= dev-ml/ounit ) + dev-ml/jbuilder +" + +src_install() { + opam_src_install capnp +} diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest index c948f5ef4d6a..eccbbd77f0d6 100644 --- a/dev-ml/core/Manifest +++ b/dev-ml/core/Manifest @@ -1,2 +1 @@ -DIST core-0.9.0.tar.gz 734916 SHA256 3af762b2116225f8544549e81a6ebfd9155f71ba3707eedfa98038aa76bcb4b1 SHA512 733fae8552ddb0842455d625786de4a76979b40bee6503954ff77493bad2d5bad143f39f8091fd3b76562edfd14f2a2c9a4e1ec1a11fcf023aac39308d23083c WHIRLPOOL ebc9e79916dafeac71a412058958a2842ca1346f57c52048c2c1cf2588149df10ae6b130a383bfd844b99fc13fad24f2150006841eee2d36e449f224b2d27190 DIST core-0.9.1.tar.gz 735006 SHA256 a8d34b76afd8ad5ac525471e7f01d4291203a4b83b9e3051314af13cb169a3ba SHA512 2d4a7ff753cb0415cc6a957fff53037aad65053d3c3531070663b4bcf4462982c811a586a39ea3a223aca02cae9212c300b6788266ac60213437dc99ecc0a29a WHIRLPOOL c6e6a9f2e9f29ad04b5850706f116ae23d2cb26550dc1113653c0c857f9f183a9dc6644121aeff2526ef7fd48a4fadc7b8407d615fe3395cf0f526891aaa6699 diff --git a/dev-ml/core/core-0.9.0.ebuild b/dev-ml/core/core-0.9.1-r1.ebuild similarity index 71% rename from dev-ml/core/core-0.9.0.ebuild rename to dev-ml/core/core-0.9.1-r1.ebuild index 64835cb4c69c..45cc74eb4553 100644 --- a/dev-ml/core/core-0.9.0.ebuild +++ b/dev-ml/core/core-0.9.1-r1.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Jane Street's alternative to the standard library" HOMEPAGE="https://github.com/janestreet/core" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,7 +15,6 @@ KEYWORDS="~amd64" IUSE="" RDEPEND=" - dev-lang/ocaml:= dev-ml/base:= dev-ml/configurator:= dev-ml/core_kernel:= @@ -25,12 +26,5 @@ RDEPEND=" dev-ml/stdio:= dev-ml/ocaml-migrate-parsetree:= " -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND} dev-ml/jbuilder" +PATCHES=( "${FILESDIR}/glibc225.patch" ) diff --git a/dev-ml/core/core-0.9.1.ebuild b/dev-ml/core/core-0.9.1.ebuild deleted file mode 100644 index 64835cb4c69c..000000000000 --- a/dev-ml/core/core-0.9.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Jane Street's alternative to the standard library" -HOMEPAGE="https://github.com/janestreet/core" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/configurator:= - dev-ml/core_kernel:= - dev-ml/ppx_assert:= - dev-ml/ppx_driver:= - dev-ml/ppx_jane:= - dev-ml/sexplib:= - dev-ml/spawn:= - dev-ml/stdio:= - dev-ml/ocaml-migrate-parsetree:= -" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/core/files/glibc225.patch b/dev-ml/core/files/glibc225.patch new file mode 100644 index 000000000000..1dd96c8b7b4b --- /dev/null +++ b/dev-ml/core/files/glibc225.patch @@ -0,0 +1,12 @@ +Index: core-0.9.1/src/unix_stubs.c +=================================================================== +--- core-0.9.1.orig/src/unix_stubs.c ++++ core-0.9.1/src/unix_stubs.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + #define stat64 stat diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild index f094afad03be..28df8234f9ed 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-5.0.9999.ebuild @@ -19,7 +19,7 @@ EGIT_BRANCH="release_50" # Keep in sync with sys-devel/llvm ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ X86 XCore ) + NVPTX PowerPC Sparc SystemZ X86 XCore ) ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild index d5f507e9e101..b4f26a2e7dd5 100644 --- a/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild +++ b/dev-ml/llvm-ocaml/llvm-ocaml-9999.ebuild @@ -17,8 +17,10 @@ EGIT_REPO_URI="https://git.llvm.org/git/llvm.git https://github.com/llvm-mirror/llvm.git" # Keep in sync with sys-devel/llvm +ALL_LLVM_EXPERIMENTAL_TARGETS=( AVR Nios2 RISCV WebAssembly ) ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ X86 XCore ) + NVPTX PowerPC Sparc SystemZ X86 XCore + "${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" ) ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} @@ -72,7 +74,10 @@ src_configure() { -DBUILD_SHARED_LIBS=ON -DLLVM_OCAML_OUT_OF_TREE=ON - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" -DLLVM_BUILD_TESTS=$(usex test) # disable various irrelevant deps and settings diff --git a/dev-ml/ocaml-migrate-parsetree/Manifest b/dev-ml/ocaml-migrate-parsetree/Manifest index 415d86f48f85..44638dffc9b8 100644 --- a/dev-ml/ocaml-migrate-parsetree/Manifest +++ b/dev-ml/ocaml-migrate-parsetree/Manifest @@ -1,2 +1 @@ -DIST ocaml-migrate-parsetree-1.0.1.tar.gz 206070 SHA256 8655a95abcd1ef9e05219db19fb0f1eb79cf502276c9e8d007446575c3cbdf7f SHA512 de9992e4e8e9bbda6fcaeaab794f88f695ea69ed63ab083fb1746db53127a80d7dcc19b843c7dc9e2fa01132eacf89b000639c76c89d1010a6c4f6508af73a52 WHIRLPOOL ec9833768ec35d9d9838e47c35f34e680c0ce0e326d6b3cfe62f3016b96e8f031fcb84ddc5f5fe805dfe0dff5c82968ac44a2240c7133aeb1d3497d201ce1e22 -DIST ocaml-migrate-parsetree-1.0.2.tar.gz 206992 SHA256 3fe2aca50b720a5c9075a9e8260787d55f2555e8f809e09d7652976b3f2885d2 SHA512 718d87563369bb4d52f20f34f16d4a1ec92326cbd3e9bab9fd54aff7eecd70226da74e5398a2d7c3a6a8f4c2a53f7141e23ee734cc038096d659044bddbc3880 WHIRLPOOL 677a896b79352071b44808ffaf363b0dd7488eb166bd428ce53fb81d0968e8183f2e204ea8dd0e48609cd41dd09d47cc25a9418f344c8eff0bbd420f2ebeee81 +DIST ocaml-migrate-parsetree-1.0.3.tar.gz 208080 SHA256 5f33bf9d522508930728963dabfa625350fa86a5632bb0b443ecc5bb0b64f852 SHA512 ba797ecb8635988e23d0ff17c1261b7bf5b99fc1238de7ea4adadb429b36d52f5d37b3f8958a6dd41595a99ab42ab43a75c8d22e8972ce1565ce830f4f92f7df WHIRLPOOL 7103b97dfb436eaffa7d55bc618aa976973287baad30b86106c674ff57a83b7ab5243cb55e6b40892688d869615ca4a5609a2f05740f4171d3b1a09a051c941e diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild deleted file mode 100644 index aba009af1d8f..000000000000 --- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit findlib - -DESCRIPTION="Convert OCaml parsetrees between different major versions" -HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree" -SRC_URI="https://github.com/let-def/ocaml-migrate-parsetree/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/result:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${PN}.install || die -} diff --git a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.2.ebuild b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.3.ebuild similarity index 61% rename from dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.2.ebuild rename to dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.3.ebuild index 57316b1bc302..da28219a5424 100644 --- a/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.2.ebuild +++ b/dev-ml/ocaml-migrate-parsetree/ocaml-migrate-parsetree-1.0.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit findlib +inherit findlib opam DESCRIPTION="Convert OCaml parsetrees between different major versions" HOMEPAGE="https://github.com/let-def/ocaml-migrate-parsetree" @@ -14,20 +14,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="" -DEPEND=" - dev-lang/ocaml:= - dev-ml/result:= -" +DEPEND="dev-ml/result:=" RDEPEND="${DEPEND}" DEPEND="${DEPEND} - dev-ml/jbuilder - dev-ml/opam" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - --mandir="${ED}/usr/share/man" \ - ${PN}.install || die -} + dev-ml/jbuilder" diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest index ea8cb71ea583..c3c2d91e94d4 100644 --- a/dev-ml/ocamlnet/Manifest +++ b/dev-ml/ocamlnet/Manifest @@ -1,2 +1,3 @@ DIST ocamlnet-4.1.2.tar.gz 4623183 SHA256 918c3921529cfe545e206b3535a58f43f665165044dd3548f685b583e94f14d8 SHA512 69f42042a54efd662db2217224da53513fc7e72c7b2313d4a4a1128f1b4624f4f6298434f5b19f354b832119ff151abc81e85eb0108d6eb24f30f82d176e0b4d WHIRLPOOL 27e1a8eb24361cadb8b2fb2b61bc6e93d71be8290873ca5bb1eebe16b9c9b1db69eae3b20c8deb3f6656aa79171a817b15acae53159d80ff8f4c946c201de173 DIST ocamlnet-4.1.3.tar.gz 4553037 SHA256 8a01393ed26c5475bba89aab928e9aa8a366af1e810416d9c916265a7f1cd5c5 SHA512 683ab6f529639c9da01478ba8ba7a1bf89a418ad3872331bb3e29067c0a75ddc0db996630ce5a5dd116967d6e3e756ade02d9a78b865bbc226f95d01af9e3956 WHIRLPOOL 56f2772ea02bbf9c3166d13797083cabc8a8dad8f8c53be7796361383f7c9ff9406e0d273d402a2415b3f5437b163977ad7f5a1bfccb46994de552dd4ebd1acb +DIST ocamlnet-4.1.4.tar.gz 4552969 SHA256 46c3dace26123bdded9fd5ee841a18ede47d4b940e9320ce1db168d5891e1142 SHA512 ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0 WHIRLPOOL aab363eaae3528f792218ec360a4dbf927984e6bd85d4bf5eb6292f64da035b6ed67957a43ef8df62208425cbafe4582b65c07e150600db591f76f9483bd46ff diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild new file mode 100644 index 000000000000..1460d03f5cc4 --- /dev/null +++ b/dev-ml/ocamlnet/ocamlnet-4.1.4.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils findlib + +MY_P=${P/_beta/test} +DESCRIPTION="Modules for OCaml application-level Internet protocols" +HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html" +SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz" + +LICENSE="ZLIB GPL-2+" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" +IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip" +RESTRICT="installsources" + +# the auth-dh compile flag has been disabled as well, since it depends on +# ocaml-cryptgps, which is not available. + +RDEPEND=">=dev-ml/findlib-1.0 + pcre? ( >=dev-ml/pcre-ocaml-5:= ) + >=dev-lang/ocaml-3.10.2:=[ocamlopt?] + tk? ( dev-ml/labltk:= ) + ssl? ( net-libs/gnutls:= ) + gtk? ( >=dev-ml/lablgtk-2:= ) + kerberos? ( virtual/krb5 ) + zip? ( dev-ml/camlzip:= ) + " +DEPEND="${RDEPEND} + virtual/pkgconfig +" + +S=${WORKDIR}/${MY_P} + +ocamlnet_use_with() { + if use $1; then + echo "-with-$2" + else + echo "-without-$2" + fi +} + +ocamlnet_use_enable() { + if use $1; then + echo "-enable-$2" + else + echo "-disable-$2" + fi +} + +src_configure() { + ./configure \ + -bindir /usr/bin \ + -datadir /usr/share/${PN} \ + $(ocamlnet_use_enable ssl gnutls) \ + $(ocamlnet_use_enable gtk gtk2) \ + $(ocamlnet_use_enable kerberos gssapi) \ + $(ocamlnet_use_enable pcre pcre) \ + $(ocamlnet_use_enable tk tcl) \ + $(ocamlnet_use_enable zip zip) \ + $(ocamlnet_use_with httpd nethttpd) \ + || die "Error : econf failed!" +} + +src_compile() { + emake -j1 all + if use ocamlopt; then + emake -j1 opt + fi +} + +src_install() { + export STRIP_MASK="*/bin/*" + findlib_src_install +} diff --git a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild b/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild index 8efaec8c338f..e46e6394889f 100644 --- a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild +++ b/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="PPX rewriter that generates hash functions from type expressions and definitions" HOMEPAGE="https://github.com/janestreet/ppx_hash" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,7 +15,6 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_compare:= dev-ml/ppx_core:= @@ -24,12 +25,4 @@ DEPEND=" dev-ml/ocaml-migrate-parsetree:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_here/Manifest b/dev-ml/ppx_here/Manifest index 79bf22ad2232..e9efc9752bfe 100644 --- a/dev-ml/ppx_here/Manifest +++ b/dev-ml/ppx_here/Manifest @@ -1,2 +1 @@ -DIST ppx_here-0.9.0.tar.gz 7510 SHA256 789eebb555a21030ce0df639499122c95e1ca864ac3b5f2838a4a7d197aa7163 SHA512 2119b1b376cf44dd7eece5184816866e2cdfbf22b7792979718c76f4a2b381c48e149b1e12ff7ef800f96584cbe42bcff7a0249dca3b51e7bdd80da62f4f0cd2 WHIRLPOOL db46fac7a98173bca3cdf905bb44b3a2debfc97f695a8ec2f3dd054470f01c911104801296fc220ed3355f8428c3621d32d4b82f1013500304e80d960b5162af DIST ppx_here-0.9.1.tar.gz 7225 SHA256 0cd908cb9a62a537af69e6c6e1923d416ef44b47d5d1f18ea7131b000058cfdd SHA512 ca21fb490a4d980616349850b781e4ee02c0eb8a27e8ef9d4092d15ee235ffc504dab1b2a3db44fc6a84fa6b2cdbd67c0c4adbc41fb094b7bb9d4f710193aaf2 WHIRLPOOL daef00dd762c91a1ce253282abcfaf2db81f3d81ad9e963723a864fc315c408442f67260640748cb51771c138e21353dc81dece323f0c1520b1de2c36fb538e1 diff --git a/dev-ml/ppx_here/ppx_here-0.9.0.ebuild b/dev-ml/ppx_here/ppx_here-0.9.0.ebuild deleted file mode 100644 index 40ed6efdfd85..000000000000 --- a/dev-ml/ppx_here/ppx_here-0.9.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Expands [%here] into its location" -HOMEPAGE="https://github.com/janestreet/ppx_here" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_optcomp:= - dev-ml/ocaml-migrate-parsetree:= -" -RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/ppx_here/ppx_here-0.9.1.ebuild b/dev-ml/ppx_here/ppx_here-0.9.1.ebuild index 40ed6efdfd85..972fc65d0d4b 100644 --- a/dev-ml/ppx_here/ppx_here-0.9.1.ebuild +++ b/dev-ml/ppx_here/ppx_here-0.9.1.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Expands [%here] into its location" HOMEPAGE="https://github.com/janestreet/ppx_here" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,19 +15,10 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_optcomp:= dev-ml/ocaml-migrate-parsetree:= " RDEPEND="${DEPEND}" -DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${RDEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_import/Manifest b/dev-ml/ppx_import/Manifest index 9b5252b25a1e..a4644c2a9d6e 100644 --- a/dev-ml/ppx_import/Manifest +++ b/dev-ml/ppx_import/Manifest @@ -1,2 +1 @@ -DIST ppx_import-1.1.tar.gz 12951 SHA256 083f06119fa836939bec273340828c6f2c103cd88bdf775584d2036b8f4d0f5f SHA512 24a1db1f216518fb1302f8de2984bab5ffd33cbabe311d449e3767a96a63b386d11cdfd8f783d48169523a0535754b044841821aa24533d1d1127eb4a8aa42d6 WHIRLPOOL 479223751d0e180e4df3e4e7e36b774ded8284bcf8f67054518dabc6e3c16aae538a964ea4a01528caf78b388f1cd48e3dd487bb141bd0a315c622cd531fb637 DIST ppx_import-1.2.tar.gz 13244 SHA256 f102bcefe72b8a1007ce9854baefac0c20930fe9db71fc81213e13e35016dfe2 SHA512 384a8f955573c66962383f0e3609e4764cb0056e7d5b7e5811fd9fd17e17ac58baea330131b8eb688cd4202d6e6bd5829fba024524f027201244ff10c86e0f01 WHIRLPOOL 53665ec4ab8109bc762c094535d2082befd887af28cd836bcc4f19e41d924d83e140ef4d660166d7d3198042213bed0275e72c1c58650c58039aa5abd25441d2 diff --git a/dev-ml/ppx_import/ppx_import-1.1.ebuild b/dev-ml/ppx_import/ppx_import-1.1.ebuild deleted file mode 100644 index 4bb61dd8e171..000000000000 --- a/dev-ml/ppx_import/ppx_import-1.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="A syntax extension for importing declarations from interface files" -HOMEPAGE="https://github.com/whitequark/ppx_import" -SRC_URI="https://github.com/whitequark/ppx_import/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="+ocamlopt test" - -DEPEND=" - dev-lang/ocaml:=[ocamlopt?] - dev-ml/ppx_tools:= - dev-ml/cppo:= -" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} - test? ( dev-ml/ounit dev-ml/ppx_deriving ) - dev-ml/opam - dev-ml/ocamlbuild - dev-ml/findlib -" - -src_compile() { - cp pkg/META.in pkg/META - ocaml pkg/build.ml \ - native=$(usex ocamlopt true false) \ - native-dynlink=$(usex ocamlopt true false) \ - || die -} - -src_test() { - ocamlbuild -classic-display -use-ocamlfind src_test/test_ppx_import.byte -- || die -} - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${T}/dontinstallit" \ - ${PN}.install || die - dodoc CHANGELOG.md README.md -} diff --git a/dev-ml/ppx_import/ppx_import-1.2.ebuild b/dev-ml/ppx_import/ppx_import-1.2.ebuild index 4bb61dd8e171..efecbd3f7200 100644 --- a/dev-ml/ppx_import/ppx_import-1.2.ebuild +++ b/dev-ml/ppx_import/ppx_import-1.2.ebuild @@ -3,6 +3,8 @@ EAPI=5 +inherit opam + DESCRIPTION="A syntax extension for importing declarations from interface files" HOMEPAGE="https://github.com/whitequark/ppx_import" SRC_URI="https://github.com/whitequark/ppx_import/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -20,7 +22,6 @@ DEPEND=" RDEPEND="${DEPEND}" DEPEND="${DEPEND} test? ( dev-ml/ounit dev-ml/ppx_deriving ) - dev-ml/opam dev-ml/ocamlbuild dev-ml/findlib " @@ -36,12 +37,3 @@ src_compile() { src_test() { ocamlbuild -classic-display -use-ocamlfind src_test/test_ppx_import.byte -- || die } - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${T}/dontinstallit" \ - ${PN}.install || die - dodoc CHANGELOG.md README.md -} diff --git a/dev-ml/ppx_inline_test/Manifest b/dev-ml/ppx_inline_test/Manifest index 91836adf585f..d94fe3c60620 100644 --- a/dev-ml/ppx_inline_test/Manifest +++ b/dev-ml/ppx_inline_test/Manifest @@ -1,3 +1 @@ -DIST ppx_inline_test-0.9.0.tar.gz 19059 SHA256 c69968b180d524a13712bba3869078fe224f4214fa65a8713cc3e309075af9bf SHA512 639614beaeb4aedd5450062f90a42898db24347f94f1595fc9adad2a837a54723e6f92e72b16709cb15a18c0b9ae3eb7089cc92bb239266a0d6d7e82f5f9e642 WHIRLPOOL 796dac694898c26ebb5d727de82cabcd8391ab01748a2f8ce725965b50b0cf1ee394ce3a5cb0c8f228379852ee76cea5897272bd1857e3f597936608311d3461 -DIST ppx_inline_test-0.9.1.tar.gz 19262 SHA256 04409caa79873ccaed8ff2e32d70fec9258477bf5c414654d8e7d26006668443 SHA512 c3ef0db2a79523c3c223db19f80ceef207aec1f354e2ff746049c81bdea6dd3a4cd0e24c8f1fe99be17f03b47ae201823849f9204a2a990a9eb6794d8d26b95a WHIRLPOOL 1afcfa11575a5c78306783ff93d2afe5ded5a8bc6e6c03e6ef1302b5d5423a463aca4994a4a95588e49f9e4e12b8b05ac9bb84044347b37875c1a308486410de DIST ppx_inline_test-0.9.2.tar.gz 19280 SHA256 fee108d69d12efab43c0100dc49e021d253957d6f352ed99af0b4149c75e12d0 SHA512 39261a51201b2b7fbd6f4f53c72b2921da9f5a47f726479f65f976ed3979630f0a8587328f4536e42d24315d341afbe2770084ffd951569564a3145cd154be5f WHIRLPOOL ed66b9e67859868a4c2ae75dfe0b5c93fa211330952772d35ff2d99fa754b87228f95b9e21fc0289d4aa5f153dba93382abe7463592b78e49b7b6c3e321c0e2d diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.0.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.0.ebuild deleted file mode 100644 index 573ce0ffcdf1..000000000000 --- a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" -HOMEPAGE="https://github.com/janestreet/ppx_inline_test" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ocaml-migrate-parsetree:= -" - -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild deleted file mode 100644 index 68e2df835200..000000000000 --- a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.1.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" -HOMEPAGE="https://github.com/janestreet/ppx_inline_test" -SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=" - dev-lang/ocaml:= - dev-ml/base:= - dev-ml/ppx_core:= - dev-ml/ppx_driver:= - dev-ml/ppx_metaquot:= - dev-ml/ppx_traverse_builtins:= - dev-ml/ocaml-migrate-parsetree:= -" - -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} diff --git a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild index 68e2df835200..16f96131b7a0 100644 --- a/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild +++ b/dev-ml/ppx_inline_test/ppx_inline_test-0.9.2.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Syntax extension for writing in-line tests in ocaml code" HOMEPAGE="https://github.com/janestreet/ppx_inline_test" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,7 +15,6 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-lang/ocaml:= dev-ml/base:= dev-ml/ppx_core:= dev-ml/ppx_driver:= @@ -23,12 +24,4 @@ DEPEND=" " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild index 474e824f7f87..4daefb2677a4 100644 --- a/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild +++ b/dev-ml/ppx_jane/ppx_jane-0.9.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Standard Jane Street ppx rewriters" HOMEPAGE="https://github.com/janestreet/ppx_jane" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,7 +15,6 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-lang/ocaml:= dev-ml/ppx_assert:= dev-ml/ppx_base:= dev-ml/ppx_bench:= @@ -36,12 +37,4 @@ DEPEND=" dev-ml/ocaml-migrate-parsetree:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild b/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild index b04e6622ad19..c3073a6a798b 100644 --- a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild +++ b/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Code style checker for Jane Street Packages" HOMEPAGE="https://github.com/janestreet/ppx_js_style" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,7 +15,6 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ppx_metaquot:= @@ -21,12 +22,4 @@ DEPEND=" dev-ml/octavius:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_let/ppx_let-0.9.0.ebuild b/dev-ml/ppx_let/ppx_let-0.9.0.ebuild index cae7df67e6aa..9dc54d315fe3 100644 --- a/dev-ml/ppx_let/ppx_let-0.9.0.ebuild +++ b/dev-ml/ppx_let/ppx_let-0.9.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Monadic let-bindings" HOMEPAGE="https://github.com/janestreet/ppx_let" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -13,18 +15,9 @@ KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-lang/ocaml:= dev-ml/ppx_core:= dev-ml/ppx_driver:= dev-ml/ocaml-migrate-parsetree:= " RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder" - -src_install() { - opam-installer -i \ - --prefix="${ED}/usr" \ - --libdir="${D}/$(ocamlc -where)" \ - --docdir="${ED}/usr/share/doc/${PF}" \ - ${PN}.install || die -} +DEPEND="${DEPEND} dev-ml/jbuilder" diff --git a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild index 208ea1b93359..337130032b03 100644 --- a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild +++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit opam + DESCRIPTION="Write OCaml AST fragment using OCaml syntax" HOMEPAGE="https://github.com/janestreet/ppx_metaquot" SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" @@ -20,12 +22,4 @@ DEPEND="