diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-04-29 22:09:43 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-04-29 22:09:43 +0000 |
| commit | 04dfe7134566259f943ad03abc136d4fd87c14f5 (patch) | |
| tree | 3c2dfd11633190447d93f1d8ea970c30d059b0f4 | |
| parent | 2020-04-29 21:30:29 UTC (diff) | |
| parent | sci-mathematics/slepc: version bump to 3.13.1; remove old (diff) | |
| download | gentoo-04dfe7134566259f943ad03abc136d4fd87c14f5.tar.gz gentoo-04dfe7134566259f943ad03abc136d4fd87c14f5.tar.bz2 gentoo-04dfe7134566259f943ad03abc136d4fd87c14f5.zip | |
Merge updates from master
44 files changed, 859 insertions, 774 deletions
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 2a58e0d3b3db..4b7bc888df5a 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -7,6 +7,4 @@ DIST lucene-grouping-7.1.0.jar 87200 BLAKE2B 93f4ca6938b3fbc74752e22ee9d53022a60 DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b967243289d9bded5e9768cb441a35fabbe63641d00b72a8c14aace0bad402df49c21b853f620bf81bc1e829dcecdb SHA512 34df5eccf0577ed037ef347adc9c2552c49d57e35dbff629fdbb860926765be48f8b06fd693bdacfc2edcd9c6ad711c13fe98e5317cb1d1f2157dcab938e34ea DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 -DIST openjfx-11.0.6_p2.tar.bz2 63971065 BLAKE2B e68cebef34c39b163bf9de5f7184a363553650921bcf86ea338d6cbb583cc66056c3f5d8ff593b320ee38afd9daf738ffe041de6a90062e35e59274ad0242c9d SHA512 7112a7f4a02f36c131892953d76f6a8d82bdce69b67479091187045d78c090f6b4bc8f21b6df259f154c3d0ae87866566eca50ef2741ed440d62655c36e20f3c -DIST openjfx-11.0.7_p0.tar.bz2 63969275 BLAKE2B 50f30cf736ff8713f0be5c4404d6494a96bdaf23082eff8b83ecd704fb417d7e54502f0e0fff9a993d814d9ed9cec98f152487bc96bf929a67b74ec08615f053 SHA512 54b1b010800d3edfc9bb1319860fceab2083d77cbcb45ebe4baefbecf7e0ac2756cb24470cf4c9e7f53d44d7bf345c5f869f9d50748da6bb9d8be8bf1e325ec3 DIST openjfx-11.0.7_p1.tar.bz2 64302415 BLAKE2B 1a0705b5a668025dd73cc92af35b9e33d698adb1130dace1c079e20f6f6a848517102fe28f7e5e62a141fdfbd6f8086e9a2bb96573a597245d935e5d80918c4c SHA512 ff2b0af1d4b18963bd8ce26c20ab1def268fec8e6030732336edec3aedf58f8bdc25b61b3cd1d70c7d814a3ee96413965f26fba2426c083338c62d8483e93564 diff --git a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild b/dev-java/openjfx/openjfx-11.0.6_p2.ebuild deleted file mode 100644 index 23574d61505c..000000000000 --- a/dev-java/openjfx/openjfx-11.0.6_p2.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV=${PV/_p/+} -SLOT=${MY_PV%%[.+]*} -EGRADLE_VER="4.8" - -inherit flag-o-matic java-pkg-2 multiprocessing - -DESCRIPTION="Java OpenJFX client application platform" -HOMEPAGE="https://openjfx.io" - -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar - https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar - https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar - https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" - -IUSE="cpu_flags_x86_sse2 debug doc source +media" - -RDEPEND=" - dev-java/swt:4.10[cairo,opengl] - dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - media-libs/fontconfig:1.0 - media-video/ffmpeg:0= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/cairo[glib] - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/jpeg - virtual/opengl - || ( - dev-java/openjdk-bin:${SLOT}[doc?] - dev-java/openjdk:${SLOT}[doc?] - ) -" - -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip - >=dev-java/ant-core-1.10.7-r1:0 - dev-java/antlr:0 - dev-java/antlr:3.5 - dev-java/hamcrest-core:0 - dev-java/stringtemplate:0 - virtual/ttf-fonts - virtual/pkgconfig -" - -REQUIRED_USE="cpu_flags_x86_sse2" - -PATCHES=( - "${FILESDIR}"/11/disable-buildSrc-tests.patch - "${FILESDIR}"/11/glibc-compatibility.patch - "${FILESDIR}"/11/respect-user-cflags.patch - "${FILESDIR}"/11/use-system-swt-jar.patch -) - -S="${WORKDIR}/rt-${MY_PV}" - -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - fi - fi -} - -src_unpack() { - unpack "${P}.tar.bz2" - unpack "gradle-${EGRADLE_VER}-bin.zip" - - mkdir "${T}/jars" || die - - local line jar - for line in ${SRC_URI}; do - if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then - jar=$(basename "${BASH_REMATCH[-1]}") - cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die - fi - done -} - -src_prepare() { - default - - local d="${T}/jars" - - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5 - java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate - java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core - - sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die -} - -src_configure() { - append-flags -Wno-error - - #FIXME: still calls gcc, pkg-config etc by name without chost prefix - #FIXME: should we enable webkit? doubt so - - # build is very sensetive to doc presense, take extra steps - if use doc; then - local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" - elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then - jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" - fi - [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" - fi - - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - COMPILE_WEBKIT = false - COMPILE_MEDIA = $(usex media true false) - JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api - JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "") - BUILD_LIBAV_STUBS = false - GRADLE_VERSION_CHECK = false - LINT = none - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - JFX_DEPS_URL = ${T}/jars - COMPANY_NAME = "Gentoo" - _EOF_ -} - -src_compile() { - egradle zips $(usex doc "" "--exclude-task javadoc") -} - -src_install() { - if ! use source ; then - rm -v build/sdk/lib/src.zip || die - fi - - insinto "/usr/$(get_libdir)/${PN}-${SLOT}" - doins -r build/sdk/. - doins build/javafx-exports.zip - - if use doc; then - docinto html - dodoc -r build/javadoc/. - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} diff --git a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild b/dev-java/openjfx/openjfx-11.0.7_p0.ebuild deleted file mode 100644 index 957104f45e10..000000000000 --- a/dev-java/openjfx/openjfx-11.0.7_p0.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/_p/+}" -SLOT="${MY_PV%%[.+]*}" -EGRADLE_VER="4.8" - -inherit flag-o-matic java-pkg-2 multiprocessing - -DESCRIPTION="Java OpenJFX client application platform" -HOMEPAGE="https://openjfx.io" - -SRC_URI="https://hg.openjdk.java.net/${PN}/${SLOT}-dev/rt/archive/${MY_PV}.tar.bz2 -> ${P}.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.1.0/lucene-sandbox-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.1.0/lucene-grouping-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.1.0/lucene-queryparser-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.1.0/lucene-queries-7.1.0.jar - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.1.0/lucene-core-7.1.0.jar - https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar - https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar - https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar -" - -LICENSE="GPL-2-with-classpath-exception" -KEYWORDS="-* ~amd64" - -IUSE="cpu_flags_x86_sse2 debug doc source +media" - -RDEPEND=" - dev-java/swt:4.10[cairo,opengl] - dev-libs/atk - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - media-libs/fontconfig:1.0 - media-video/ffmpeg:0= - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - x11-libs/gtk+:3 - x11-libs/cairo[glib] - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/jpeg - virtual/opengl - || ( - dev-java/openjdk-bin:${SLOT}[doc?] - dev-java/openjdk:${SLOT}[doc?] - ) -" - -DEPEND="${RDEPEND} - app-arch/unzip - app-arch/zip - >=dev-java/ant-core-1.10.7-r1:0 - dev-java/antlr:0 - dev-java/antlr:3.5 - dev-java/hamcrest-core:0 - dev-java/stringtemplate:0 - virtual/ttf-fonts - virtual/pkgconfig -" - -REQUIRED_USE="cpu_flags_x86_sse2" - -PATCHES=( - "${FILESDIR}"/11/disable-buildSrc-tests.patch - "${FILESDIR}"/11/glibc-compatibility.patch - "${FILESDIR}"/11/respect-user-cflags.patch - "${FILESDIR}"/11/use-system-swt-jar.patch - "${FILESDIR}"/11/wno-error.patch -) - -S="${WORKDIR}/rt-${MY_PV}" - -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} - -pkg_setup() { - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - - # The nastiness below is necessary while the gentoo-vm USE flag is - # masked. First we call java-pkg-2_pkg_setup if it looks like the - # flag was unmasked against one of the possible build VMs. If not, - # we try finding one of them in their expected locations. This would - # have been slightly less messy if openjdk-bin had been installed to - # /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env - # file but disable it so that it would not normally be selectable. - - local vm - for vm in ${JAVA_PKG_WANT_BUILD_VM}; do - if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then - java-pkg-2_pkg_setup - return - fi - done - - if has_version --host-root dev-java/openjdk:${SLOT}; then - export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT} - export JDK_HOME="${JAVA_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - - else - if [[ ${MERGE_TYPE} != "binary" ]]; then - JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT}) - [[ -n ${JDK_HOME} ]] || die "Build VM not found!" - JDK_HOME=${JDK_HOME#*/} - JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*} - export JDK_HOME - export JAVA_HOME="${JDK_HOME}" - export ANT_RESPECT_JAVA_HOME=ture - fi - fi -} - -src_unpack() { - unpack "${P}.tar.bz2" - unpack "gradle-${EGRADLE_VER}-bin.zip" - - mkdir "${T}/jars" || die - - local line jar - for line in ${SRC_URI}; do - if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then - jar=$(basename "${BASH_REMATCH[-1]}") - cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die - fi - done -} - -src_prepare() { - default - - local d="${T}/jars" - - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr - java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5 - java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate - java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core - - sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die -} - -src_configure() { - append-flags -Wno-error - - #FIXME: still calls gcc, pkg-config etc by name without chost prefix - #FIXME: should we enable webkit? doubt so - - # build is very sensetive to doc presense, take extra steps - if use doc; then - local jdk_doc - if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then - jdk_doc="${EROOT%/}/usr/share/doc/openjdk-${SLOT}/html/api" - elif has_version --host-root dev-java/java-sdk-docs:${SLOT}; then - jdk_doc="${EROOT%/}/usr/share/doc/java-sdk-docs-${SLOT}/html/api" - fi - [[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early" - fi - - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - COMPILE_WEBKIT = false - COMPILE_MEDIA = $(usex media true false) - JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api - JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "") - BUILD_LIBAV_STUBS = false - GRADLE_VERSION_CHECK = false - LINT = none - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - JFX_DEPS_URL = ${T}/jars - COMPANY_NAME = "Gentoo" - _EOF_ -} - -src_compile() { - egradle zips $(usex doc "" "--exclude-task javadoc") -} - -src_install() { - if ! use source ; then - rm -v build/sdk/lib/src.zip || die - fi - - insinto "/usr/$(get_libdir)/${PN}-${SLOT}" - doins -r build/sdk/. - doins build/javafx-exports.zip - - if use doc; then - docinto html - dodoc -r build/javadoc/. - dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}" - fi -} diff --git a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild index 957104f45e10..5f211eba215c 100644 --- a/dev-java/openjfx/openjfx-11.0.7_p1.ebuild +++ b/dev-java/openjfx/openjfx-11.0.7_p1.ebuild @@ -97,7 +97,8 @@ egradle() { unset ANT_HOME einfo "gradle "${gradle_args[@]}" ${@}" - "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" + # TERM needed, otherwise gradle may fail on terms it does not know about + TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" } pkg_setup() { @@ -168,7 +169,7 @@ src_prepare() { } src_configure() { - append-flags -Wno-error + append-flags -Wno-error -fcommon #FIXME: still calls gcc, pkg-config etc by name without chost prefix #FIXME: should we enable webkit? doubt so diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index 2e24535ae891..8ddbb3c76d60 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,4 @@ DIST gjs-1.56.2.tar.xz 701976 BLAKE2B 77057e4a3a8958d6648c92bb56495b505b3ec49bc0eeff0fa5c9e3ae5a694a4b5643dc72d7aa673f9e66d42e9b0def7f9df0043f2690216bfc5c5109ea9eca51 SHA512 687b8e3795565b5c56fceebefb229c07b4c084a4f65c0035e0d185d12082920424632c0f896df8dc1cd5013a97b6e08274efaec4caeb564dc2070d26a5f974c5 DIST gjs-1.58.6.tar.xz 637972 BLAKE2B 553f29808723e48cee39c62e260d9c09f5db160756bf6c2fc45e532bee1d5c8babdd2bd5aee39fdff1300fc10de2c2a4e34d6b850e6e95c83ef217a8955379b6 SHA512 3e8fa8ccaabbbd07e74869fdc6188cffc19565798a6267fd3480d9320a2c9c5906c864e5d0c6e9e57f7bb79cc1706717b76b23c7cd89eb191477eb173b24aa74 DIST gjs-1.58.7.tar.xz 638804 BLAKE2B eb9bb1ea0cd9b52b58a0c4497d5bb930ccb0c8451a94cf9e5e97a6cf1e7bd4dfa5f7a15c2c68fbba3c36a5d71e71df88f086b528e7c2e86d2a8374bfdeac8aa4 SHA512 0790cffd2f2230717b78266b356e88133b5fb816380bf96fc2bea0a039d96979796ad6455a4270dcde62ff2a023fbd73e2edc98428aa2a8b2fdf2cc6c8f8ecce +DIST gjs-1.64.2.tar.xz 419704 BLAKE2B f4b8ab32530f1d24663f5f63e3fa327d2eaa7607cd7e70bd78448039edf2b3338b05edd7dd8e62d52fbe57b60361ffd46f36a61ae5d4620507ae4c70dc98be92 SHA512 e2196d5c581ee0b9c47b5648e6005f336900a71b4844bdf0142127783b4ab96b8ecca0efdeab0878c28ae674bb67f289a8898b1473b8bd080c7cb2c5c103a6f5 diff --git a/dev-libs/gjs/gjs-1.64.2.ebuild b/dev-libs/gjs/gjs-1.64.2.ebuild new file mode 100644 index 000000000000..6ef823d0a818 --- /dev/null +++ b/dev-libs/gjs/gjs-1.64.2.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome.org meson virtualx + +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="https://wiki.gnome.org/Projects/Gjs" + +LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )" +SLOT="0" +IUSE="+cairo examples gtk readline +sysprof test" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.58.0 + >=dev-libs/gobject-introspection-1.61.2:= + + readline? ( sys-libs/readline:0= ) + dev-lang/spidermonkey:68 + dev-libs/libffi:= + cairo? ( x11-libs/cairo[X] ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.33.2:3 ) + virtual/pkgconfig + test? ( sys-apps/dbus + >=x11-libs/gtk+-3.20:3 ) +" + +src_configure() { + # FIXME: add systemtap/dtrace support, like in glib:2 + local emesonargs=( + $(meson_feature cairo) + $(meson_feature sysprof profiler) + $(meson_feature readline) + -Dinstalled_tests=false + ) + meson_src_configure +} + +src_test() { + virtx meson_src_test +} diff --git a/dev-php/PEAR-Mail_Mime/Manifest b/dev-php/PEAR-Mail_Mime/Manifest index f351032813b6..45836d931247 100644 --- a/dev-php/PEAR-Mail_Mime/Manifest +++ b/dev-php/PEAR-Mail_Mime/Manifest @@ -1,3 +1,4 @@ DIST Mail_Mime-1.10.2.tgz 36501 BLAKE2B 59e900b99061e84d307eb46d295f843404ae06b01936cec4ed610c298b6f7e8fcee15098fa6d935696122311eae2dbf733611410b2249f2535673a3031011fa3 SHA512 4e3b2a2adc58d8b4f16f56509c9f22638dc37aedf1bec60871706390198198be6ed6dccae8c250eb33de3a441aeb122097ffaddbc49191745f0f09693ec6612b DIST Mail_Mime-1.10.4.tgz 36909 BLAKE2B 101d050d96b717ad970a6f8c170ba8ea7d94252274f0b006a266a5ef4ac9d49fb350d3bf120ce645e5a54af1f0ad0ab664c828abfa8a4a96170e7204c73dfd82 SHA512 6e58e1078292cf43605313e2402b60deb97be0b56c8eb5dbbb501cf92ca836ca4bdbc9e1ab878c89f8e59941962a91b73dd917c8e678f0944f271e5537f065e5 DIST Mail_Mime-1.10.6.tgz 38355 BLAKE2B d12b0496122c67236090db84710aa1fa660570d82952f037ddeb795ac3184a427965e12b21a6dcd6bfaea692299fb6e610822a364470c444455369f96dbbe972 SHA512 223e4a3a3ab52497d7cee551108642aa8c90328cd5d28ec0f215e16e0f2066fbaa3e4d51e62080d322846f8410c2e4641cd7c743e736062b6f8215e637877518 +DIST Mail_Mime-1.10.7.tgz 38445 BLAKE2B 4e990a9a704aa8fd918dcbcd271946cd5a76c55783cfa207a9a8d171c1e0d407e19e2a30ce46689c8afddeee0037082d77ecbc0e3fb0b4e94f82a2b242ef22c6 SHA512 b3ac0076d3519c14f0331b73940a4fa47cfeb1d2c31d5a5ffa820042fc9b56a8b4d479f349dbe213164c157d5c56caaf0b4f70ef422cc3eba40443433c813d60 diff --git a/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild new file mode 100644 index 000000000000..a88d469a1fcd --- /dev/null +++ b/dev-php/PEAR-Mail_Mime/PEAR-Mail_Mime-1.10.7.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit php-pear-r2 + +DESCRIPTION="Create and manipulate mime messages with PHP" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +DEPEND="test? ( dev-php/PEAR-PEAR )" + +src_test() { + # Requires the "pear" executable from dev-php/PEAR-PEAR. + pear run-tests tests || die + + # The command succeeds regardless of whether or not the test suite + # passed, but this file is only written when there was a failure. + [[ -f run-tests.log ]] && die "test suite failed" +} diff --git a/dev-php/pecl-amqp/Manifest b/dev-php/pecl-amqp/Manifest index 31d5078db8ca..1d4ef6f7ec22 100644 --- a/dev-php/pecl-amqp/Manifest +++ b/dev-php/pecl-amqp/Manifest @@ -1 +1,2 @@ +DIST amqp-1.10.2.tgz 107350 BLAKE2B dd32873d5288ced2ef2c05e6b131f35c31a3514a98d5d3cb8784a989ca1d8637c5ddc7ffa2d73f5bfc2daa4fe718ecf1f08c7ceae64d2e613ef430d18161393b SHA512 a17176bcc02d35a9686d3ca120cca98d808b2a896733f41a28b5d29d43127a0a45b012bc6566de3604f41b8bcc453408a37a8254bcf47e940ebe12bb6f4d4265 DIST amqp-1.9.4.tgz 102604 BLAKE2B 34bed57e2aa3044ac02949ef0d700af71114fc4dd0007ac7a90fadfe267063d8defd6f0e1fe076aa3680187035b1596c283f3cdab8b27f8d3e59f6abf7246147 SHA512 53f8893c2fdb6f41467c9af4a5e48810d39201150a94dd9d32f542d53387ef5e6d8c614ebe2d82b3ab9febd39aa8759a86975d0dc45092a2772f08cd86d7f739 diff --git a/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild b/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild new file mode 100644 index 000000000000..8726588b40f0 --- /dev/null +++ b/dev-php/pecl-amqp/pecl-amqp-1.10.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_PHP="php7-1 php7-2 php7-3 php7-4" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PHP Bindings for AMQP 0-9-1 compatible brokers" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +# Tests require running rabbitmq-server on localhost which requires epmd +# which only accepts /var/run/epmd.pid as pidfile. +RESTRICT="test" + +BDEPEND="virtual/pkgconfig" +RDEPEND=">=net-libs/rabbitmq-c-0.5.2:=[ssl]" +DEPEND="${RDEPEND}" +PHP_EXT_ECONF_ARGS=() diff --git a/dev-php/pecl-lzf/Manifest b/dev-php/pecl-lzf/Manifest index 679a8fd0a814..735e2502d8a4 100644 --- a/dev-php/pecl-lzf/Manifest +++ b/dev-php/pecl-lzf/Manifest @@ -1,2 +1,3 @@ DIST LZF-1.6.6.tgz 17603 BLAKE2B 8aab6327234b590e3b1bc22d3bf9545cd41d79ea260f73c8c6599fd88de8963e556cd71bdccdc6dfce825e24f4e1b2af477476acc1f6b184586ace7e15b28104 SHA512 a049ce5df065eb9c4d3046822f659f929ff4f270c4d80c5d0bcd44679d69524e7ee23e98931fca9f36a566ae023827eb47b66ce651ce6d0f6fbe0643692e7ef4 DIST LZF-1.6.7.tgz 17999 BLAKE2B c7ee3049d7bcc862a400edf56e19745667052c32b2d3faaa26cb55f811e6721b7140446e676467fa5cee3ea87a751b6b0a2a9c6df203227d1bd29f31842e8514 SHA512 920a7d3bd0f0c9f1019a3180e38482ead24610a4a235d967d1f4010101e6f777a2450d517f2d3440edb45bb6a7f6d1012124b1b59aa7c34f9a17fdc93613acab +DIST LZF-1.6.8.tgz 18071 BLAKE2B 83a12c44c02145baac75bc7b5172b09a6a15d4d02852f25d56ea97cf58a83709d59d56cb12be7df510fd687fd5ade760939527ee8151d3ecdb4407b7be2022e3 SHA512 c35543a40b2b44da4bd60e3142ba6ecf33e3460a8ea9f4f7fe6cdc4d728048593b33c423195d58707355975d655f614249642aff2d9b810af0e6a34d42fa1c43 diff --git a/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild b/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild new file mode 100644 index 000000000000..15525c812da6 --- /dev/null +++ b/dev-php/pecl-lzf/pecl-lzf-1.6.8.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PHP_EXT_NAME="lzf" +PHP_EXT_PECL_PKG="LZF" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="This package handles LZF de/compression" +LICENSE="PHP-3" +SLOT="0" +IUSE="" diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest index 6babb3a578f5..6e305b0c2cc6 100644 --- a/dev-php/pecl-timezonedb/Manifest +++ b/dev-php/pecl-timezonedb/Manifest @@ -1 +1,2 @@ DIST timezonedb-2019.3.tgz 413166 BLAKE2B 99542a2c0dc50d96316dc14b22c8a2404db07a88d3f46050a954f10bfb501cd81fb7161805a91336075d607ac106208285e6d2281a9ed68b344fd4837fabcb49 SHA512 8342a0ed83a52ade0415430751d4efeaa84fb72e7da3aec8921338e9dfbf37ff1f098f6b6e1ed9c8f1c9c62017a0fe9c14f86a53be72f8b9f1ec137fa45d057d +DIST timezonedb-2020.1.tgz 413993 BLAKE2B 1f598269060c7f228d103549ac31429df3e31e68961fb41182101400c9f71ea8503cb11943732b49b749aa055e7eedfb4fd06e11cc11c1381bc69f294c3433b6 SHA512 31c38d5b25db921ec5be924ac85d9cf9dd2180c4e2d50e074a143dfdf9415a8c7579e96f7a768b305554bf1cb332b46f2c652fda7d2f1638502b995fc0679ca5 diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild new file mode 100644 index 000000000000..ce13c87b5e74 --- /dev/null +++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2020.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="timezonedb" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Timezone Database to be used with PHP's date and time functions" +LICENSE="PHP-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" +PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/phpunit/Manifest b/dev-php/phpunit/Manifest index 9c751a52aac8..d052514be9a3 100644 --- a/dev-php/phpunit/Manifest +++ b/dev-php/phpunit/Manifest @@ -2,3 +2,4 @@ DIST phpunit-5.7.15.tar.gz 205474 BLAKE2B 0220edd59fc3f191b7621f275d3e4ee8f8bf51 DIST phpunit-8.5.0.tar.gz 311500 BLAKE2B 1b21b898f8a933a228bb6f0197e1a884fe1ab67e7774194d32d23393b2ee649a307e0d00cc6a3b89bad19ab5abc22de8fbc99ff41dc69a006117eabe626cd86a SHA512 3f2c615fbe05c2c04db71b237716ffa3a9ac2c0a5e490fea5db9780efe7f825d47ebb04e81dcdbd4c55f2c3667caf2de79cdbeece6c10ec999c9786fee245721 DIST phpunit-8.5.1.tar.gz 311607 BLAKE2B be746b70df855dd53a7faf61801258e2a3ec4f1ea008575328505e174193990d60d35533a220e03c93a4a013bcf177de71c3f8c1b856767a7cc52ab6aaaef0d6 SHA512 ab2d01d924ed34fc843f33f917e8aab6987ec547e02cdc662ce1f6d6ee383b064bb63a6f71420daee49ef87499471aa4e98b99ab6fc585229738efcbfb87fd46 DIST phpunit-8.5.2.tar.gz 311677 BLAKE2B 7cc42db3618a9e6ffcc35a7a38a6691193814a036869c78af6ef4d020f43fe00633eeebc81cf5c4cb2db04b06706206d78885a1a2e39deea4d20e55a0f8189b2 SHA512 2b8c82381b3a4712c8cae453924b5b0ec25e6c4ef2de6d36ab31f6414a32806abfaa0de5068e585f203dcdd0f228b7ddffb930f394ca5af325c1f222e0523642 +DIST phpunit-8.5.4.tar.gz 312261 BLAKE2B cd130c5699abce3614e616525f58448283ac77f285dda421d33596a82a815d85a663204a661089373a5f6e9ef0d55ba8f327df759bfda6d6503c25663b6ad197 SHA512 307e441582399b2fbd77b30306702b0de0550e9f7e13a41cb39d665291d19e11d5952940fc198247688b95da7774786e86676053f5c64bd4405a1252f617f259 diff --git a/dev-php/phpunit/phpunit-8.5.4.ebuild b/dev-php/phpunit/phpunit-8.5.4.ebuild new file mode 100644 index 000000000000..8cef7953bc08 --- /dev/null +++ b/dev-php/phpunit/phpunit-8.5.4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A PHP Unit Testing framework" +HOMEPAGE="http://phpunit.de" +SRC_URI="https://github.com/sebastianbergmann/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +RDEPEND="dev-php/fedora-autoloader + >=dev-php/File_Iterator-2.0.2 + <dev-php/File_Iterator-3.0 + >=dev-php/Text_Template-1.2.1 + <dev-php/Text_Template-2.0 + >=dev-php/PHP_CodeCoverage-7.0.7 + <dev-php/PHP_CodeCoverage-8.0 + >=dev-php/PHP_Timer-2.1.2 + <dev-php/PHP_Timer-3.0 + >=dev-php/doctrine-instantiator-1.2 + <dev-php/doctrine-instantiator-2.0 + >=dev-php/myclabs-deepcopy-1.9.1 + <dev-php/myclabs-deepcopy-2.0 + >=dev-php/phar-io-manifest-1.0.3 + <dev-php/phar-io-manifest-2.0 + >=dev-php/phar-io-version-2.0.1 + <dev-php/phar-io-version-3.0 + >=dev-php/phpspec-prophecy-1.8.1 + <dev-php/phpspec-prophecy-2.0 + >=dev-php/sebastian-comparator-3.0.2 + <dev-php/sebastian-comparator-4.0 + >=dev-php/sebastian-diff-3.0.2 + <dev-php/sebastian-diff-4.0 + >=dev-php/sebastian-environment-4.2.2 + <dev-php/sebastian-environment-5.0 + >=dev-php/sebastian-exporter-3.1.1 + <dev-php/sebastian-exporter-4.0 + >=dev-php/sebastian-global-state-3.0 + <dev-php/sebastian-global-state-4.0 + >=dev-php/sebastian-object-enumerator-3.0.3 + <dev-php/sebastian-object-enumerator-4.0 + >=dev-php/sebastian-resource-operations-2.0.1 + <dev-php/sebastian-resource-operations-3.0 + <dev-php/sebastian-type-2.0 + <dev-php/sebastian-version-3.0 + >=dev-lang/php-7.2:*[cli(-),json(-),unicode(-),xml(-),xmlwriter(-)] + !dev-php/phpunit-mock-objects +" + +src_install() { + insinto /usr/share/php/PHPUnit + doins -r src/* + insinto /usr/share/php/PHPUnit/vendor + newins "${FILESDIR}/autoload-8.5.0.php" autoload.php + exeinto /usr/share/php/PHPUnit + doexe phpunit + dosym ../share/php/PHPUnit/phpunit /usr/bin/phpunit + insinto /usr/share/php + doins phpunit.xsd +} + +pkg_postinst() { + elog "${PN} can optionally use json, pdo-sqlite and pdo-mysql features." + elog "If you want those, emerge dev-lang/php with USE=\"json pdo sqlite mysql\"." +} diff --git a/dev-php/psr-log/Manifest b/dev-php/psr-log/Manifest index a2bae690d0fc..d4c0562e513a 100644 --- a/dev-php/psr-log/Manifest +++ b/dev-php/psr-log/Manifest @@ -1,3 +1,4 @@ DIST psr-log-1.0.2.tar.gz 4755 BLAKE2B d56a388a94b7cfacbe082280736e5ef203c271de0aec159da56c1ad17efb3bc92e8b4bf45b9d9f5b6fd4c84c107d0c1bc28ab329fcac3b43d179233e1905497c SHA512 a95cf38a92e7259d615d48cf002c4a0a0b6d6a166a345dc40e7636f913e7a787fdc35d4279741d90e04f9b564b608a138ce2e59115014da6be9d779de2a01bf8 DIST psr-log-1.1.0.tar.gz 5710 BLAKE2B 50f5ba979752cf27728ff7a60931f52ffad90db77ec86292af4e767f83734ec2b89d949c1276e85c3bd66f398f1526d3db1d423ee2df245326290ef2f8216112 SHA512 6ba19f184e397311ebda490bb2e1e4252a111b5aaffd6d5df73dd84a823a17c0c76607a7783e678e72c71c5e4a26b4ff9433132f96b108db9064da873235ab15 DIST psr-log-1.1.2.tar.gz 5777 BLAKE2B 0cde3a684f5a46ebfeb9adbcc98fdcb41bf19ade489ad1b3325bd63157d5e942eeb9481ef3367c5cd133820a9474d9ed25ff0485cde5317fc2ffa00c4032ad51 SHA512 439fc3bf72714a2fba4b4d217c1630f7ffdd8e50522a7e45548fc6740edefbd6a2433d461966a03de1fd12a98949e85133e484049fcb538856c297726793eb11 +DIST psr-log-1.1.3.tar.gz 5863 BLAKE2B 6eb823853d69900f6b265448312cc351f3bbe90b26cf3f01bc108c9508a40d19f8cf52bd157da3481d6fd4bf96f0e40932fa5501226955a87e23bd84ddb36ce0 SHA512 e78f0d2343f0e5e59d3d343d9f122bea9962f8fc9bc66e52838c6ab5047929bfd5178ee63713f12a93889da28d1bd5c8e55243d42110264e32f7d5f207a597bc diff --git a/dev-php/psr-log/psr-log-1.1.3.ebuild b/dev-php/psr-log/psr-log-1.1.3.ebuild new file mode 100644 index 000000000000..f878ec482195 --- /dev/null +++ b/dev-php/psr-log/psr-log-1.1.3.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Common interface for logging libraries" +HOMEPAGE="https://github.com/php-fig/log" +SRC_URI="https://github.com/php-fig/log/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-lang/php:* + dev-php/fedora-autoloader" + +S="${WORKDIR}/log-${PV}" + +src_install() { + insinto "/usr/share/php/Psr/Log" + doins -r Psr/Log/. "${FILESDIR}"/autoload.php + dodoc README.md +} diff --git a/dev-php/xdebug-client/Manifest b/dev-php/xdebug-client/Manifest index 6fdf17082ed9..576ef62cc5ae 100644 --- a/dev-php/xdebug-client/Manifest +++ b/dev-php/xdebug-client/Manifest @@ -2,3 +2,4 @@ DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b803 DIST xdebug-2.9.2.tar.gz 432926 BLAKE2B 3d524e5a1aec0621389970e80cdc23dfd40a17113ad09294de65290531cac1b33cbc248be341e0c29d9ebb825be25dd6d6b65b9ebcca0c2c3ca43784d2bf9d50 SHA512 ef1780f34572ea47de7e107b5120a0ec640e0ce4ec2a1c98c128c4f69ec9916879d82b11d2eb94d9630ed27b2d20afec7ccda9f79040d47dbaba9e1933331d03 DIST xdebug-2.9.3.tar.gz 434509 BLAKE2B dd6a42518e9100db32a4858f131fc5cd8f6ed715bbf16a8d20fbba40b7503a897dd6d010af81d0001301b999a64b5d67b193c72a456e396b54ddd61823556d57 SHA512 ec77a036e622a867d4ef46aa844d4d3a2b9ce04c8ce64300451f50539c9889dd10cec96b18292268540e2aee0260caeffbd9fa03abd24891b4c9fe68d02598d5 DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3 +DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72 diff --git a/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild new file mode 100644 index 000000000000..ad1c2866a297 --- /dev/null +++ b/dev-php/xdebug-client/xdebug-client-2.9.5.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" + +MY_PN="xdebug" +MY_PV="${PV/_/}" +MY_PV="${MY_PV/rc/RC}" + +inherit autotools + +DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)" +HOMEPAGE="https://xdebug.org/" +# Using tarball from GitHub for tests +#SRC_URI="http://pecl.php.net/get/xdebug-${MY_PV}.tgz" +SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz" +LICENSE="Xdebug" +SLOT="0" +IUSE="libedit" + +S="${WORKDIR}/${MY_PN}-${MY_PV}/debugclient" + +DEPEND="libedit? ( dev-libs/libedit ) net-libs/libnsl:0=" +RDEPEND="${DEPEND}" + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + econf $(use_with libedit) +} + +src_install() { + newbin debugclient xdebug +} diff --git a/dev-php/xdebug/Manifest b/dev-php/xdebug/Manifest index 6fdf17082ed9..576ef62cc5ae 100644 --- a/dev-php/xdebug/Manifest +++ b/dev-php/xdebug/Manifest @@ -2,3 +2,4 @@ DIST xdebug-2.6.1.tgz 283961 BLAKE2B 4478d591591102a9efa248820831e4d43d89eb9b803 DIST xdebug-2.9.2.tar.gz 432926 BLAKE2B 3d524e5a1aec0621389970e80cdc23dfd40a17113ad09294de65290531cac1b33cbc248be341e0c29d9ebb825be25dd6d6b65b9ebcca0c2c3ca43784d2bf9d50 SHA512 ef1780f34572ea47de7e107b5120a0ec640e0ce4ec2a1c98c128c4f69ec9916879d82b11d2eb94d9630ed27b2d20afec7ccda9f79040d47dbaba9e1933331d03 DIST xdebug-2.9.3.tar.gz 434509 BLAKE2B dd6a42518e9100db32a4858f131fc5cd8f6ed715bbf16a8d20fbba40b7503a897dd6d010af81d0001301b999a64b5d67b193c72a456e396b54ddd61823556d57 SHA512 ec77a036e622a867d4ef46aa844d4d3a2b9ce04c8ce64300451f50539c9889dd10cec96b18292268540e2aee0260caeffbd9fa03abd24891b4c9fe68d02598d5 DIST xdebug-2.9.4.tar.gz 434622 BLAKE2B bd0d0c6a46867ffba88693f142346d11b5abfab3254c549b74ff9169536c42903b1fb1cb94c3344060590b63e287878ea05c6ef7ad8343234bada3857e0dbe75 SHA512 cf19fb9fd12c32e04c18f296694d0667dfe6e14617da932804d17526c88ab19dd2307ad43d036a8c0cb1f871a964523473879da8815f346faf83ec3b9e3952e3 +DIST xdebug-2.9.5.tar.gz 434947 BLAKE2B 08fd7cc92880c9b00180d495341fc7e54998cf3c2294b824d94c3c4ed982ae5b087084b776bcc4f8f4e1aa420396c803d330bc76748cf972cccab4e3f1416d38 SHA512 2a937d08468d3a2963559a56bdf9c9aa6ede3f0ee63797aa14831bcab33a5ede65b87791171a0c794eefdfcffa65bb4d0c06b5377fe03ade65f4defa6e328c72 diff --git a/dev-php/xdebug/xdebug-2.9.5.ebuild b/dev-php/xdebug/xdebug-2.9.5.ebuild new file mode 100644 index 000000000000..95745e2c779d --- /dev/null +++ b/dev-php/xdebug/xdebug-2.9.5.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PHP_EXT_NAME="xdebug" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="yes" +PHP_EXT_INIFILE="2.6.0-xdebug.ini" + +USE_PHP="php7-2 php7-3 php7-4" + +MY_PV="${PV/_/}" +MY_PV="${MY_PV/rc/RC}" + +S="${WORKDIR}/${PN}-${MY_PV}" + +inherit php-ext-source-r3 + +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" + +DESCRIPTION="A PHP debugging and profiling extension" +HOMEPAGE="https://xdebug.org/" +# Using tarball from GitHub for tests +#SRC_URI="https://pecl.php.net/get/${PN}-${MY_PV}.tgz" +SRC_URI="https://github.com/xdebug/xdebug/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Xdebug" +SLOT="0" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + ~dev-php/xdebug-client-${PV}" +DOCS=( README.rst CREDITS ) +PHP_EXT_ECONF_ARGS=() + +pkg_postinst() { + ewarn "We have set xdebug.default_enable to 0 (off), as xdebug can be" + ewarn "installed as a dependency, and not all users will want xdebug to be" + ewarn "enabled by default. If you want to enable it, you should edit the" + ewarn "ini file and set xdebug.default_enable to 1. Alternatively you can" + ewarn "call xdebug_enable() in your code." +} diff --git a/dev-scheme/guile-json/Manifest b/dev-scheme/guile-json/Manifest index c44960651ab5..34af5c9c3183 100644 --- a/dev-scheme/guile-json/Manifest +++ b/dev-scheme/guile-json/Manifest @@ -1 +1,2 @@ DIST guile-json-3.3.0.tar.gz 122495 BLAKE2B 656529e0ff76fa31b0a385f56ddeb937488e252e176b8468f8b2b6a6166cac5c2bbab1e08b4460b263dd0932d7acf2dab4a9924793c7496e37896381220aef1a SHA512 e4204e0e9649a308b6146c17ef2ed3fc1a804404d4bb6ce09b6fdb0d09823f185c333e87f5cc940e5affc08f5562550785511ca1f220efbc7ecfe15cedc14881 +DIST guile-json-3.4.0.tar.gz 146506 BLAKE2B f6d0b4c8897b18530018446186012a886094392b689e69024b99d2015fe3fcb2394e4a371cac34cf1d5244f081a42dbde49f6ba04249518ad76184230d64344e SHA512 c9681b2e19a1dc00161888c58172de84b0ab5a24eafd3870146e7f047af7d208fb57aa64b9fa3b1255958093ea24fb264652d622a1fda9f5cb107ce0518254fe diff --git a/dev-scheme/guile-json/guile-json-3.4.0.ebuild b/dev-scheme/guile-json/guile-json-3.4.0.ebuild new file mode 100644 index 000000000000..e7d525951ddb --- /dev/null +++ b/dev-scheme/guile-json/guile-json-3.4.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="JSON module for Guile" +HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/" +SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-scheme/guile-2.0.0" +DEPEND="${RDEPEND}" + +src_prepare() { + default + + # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112 + find "${S}" -name "*.scm" -exec touch {} + || die +} diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest index 1ac0cc65c34f..c591952c86c4 100644 --- a/dev-util/gtk-update-icon-cache/Manifest +++ b/dev-util/gtk-update-icon-cache/Manifest @@ -1 +1,2 @@ DIST gtk-update-icon-cache-3.24.16.tar.bz2 91713 BLAKE2B 883c1437ecbff8cdec545fb3a59270569de32f59c48cb7e2401332a2547ccf41487ff2778e382815695eca34cf88baddc955acf8b2b7b7ab1edf06dec5be8683 SHA512 53bdaa8d29e1c343cf9e5d0acddd852d1a3d43a9c03e8e7c186245f5ab536742b39bd7c76b9fee3a2b5342ab573be621d59f7282f41b08097061c8f5df158c06 +DIST gtk-update-icon-cache-3.24.20.tar.bz2 91769 BLAKE2B 4fb1d4e06117924377e2e3f28f733ffd4f929414e6e36855a4486d6aa2a63f3a37cf5710c8dffdb6c32470c24861070a3160b8373dfa10a3831d098446f5701f SHA512 2ba23145e3cd46d3cd7129c68355c6918a271688935b828be110049e6a912879d25f88a8105c8dd1484de8b0c89d220bb6e8f4282aaf083602ad88e2cef9a54e diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild new file mode 100644 index 000000000000..4c02aa74fa1a --- /dev/null +++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.20.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit meson + +DESCRIPTION="GTK update icon cache" +HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache" +SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1+" +SLOT="0" +IUSE="" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# man page was previously installed by gtk+:3 ebuild +RDEPEND=" + >=dev-libs/glib-2.53.4:2 + >=x11-libs/gdk-pixbuf-2.30:2 + !<x11-libs/gtk+-2.24.28-r1:2 + !<x11-libs/gtk+-3.22.2:3 +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.3 + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask index c4c7bc96159e..27d5c51ebf9f 100644 --- a/profiles/features/musl/package.mask +++ b/profiles/features/musl/package.mask @@ -51,6 +51,8 @@ sys-boot/systemd-boot # rust-bin requires a glibc system dev-lang/rust-bin +mail-client/thunderbird-bin +www-client/firefox-bin # Mikle Kolyada <zlogene@gentoo.org> (2020-03-20) # No source builds for musl diff --git a/profiles/package.mask b/profiles/package.mask index 3ab79e211949..cbd1505d54d2 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,10 @@ #--- END OF EXAMPLES --- +# Matt Turner <mattst88@gentoo.org> (2020-04-29) +# Masked for testing +>=dev-libs/gjs-1.64 + # Mikle Kolyada <zlogene@gentoo.org> (2020-04-28) # Dead upstream. Removal in 30 days sys-cluster/openais diff --git a/sci-mathematics/petsc/Manifest b/sci-mathematics/petsc/Manifest index 35342d214c52..c224c7768822 100644 --- a/sci-mathematics/petsc/Manifest +++ b/sci-mathematics/petsc/Manifest @@ -1,2 +1 @@ -DIST petsc-3.11.3.tar.gz 33279017 BLAKE2B 870b8245e5e06d8538ea3ee1d01fa2cebade4a0bd79dfcf17d74e6201f41d21ca021e206744ece28847b434ece142a2789851b5514a8a1e3f82a8551288b695b SHA512 e545f69e87bc72950939ff3cec3e0ba225a5b3e7f1cb93b0fb6123194eb7240ac1d97ba397235d8ab872c653caab1427673124e5e1e706b796c0ae46ec1bcffa -DIST petsc-3.12.1.tar.gz 34592587 BLAKE2B b48056a1fe1d507338f7d145f5fceeab2b2f576470d8af90c9d7828de9b775daadf11198fecc46b5e48fcf1eb38addb366e3a908dab5c4ffaf7f9b71ff17b3d8 SHA512 df33170922c0b34136d2fd5bdc3c68a80d3a5873d66bfb03b2cea4a6456393c7181a8da673911b89ea0fcb51d5fd89b5b4c8b76ddb1df573180a92d029fbc1fb +DIST petsc-3.13.0.tar.gz 35080264 BLAKE2B 0ac58e53751dbc6e053e3591cdf2363194e0cf7a493f252d879031e0135da16fa24e66974dd7bf07ce18558a75f8dd794e87f96590ad9e550d11edfeb462f727 SHA512 0590bb63d9c6dfd6ac03b1b88e5a8c11d42a0fd014084603d4d085060b126aa4341b4ec3a4d2b12146b971da327ccc7ede370e5633282bf44f269465aea32953 diff --git a/sci-mathematics/petsc/files/petsc-3.12.1-do_not_run_mpiexec.patch b/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch index 9c3d5047b0a6..4c46658dec71 100644 --- a/sci-mathematics/petsc/files/petsc-3.12.1-do_not_run_mpiexec.patch +++ b/sci-mathematics/petsc/files/petsc-3.13.0-do_not_run_mpiexec.patch @@ -1,14 +1,14 @@ diff --git a/config/BuildSystem/config/packages/MPI.py b/config/BuildSystem/config/packages/MPI.py -index c85bb504..7720eba9 100644 +index 7e424e71..ee502bd2 100644 --- a/config/BuildSystem/config/packages/MPI.py +++ b/config/BuildSystem/config/packages/MPI.py -@@ -209,26 +209,11 @@ shared libraries and run with --known-mpi-shared-libraries=1') +@@ -210,28 +210,11 @@ shared libraries and run with --known-mpi-shared-libraries=1') raise RuntimeError('Could not locate MPIEXEC - please specify --with-mpiexec option') # Support for spaces and () in executable names; also needs to handle optional arguments at the end # TODO: This support for spaces and () should be moved to core BuildSystem - self.mpiexec = self.mpiexec.replace(' ', '\\ ').replace('(', '\\(').replace(')', '\\)').replace('\ -',' -') - if (hasattr(self, 'ompi_major_version') and int(self.ompi_major_version) >= 3): -- (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -help all', checkCommand = noCheck, timeout = 10, log = self.log) +- (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -help all', checkCommand = noCheck, timeout = 60, log = self.log, threads = 1) - if out.find('--oversubscribe') >=0: - self.mpiexec = self.mpiexec + ' --oversubscribe' + self.mpiexec = self.mpiexec + ' --oversubscribe' @@ -16,17 +16,19 @@ index c85bb504..7720eba9 100644 # using mpiexec environmental variables make sure mpiexec matches the MPI libraries and save the variables for testing in PetscInitialize() # the variable HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE is not currently used. PetscInitialize() can check the existence of the environmental variable to # determine if the program has been started with the correct mpiexec (will only be set for parallel runs so not clear how to check appropriately) -- (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -n 1 printenv', checkCommand = noCheck, timeout = 10, log = self.log) -- if ret: raise RuntimeError('Unable to run '+self.mpiexec+' with option "-n 1"\n'+err) -- if out.find('MPIR_CVAR_CH3') > -1: -- if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH"); -- self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPIR_CVAR_CH3') -- elif out.find('MPIR_CVAR_CH3') > -1: -- if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH"); -- self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPICH') -- elif out.find('OMPI_COMM_WORLD_SIZE') > -1: -- if hasattr(self,'mpich_numversion'): raise RuntimeError("Your libraries are from MPICH but it appears your mpiexec is from OpenMPI"); -- self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'OMP') +- (out, err, ret) = Configure.executeShellCommand(self.mpiexec+' -n 1 printenv', checkCommand = noCheck, timeout = 60, threads = 1, log = self.log) +- if ret: +- self.logWrite('Unable to run '+self.mpiexec+' with option "-n 1 printenv"\nThis could be ok, some MPI implementations such as SGI produce a non-zero status with non-MPI programs\n'+out+err) +- else: +- if out.find('MPIR_CVAR_CH3') > -1: +- if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH"); +- self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPIR_CVAR_CH3') +- elif out.find('MPIR_CVAR_CH3') > -1: +- if hasattr(self,'ompi_major_version'): raise RuntimeError("Your libraries are from OpenMPI but it appears your mpiexec is from MPICH"); +- self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'MPICH') +- elif out.find('OMPI_COMM_WORLD_SIZE') > -1: +- if hasattr(self,'mpich_numversion'): raise RuntimeError("Your libraries are from MPICH but it appears your mpiexec is from OpenMPI"); +- self.addDefine('HAVE_MPIEXEC_ENVIRONMENTAL_VARIABLE', 'OMP') + self.addMakeMacro('MPIEXEC', self.mpiexec) self.mpiexec = self.mpiexec + ' -n 1' - diff --git a/sci-mathematics/petsc/files/petsc-3.9.0-fix_sandbox_violation.patch b/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch index 97f8dfed4d71..c0dfd53a0112 100644 --- a/sci-mathematics/petsc/files/petsc-3.9.0-fix_sandbox_violation.patch +++ b/sci-mathematics/petsc/files/petsc-3.13.0-fix_sandbox_violation.patch @@ -1,15 +1,16 @@ diff --git a/config/PETSc/options/installDir.py b/config/PETSc/options/installDir.py -index 92f190d..047c85b 100644 +index 860faf0f..87898811 100755 --- a/config/PETSc/options/installDir.py +++ b/config/PETSc/options/installDir.py -@@ -41,12 +41,6 @@ class Configure(config.base.Configure): +@@ -40,13 +40,6 @@ class Configure(config.base.Configure): self.dir = os.path.abspath(os.path.expanduser(self.framework.argDB['prefix'])) self.petscDir = self.dir self.petscArch = '' - try: - os.makedirs(os.path.join(self.dir,'PETScTestDirectory')) - os.rmdir(os.path.join(self.dir,'PETScTestDirectory')) -- except: +- except Exception as e: +- self.logPrint('Error trying to to test write permissions on directory '+str(e)) - self.installSudoMessage = 'You do not have write permissions to the --prefix directory '+self.dir+'\nYou will be prompted for the sudo password for any external package installs' - self.installSudo = 'sudo ' else: diff --git a/sci-mathematics/petsc/files/petsc-3.12.1-make_hypre_configure.patch b/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch index 9460d57e4617..1453fd519e81 100644 --- a/sci-mathematics/petsc/files/petsc-3.12.1-make_hypre_configure.patch +++ b/sci-mathematics/petsc/files/petsc-3.13.0-make_hypre_configure.patch @@ -1,18 +1,18 @@ diff --git a/config/BuildSystem/config/packages/hypre.py b/config/BuildSystem/config/packages/hypre.py -index 869a1661..76067c8d 100644 +index 4d915c31..1b05a1ee 100644 --- a/config/BuildSystem/config/packages/hypre.py +++ b/config/BuildSystem/config/packages/hypre.py @@ -5,10 +5,6 @@ class Configure(config.package.GNUPackage): def __init__(self, framework): config.package.GNUPackage.__init__(self, framework) - self.version = '2.18.1' + #self.version = '2.18.2' - self.minversion = '2.14' - self.versionname = 'HYPRE_RELEASE_VERSION' - self.versioninclude = 'HYPRE_config.h' - self.requiresversion = 1 - self.gitcommit = 'v'+self.version + #self.gitcommit = 'v'+self.version + self.gitcommit = '93baaa8c9' # v2.18.2+valgrind-fix self.download = ['git://https://github.com/hypre-space/hypre','https://github.com/hypre-space/hypre/archive/'+self.gitcommit+'.tar.gz'] - self.functions = ['HYPRE_IJMatrixCreate'] diff --git a/include/petsc/private/petschypre.h b/include/petsc/private/petschypre.h index 81ca7136..b403e70e 100644 --- a/include/petsc/private/petschypre.h @@ -31,7 +31,7 @@ index 81ca7136..b403e70e 100644 With scalar type == real, HYPRE_Complex == PetscScalar; With scalar type == complex, HYPRE_Complex is double __complex__ while PetscScalar may be std::complex<double> diff --git a/src/mat/impls/hypre/mhypre.c b/src/mat/impls/hypre/mhypre.c -index 8e8fe678..3533b99a 100644 +index 0f7470e6..cce3e2b0 100644 --- a/src/mat/impls/hypre/mhypre.c +++ b/src/mat/impls/hypre/mhypre.c @@ -15,10 +15,6 @@ @@ -42,10 +42,10 @@ index 8e8fe678..3533b99a 100644 -#define hypre_ParCSRMatrixClone(A,B) hypre_ParCSRMatrixCompleteClone(A) -#endif - - PETSC_INTERN PetscErrorCode MatPtAP_IS_XAIJ(Mat,Mat,MatReuse,PetscReal,Mat*); - static PetscErrorCode MatHYPRE_CreateFromMat(Mat,Mat_HYPRE*); -@@ -65,7 +61,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat + static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat,Mat,HYPRE_IJMatrix); + static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat,HYPRE_IJMatrix); +@@ -63,7 +59,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat nnz_o[i] = 0; } } @@ -53,7 +53,7 @@ index 8e8fe678..3533b99a 100644 { /* If we don't do this, the columns of the matrix will be all zeros! */ hypre_AuxParCSRMatrix *aux_matrix; aux_matrix = (hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(ij); -@@ -75,9 +70,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat +@@ -73,9 +68,6 @@ static PetscErrorCode MatHYPRE_IJMatrixPreallocate(Mat A_d, Mat A_o, HYPRE_IJMat aux_matrix = (hypre_AuxParCSRMatrix*)hypre_IJMatrixTranslator(ij); hypre_AuxParCSRMatrixNeedAux(aux_matrix) = 1; } @@ -63,7 +63,7 @@ index 8e8fe678..3533b99a 100644 ierr = PetscFree(nnz_d);CHKERRQ(ierr); ierr = PetscFree(nnz_o);CHKERRQ(ierr); } -@@ -235,11 +227,7 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij) +@@ -233,11 +225,7 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij) /* need to shift the diag column indices (hdiag->j) back to global numbering since hypre is expecting this */ hjj = hdiag->j; pjj = pdiag->j; @@ -75,7 +75,7 @@ index 8e8fe678..3533b99a 100644 ierr = PetscArraycpy(hdiag->data,pdiag->a,pdiag->nz);CHKERRQ(ierr); if (sameint) { ierr = PetscArraycpy(hoffd->i,poffd->i,pA->A->rmap->n + 1);CHKERRQ(ierr); -@@ -249,12 +237,8 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij) +@@ -247,12 +235,8 @@ static PetscErrorCode MatHYPRE_IJMatrixFastCopy_MPIAIJ(Mat A, HYPRE_IJMatrix ij) /* need to move the offd column indices (hoffd->j) back to global numbering since hypre is expecting this If we hacked a hypre a bit more we might be able to avoid this step */ diff --git a/sci-mathematics/petsc/petsc-3.11.3.ebuild b/sci-mathematics/petsc/petsc-3.11.3.ebuild deleted file mode 100644 index 50ce3b7f6631..000000000000 --- a/sci-mathematics/petsc/petsc-3.11.3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs - -DESCRIPTION="Portable, Extensible Toolkit for Scientific Computation" -HOMEPAGE="http://www.mcs.anl.gov/petsc/" -SRC_URI="http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="afterimage boost complex-scalars cxx debug doc fftw - fortran hdf5 hypre mpi metis mumps scotch sparse superlu threads X" - -# hypre and superlu curretly exclude each other due to missing linking to hypre -# if both are enabled -REQUIRED_USE=" - afterimage? ( X ) - complex-scalars? ( !hypre !superlu ) - hdf5? ( mpi ) - hypre? ( cxx mpi !superlu ) - mumps? ( mpi scotch ) - scotch? ( mpi ) - superlu? ( !hypre ) -" - -RDEPEND=" - virtual/blas - virtual/lapack - afterimage? ( media-libs/libafterimage ) - boost? ( dev-libs/boost ) - fftw? ( sci-libs/fftw:3.0[mpi?] ) - hdf5? ( sci-libs/hdf5[mpi?] ) - hypre? ( >=sci-libs/hypre-2.8.0b[mpi?] ) - metis? ( >=sci-libs/parmetis-4 ) - mpi? ( virtual/mpi[cxx?,fortran?] ) - mumps? ( sci-libs/mumps[mpi?] sci-libs/scalapack ) - scotch? ( sci-libs/scotch[mpi?] ) - sparse? ( sci-libs/suitesparse >=sci-libs/cholmod-1.7.0 ) - superlu? ( >=sci-libs/superlu-5 ) - X? ( x11-libs/libX11 ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - dev-util/cmake -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch \ - "${FILESDIR}"/${PN}-3.9.0-fix_sandbox_violation.patch -) - -src_prepare() { - default - - sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die -} - -# petsc uses --with-blah=1 and --with-blah=0 to en/disable options -petsc_enable() { - use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0" -} -# add external library: -# petsc_with use_flag libname libdir -# petsc_with use_flag libname include linking_libs -petsc_with() { - local myuse p=${2:-${1}} - if use ${1}; then - myuse="--with-${p}=1" - if [[ $# -ge 4 ]]; then - myuse="${myuse} --with-${p}-include=${EPREFIX}${3}" - shift 3 - myuse="${myuse} --with-${p}-lib=$@" - else - myuse="${myuse} --with-${p}-dir=${EPREFIX}${3:-/usr}" - fi - else - myuse="--with-${p}=0" - fi - echo ${myuse} -} - -# select between configure options depending on use flag -petsc_select() { - use "$1" && echo "--with-$2=$3" || echo "--with-$2=$4" -} - -src_configure() { - # bug 548498 - # PETSc runs mpi processes during configure that result in a sandbox - # violation by trying to open /proc/mtrr rw. This is not easy to - # mitigate because it happens in libpciaccess.so called by libhwloc.so, - # which is used by libmpi.so. - addpredict /proc/mtrr - # if mpi is built with knem support it needs /dev/knem too - addpredict /dev/knem - - # configureMPITypes with openmpi-2* insists on accessing the scaling - # governor rw. - addpredict /sys/devices/system/cpu/ - - local mylang - local myopt - - use cxx && mylang="cxx" || mylang="c" - use debug && myopt="debug" || myopt="opt" - - # environmental variables expected by petsc during build - - export PETSC_DIR="${S}" - export PETSC_ARCH="linux-gnu-${mylang}-${myopt}" - - if use debug; then - strip-flags - filter-flags -O* - fi - - # C Support on CXX builds is enabled if possible i.e. when not using - # complex scalars (no complex type for both available at the same time) - - econf \ - scrollOutput=1 \ - FFLAGS="${FFLAGS} -fPIC" \ - CFLAGS="${CFLAGS} -fPIC" \ - CXXFLAGS="${CXXFLAGS} -fPIC" \ - LDFLAGS="${LDFLAGS}" \ - --prefix="${EPREFIX}/usr/$(get_libdir)/petsc" \ - --with-shared-libraries \ - --with-single-library \ - --with-clanguage=${mylang} \ - $(use cxx && ! use complex-scalars && echo "with-c-support=1") \ - --with-petsc-arch=${PETSC_ARCH} \ - --with-precision=double \ - --with-gnu-compilers \ - --with-blas-lapack-lib="$($(tc-getPKG_CONFIG) --libs blas lapack)" \ - $(petsc_enable debug debugging) \ - $(petsc_enable mpi) \ - $(petsc_select mpi cc mpicc $(tc-getCC)) \ - $(petsc_select mpi cxx mpicxx $(tc-getCXX)) \ - $(petsc_enable fortran) \ - $(use fortran && echo "$(petsc_select mpi fc mpif77 $(tc-getF77))") \ - $(petsc_enable mpi mpi-compilers) \ - $(petsc_select complex-scalars scalar-type complex real) \ - --with-windows-graphics=0 \ - --with-matlab=0 \ - --with-cmake:BOOL=1 \ - $(petsc_enable threads pthread) \ - $(petsc_with afterimage afterimage \ - /usr/include/libAfterImage -lAfterImage) \ - $(use_with hdf5) \ - $(petsc_with hypre hypre \ - /usr/include/hypre -lHYPRE) \ - $(petsc_with sparse suitesparse) \ - $(petsc_with superlu superlu \ - /usr/include/superlu -lsuperlu) \ - $(petsc_with X x) \ - $(petsc_with X x11) \ - $(petsc_with scotch ptscotch \ - /usr/include/scotch \ - [-lptesmumps,-lptscotch,-lptscotcherr,-lscotch,-lscotcherr]) \ - $(petsc_with mumps scalapack \ - /usr/include/scalapack -lscalapack) \ - $(petsc_with mumps mumps \ - /usr/include \ - [-lcmumps,-ldmumps,-lsmumps,-lzmumps,-lmumps_common,-lpord]) \ - --with-imagemagick=0 \ - --with-python=0 \ - $(petsc_with boost) \ - $(petsc_with fftw) -} - -src_install() { - emake DESTDIR="${ED}" install - - # add PETSC_DIR to environmental variables - cat >> 99petsc <<- EOF - PETSC_DIR=${EPREFIX}/usr/$(get_libdir)/petsc - LDPATH=${EPREFIX}/usr/$(get_libdir)/petsc/lib - EOF - doenvd 99petsc - - if use doc ; then - docinto html - dodoc -r docs/*.html docs/changes docs/manualpages - fi -} diff --git a/sci-mathematics/petsc/petsc-3.12.1.ebuild b/sci-mathematics/petsc/petsc-3.13.0.ebuild index 845d7ff75d69..961ff927f725 100644 --- a/sci-mathematics/petsc/petsc-3.12.1.ebuild +++ b/sci-mathematics/petsc/petsc-3.13.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit flag-o-matic fortran-2 python-any-r1 toolchain-funcs @@ -54,17 +54,11 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-3.7.0-disable-rpath.patch - "${FILESDIR}"/${PN}-3.9.0-fix_sandbox_violation.patch - "${FILESDIR}"/${PN}-3.12.1-make_hypre_configure.patch - "${FILESDIR}"/${PN}-3.12.1-do_not_run_mpiexec.patch + "${FILESDIR}"/${PN}-3.13.0-fix_sandbox_violation.patch + "${FILESDIR}"/${PN}-3.13.0-make_hypre_configure.patch + "${FILESDIR}"/${PN}-3.13.0-do_not_run_mpiexec.patch ) -src_prepare() { - default - - sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die -} - # petsc uses --with-blah=1 and --with-blah=0 to en/disable options petsc_enable() { use "$1" && echo "--with-${2:-$1}=1" || echo "--with-${2:-$1}=0" diff --git a/sci-mathematics/slepc/Manifest b/sci-mathematics/slepc/Manifest index d23b2beb677f..9beac5e49658 100644 --- a/sci-mathematics/slepc/Manifest +++ b/sci-mathematics/slepc/Manifest @@ -1,2 +1 @@ -DIST slepc-3.11.1.tar.gz 4700643 BLAKE2B a624050aad0128d7ef53f27f72484e078e62d8edf9298995dda71a9e8d804dddc7e433542eccf95b2d896be80e8795b1664375e68a4c02c18c56d78d490bffb7 SHA512 a941c2a955953ed2344de7f7d9eaaed79504c3559e27920c633bc09cfb192f883b26fd4aa5dc3bd9909a2fc045f3a34e514feca0e074ca36bc3166aa9c059235 -DIST slepc-3.12.1.tar.gz 4757436 BLAKE2B 607e7b28730ff16fa995768e23fd9861e180c078d2f06e8f65324b1e1761f0688fe5a4c4420983b521583cb2b3fe28b606baea604daf5253c30131f9f54c5572 SHA512 0254ea1a521cf150f9f0402bb936c9d1aa32765264e055ecdd058e44aaa7e87c3df1b63b1889c1989c4a691c652eb0f248a1bbbe6d555ce16f9f8f28d6765b50 +DIST slepc-3.13.1.tar.gz 4797627 BLAKE2B 29372b8a2d4c5f3b26e840df743f7aec098bfeeb29e9c108e509baa21d9697da19c737470ba4c132391d5193ebf749ef3f3c6ece600ec7527502d40a239aa0ee SHA512 620c344274808329c0a1009e7844532e03e88d38135bfd5b73bc0bc6815b17b6dfb49341d05399230ba6e06997db688aec17615429eaca3dc94fd886119bf321 diff --git a/sci-mathematics/slepc/slepc-3.12.1.ebuild b/sci-mathematics/slepc/slepc-3.12.1.ebuild deleted file mode 100644 index 52212cabfd52..000000000000 --- a/sci-mathematics/slepc/slepc-3.12.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Scalable Library for Eigenvalue Problem Computations" -HOMEPAGE="http://slepc.upv.es/" -SRC_URI="http://slepc.upv.es/download/distrib/${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="complex-scalars doc mpi" - -RDEPEND=" - =sci-mathematics/petsc-$(ver_cut 1-2)*:=[mpi=,complex-scalars=] - sci-libs/arpack[mpi=] - mpi? ( virtual/mpi ) -" - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - dev-util/cmake -" - -MAKEOPTS="${MAKEOPTS} V=1" - -src_prepare() { - default - - sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die -} - -src_configure() { - # *sigh* - addpredict "${PETSC_DIR}"/.nagged - - # Make sure that the environment is set up correctly: - unset PETSC_DIR - unset PETSC_ARCH - unset SLEPC_DIR - source "${EPREFIX}"/etc/env.d/99petsc - export PETSC_DIR - - # configure is a custom python script and doesn't want to have default - # configure arguments that we set with econf - ./configure \ - --prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \ - --with-arpack=1 \ - --with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \ - --with-arpack-flags="$(usex mpi "-lparpack,-larpack" "-larpack")" - -} - -src_install() { - emake DESTDIR="${ED}" install - - # add PETSC_DIR to environmental variables - cat >> 99slepc <<- EOF - SLEPC_DIR=${EPREFIX}/usr/$(get_libdir)/slepc - LDPATH=${EPREFIX}/usr/$(get_libdir)/slepc/lib - EOF - doenvd 99slepc - - if use doc ; then - dodoc docs/slepc.pdf - docinto html - dodoc -r docs/*.html docs/manualpages - fi -} diff --git a/sci-mathematics/slepc/slepc-3.11.1.ebuild b/sci-mathematics/slepc/slepc-3.13.1.ebuild index 52212cabfd52..be2d085dd6cb 100644 --- a/sci-mathematics/slepc/slepc-3.11.1.ebuild +++ b/sci-mathematics/slepc/slepc-3.13.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit eutils flag-o-matic python-any-r1 toolchain-funcs @@ -30,12 +30,6 @@ DEPEND="${RDEPEND} MAKEOPTS="${MAKEOPTS} V=1" -src_prepare() { - default - - sed -i -e 's%/usr/bin/env python%/usr/bin/env python2%' configure || die -} - src_configure() { # *sigh* addpredict "${PETSC_DIR}"/.nagged @@ -43,9 +37,10 @@ src_configure() { # Make sure that the environment is set up correctly: unset PETSC_DIR unset PETSC_ARCH - unset SLEPC_DIR source "${EPREFIX}"/etc/env.d/99petsc export PETSC_DIR + export PETSC_ARCH + export SLEPC_DIR="${S}" # configure is a custom python script and doesn't want to have default # configure arguments that we set with econf @@ -53,8 +48,7 @@ src_configure() { --prefix="${EPREFIX}/usr/$(get_libdir)/slepc" \ --with-arpack=1 \ --with-arpack-dir="${EPREFIX}/usr/$(get_libdir)" \ - --with-arpack-flags="$(usex mpi "-lparpack,-larpack" "-larpack")" - + --with-arpack-lib="$(usex mpi "-lparpack,-larpack" "-larpack")" } src_install() { diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest index 038521922f00..73f7d361ca3d 100644 --- a/sys-libs/timezone-data/Manifest +++ b/sys-libs/timezone-data/Manifest @@ -1,2 +1,4 @@ DIST tzcode2019c.tar.gz 253560 BLAKE2B 62552e7e78ebb50c111f9a99119843fe9b5dad9e1abb5ba0f1cf0a931cf00fc49684a6b378f5ea4cb31aca8af5b0c3b697b87048ef36a445536ec2fc5b943440 SHA512 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b +DIST tzcode2020a.tar.gz 257509 BLAKE2B 21335f0b6a3b98ba8203d49d1273c2016bfbef9903c394cda6ca97cc5ec5d1fb1605bb73ba9aa6c73eca3fe115fb2924da37b736bf0a8a0e214eed547100fe70 SHA512 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 DIST tzdata2019c.tar.gz 392087 BLAKE2B d7a21e57391d321b5c84e1ba2286ff0dd154c435d40015d999c8c6f2f1bea3c13d832c0752af313c9aa4dafe6a261e1e92bfd79523448fcd585188a53454e31a SHA512 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 +DIST tzdata2020a.tar.gz 397245 BLAKE2B 2a85a9a9badbf2b74ba2ace3f7fd436cc7752202557785be503c1c8f2f698dfc8cfb412b3f08ebc0bd4a8d0e27293b47eeedf937f713dadb4386dad14322b871 SHA512 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d diff --git a/sys-libs/timezone-data/timezone-data-2020a.ebuild b/sys-libs/timezone-data/timezone-data-2020a.ebuild new file mode 100644 index 000000000000..36100be468ae --- /dev/null +++ b/sys-libs/timezone-data/timezone-data-2020a.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit toolchain-funcs flag-o-matic + +code_ver=${PV} +data_ver=${PV} +DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)" +HOMEPAGE="https://www.iana.org/time-zones" +SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz + https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz" + +LICENSE="BSD public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" +IUSE="nls leaps-timezone elibc_FreeBSD" + +DEPEND="nls? ( virtual/libintl )" +RDEPEND="${DEPEND} + !sys-libs/glibc[vanilla(+)]" + +S=${WORKDIR} + +src_prepare() { + default + + # check_web contacts validator.w3.org + sed -i -e 's/check_tables check_web/check_tables/g' \ + Makefile || die "Failed to disable check_web" + + tc-is-cross-compiler && cp -pR "${S}" "${S}"-native +} + +src_configure() { + tc-export CC + + append-lfs-flags #471102 + + if use elibc_FreeBSD || use elibc_Darwin ; then + append-cppflags -DSTD_INSPIRED #138251 + fi + + append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"' + LDLIBS="" + if use nls ; then + # See if an external libintl is available. #154181 #578424 + local c="${T}/test" + echo 'main(){}' > "${c}.c" + if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then + LDLIBS+=" -lintl" + fi + fi +} + +_emake() { + emake \ + REDO=$(usex leaps-timezone posix_right posix_only) \ + TZDATA_TEXT= \ + TOPDIR="${EPREFIX}" \ + ZICDIR='$(TOPDIR)/usr/bin' \ + "$@" +} + +src_compile() { + _emake \ + AR="$(tc-getAR)" \ + cc="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ + CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LDLIBS="${LDLIBS}" + if tc-is-cross-compiler ; then + _emake -C "${S}"-native \ + AR="$(tc-getBUILD_AR)" \ + cc="$(tc-getBUILD_CC)" \ + RANLIB="$(tc-getBUILD_RANLIB)" \ + CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \ + LDFLAGS="${BUILD_LDFLAGS}" \ + LDLIBS="${LDLIBS}" \ + zic + fi +} + +src_test() { + # VALIDATE_ENV is used for extended/web based tests. Punt on them. + emake check VALIDATE_ENV=true +} + +src_install() { + local zic="" + tc-is-cross-compiler && zic="zic=${S}-native/zic" + _emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit" + rm -rf "${D}/nukeit" "${ED}/etc" || die + + insinto /usr/share/zoneinfo + doins "${S}"/leap-seconds.list + + # Delete man pages installed by man-pages package. + rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die + dodoc CONTRIBUTING README NEWS *.html +} + +get_TIMEZONE() { + local tz src="${EROOT}/etc/timezone" + if [[ -e ${src} ]] ; then + tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}") + else + tz="FOOKABLOIE" + fi + [[ -z ${tz} ]] && return 1 || echo "${tz}" +} + +pkg_preinst() { + local tz=$(get_TIMEZONE) + if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then + eerror "The right & posix subdirs are no longer installed as subdirs -- they have been" + eerror "relocated to match upstream paths as sibling paths. Further, posix/xxx is the" + eerror "same as xxx, so you should simply drop the posix/ prefix. You also should not" + eerror "be using right/xxx for the system timezone as it breaks programs." + die "Please fix your timezone setting" + fi + + # Trim the symlink by hand to avoid portage's automatic protection checks. + rm -f "${EROOT}"/usr/share/zoneinfo/posix + + if has_version "<=${CATEGORY}/${PN}-2015c" ; then + elog "Support for accessing posix/ and right/ directly has been dropped to match" + elog "upstream. There is no need to set TZ=posix/xxx as it is the same as TZ=xxx." + elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead. See this post" + elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html" + fi +} + +configure_tz_data() { + # make sure the /etc/localtime file does not get stale #127899 + local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime" + + # If it's a symlink, assume the user knows what they're doing and + # they're managing it themselves. #511474 + if [[ -L "${etc_lt}" ]] ; then + einfo "Assuming your ${etc_lt} symlink is what you want; skipping update." + return 0 + fi + + if ! tz=$(get_TIMEZONE) ; then + einfo "Assuming your empty ${etc_lt} file is what you want; skipping update." + return 0 + fi + if [[ "${tz}" == "FOOKABLOIE" ]] ; then + elog "You do not have TIMEZONE set in ${src}." + + if [[ ! -e "${etc_lt}" ]] ; then + cp -f "${EROOT}"/usr/share/zoneinfo/Factory "${etc_lt}" + elog "Setting ${etc_lt} to Factory." + else + elog "Skipping auto-update of ${etc_lt}." + fi + return 0 + fi + + if [[ ! -e "${EROOT}/usr/share/zoneinfo/${tz}" ]] ; then + elog "You have an invalid TIMEZONE setting in ${src}" + elog "Your ${etc_lt} has been reset to Factory; enjoy!" + tz="Factory" + fi + einfo "Updating ${etc_lt} with ${EROOT}/usr/share/zoneinfo/${tz}" + cp -f "${EROOT}/usr/share/zoneinfo/${tz}" "${etc_lt}" +} + +pkg_config() { + configure_tz_data +} + +pkg_postinst() { + configure_tz_data +} diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest index 701704875275..1de09291cb4e 100644 --- a/www-servers/nginx/Manifest +++ b/www-servers/nginx/Manifest @@ -1,7 +1,7 @@ DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd DIST nginx-1.16.1.tar.gz 1032630 BLAKE2B 838c5f08b56378dd3ef3940a979eb1449c4ed7ef5b4b112da2531c0996d121ae32ae4e94d3b4ba198fefcdc1b06683e4b0cfa0087db82fcab13bffb5f67f8aa4 SHA512 17e95b43fa47d4fef5e652dea587518e16ab5ec562c9c94355c356440166d4b6a6a41ee520d406e5a34791a327d2e3c46b3f9b105ac9ce07afdd495c49eca437 DIST nginx-1.17.10.tar.gz 1039541 BLAKE2B 5e86be6c6aebfd336579269ecfa09eab9ff5c0185e0bd36f993b5ccac4d13f64ef3d10cad4d0ac00c7fb67e3ecb048b7b0f4c74cf5c5376fdc643b5cecee28ac SHA512 0b49169bc49e07733862e09ec5bfa93601ffa57379f98d52a115e511502905baf4cd33b73a03d74416f8c6ffa95ebf4459fc934bd40bfdf54d5b6d35ac4f8756 -DIST nginx-1.17.9.tar.gz 1039136 BLAKE2B bc4cb6fa93288f936ee36b86846b9eb864406799bd1cbc14b2e924e30b0490858e573100ea1e6ca506e1353c71176ebaa5e0109e3d5395e9029a41fa899c60ef SHA512 9d6af46bc575763d5d2c279451919a491bdfafb927a8c0783ccc8326a86ed66f9183c900a9844bf31dcde015f36ea6a8e0d3817b77f9b17aebae701c759fe9b6 +DIST nginx-1.18.0.tar.gz 1039530 BLAKE2B a8962a6af96acb043ff0c3dc4ad5192083773c449950aff53b01f6f7c46a2a540eb061a43432acccd753fa71067b1451d75f440ba5526575b78608be9d40a50b SHA512 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 DIST ngx_brotli-8104036af9cff4b1d34f22d00ba857e2a93a243c.tar.gz 12672 BLAKE2B fa2febfa63b98303f8890c6774de6ccb09475ccd639d3b74493a4ffd97c90febdc22755c5928018bdac24a537bd13cde165f97e5d2b50bebf598c3fb22ec0206 SHA512 169566b8764bb2b82e029f954a99063a9c61e2cbf982861c5f6818b389a5f37bf5389afb1b5627de9bd3f7af7b3c404be0230f943d47ab621c2a2bd825cc8203 @@ -27,4 +27,4 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922 DIST njs-0.3.5.tar.gz 339177 BLAKE2B 6327be0b7c8077870408722376782bca579a6cfdf1fe2a4950fc0d289311ad21f671bc2b47d06f70d95d4f68d99e8c70fd4598dcc167b79c57704d99a098d284 SHA512 236e0284f251856f74eb51d8251bb5be725d2ca90056f2feef7677eb636a4e97e203f3bba81fb6b677158d615dc2d6ffcb0dc1059fb678ab12b7d14cc4ea7241 -DIST njs-0.3.9.tar.gz 412279 BLAKE2B 9e27e59e56b6d5c9d48717552aa373265c6e513e55049a94f1df25a558ef3253be89b8e7e00a3fdcaa93c66f8da8d1d654d4d279e0b4c05b769775a862dfc0a4 SHA512 a1d734db7325de3055d3034777ebfe03b1205bdb6648da45ac7f68698d32427da741a88872c8f713ec6258e79d9cfdcdb89e4429571ba3e3e723a5777024dcab +DIST njs-0.4.0.tar.gz 418439 BLAKE2B e4b9f529a10f90ece864a6b1969507e9573296288ef85f4a71163644415404d4541129326ef9635fe5b8aff3b59ab76c2b3995894c41a53ffb632b6bee8b8e5f SHA512 ea9a063ef83791dd7a7896c584d1b8c635c3ff81792c6e5bad61bdfe8185c6f9ce436ad5e360b267b42bf0d5986553bbdf3c0f1264627f82550aadc361be0a3c diff --git a/www-servers/nginx/nginx-1.17.10.ebuild b/www-servers/nginx/nginx-1.17.10-r1.ebuild index 6cda406abe2b..32a846e8e56d 100644 --- a/www-servers/nginx/nginx-1.17.10.ebuild +++ b/www-servers/nginx/nginx-1.17.10-r1.ebuild @@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" # njs-module (https://github.com/nginx/njs, as-is) -NJS_MODULE_PV="0.3.9" +NJS_MODULE_PV="0.4.0" NJS_MODULE_P="njs-${NJS_MODULE_PV}" NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" diff --git a/www-servers/nginx/nginx-1.17.9-r2.ebuild b/www-servers/nginx/nginx-1.18.0.ebuild index 6cda406abe2b..58f5c9d92b29 100644 --- a/www-servers/nginx/nginx-1.17.9-r2.ebuild +++ b/www-servers/nginx/nginx-1.18.0.ebuild @@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}" # njs-module (https://github.com/nginx/njs, as-is) -NJS_MODULE_PV="0.3.9" +NJS_MODULE_PV="0.4.0" NJS_MODULE_P="njs-${NJS_MODULE_PV}" NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz" NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}" @@ -201,7 +201,7 @@ LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )" -SLOT="mainline" +SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" # Package doesn't provide a real test suite @@ -326,7 +326,7 @@ CDEPEND=" nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )" RDEPEND="${CDEPEND} selinux? ( sec-policy/selinux-nginx ) - !www-servers/nginx:0" + !www-servers/nginx:mainline" DEPEND="${CDEPEND} nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} ) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index d6d2ecd8ef3f..0d4d5891ddc0 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -2,3 +2,4 @@ DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696 DIST gtk+-3.24.16.tar.xz 20417592 BLAKE2B a0b18c72cd91ddb6533577efad7327df60870b5424409076698ce2b8cbe68a4382a12d947d7c60243ddf4eebe0e14ae9986d5b82a11bef64f1f0287949354986 SHA512 181d31dea038016357cd0eba5b9e8a17056bc061f4ae2ebc713bceee46cd30787993cec463aae658faddc57b9071549fa196f6a2a1f67c314d99e4365f50a0cb DIST gtk+-3.24.18.tar.xz 21292668 BLAKE2B 4d06789d027f9b9e070093460daa579afa88a14b9d5a3c028db3dbf20dfadbaab671ae56a9820eef5b2244a00f09f4be4413f1c06b11ac4db6c1044f824a01f6 SHA512 51ba13ae3cd0db9b62462ba399f08738885648adcb545bf0852c4e5b04bc2a1dd88629fafefc282f6a200daa8330e7606f22a70bd2ce6fde32a992a6cd7a0950 +DIST gtk+-3.24.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556 diff --git a/x11-libs/gtk+/gtk+-3.24.20.ebuild b/x11-libs/gtk+/gtk+-3.24.20.ebuild new file mode 100644 index 000000000000..ddb924517c94 --- /dev/null +++ b/x11-libs/gtk+/gtk+-3.24.20.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" + +inherit flag-o-matic gnome2 multilib virtualx multilib-minimal + +DESCRIPTION="Gimp ToolKit +" +HOMEPAGE="https://www.gtk.org/" + +LICENSE="LGPL-2+" +SLOT="3" +IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama" +REQUIRED_USE=" + || ( aqua wayland X ) + xinerama? ( X ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +# Upstream wants us to do their job: +# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1 +RESTRICT="test" + +# FIXME: introspection data is built against system installation of gtk+:3, +# bug #???? +COMMON_DEPEND=" + >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}] + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}] + media-libs/fontconfig[${MULTILIB_USEDEP}] + >=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}] + >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}] + >=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-0.9:= + x11-misc/shared-mime-info + + cloudprint? ( + >=net-libs/rest-0.7[${MULTILIB_USEDEP}] + >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] ) + colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] ) + cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] ) + introspection? ( >=dev-libs/gobject-introspection-1.39:= ) + wayland? ( + >=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.14 + media-libs/mesa[wayland,${MULTILIB_USEDEP}] + >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}] + ) + X? ( + >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] + media-libs/mesa[X(+),${MULTILIB_USEDEP}] + x11-libs/libX11[${MULTILIB_USEDEP}] + >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] + x11-libs/libXext[${MULTILIB_USEDEP}] + >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}] + x11-libs/libXcursor[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + x11-libs/libXcomposite[${MULTILIB_USEDEP}] + x11-libs/libXdamage[${MULTILIB_USEDEP}] + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${COMMON_DEPEND} + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.1.2 + dev-libs/libxslt + dev-libs/gobject-introspection-common + >=dev-util/gdbus-codegen-2.48 + dev-util/glib-utils + >=dev-util/gtk-doc-am-1.20 + gtk-doc? ( >=dev-util/gtk-doc-1.20 + app-text/docbook-xml-dtd:4.3 ) + >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}] + virtual/pkgconfig[${MULTILIB_USEDEP}] + X? ( x11-base/xorg-proto ) + test? ( + media-fonts/font-misc-misc + media-fonts/font-cursor-misc ) +" +# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90 +# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90 +RDEPEND="${COMMON_DEPEND} + >=dev-util/gtk-update-icon-cache-3 + !<gnome-base/gail-1000 + !<x11-libs/vte-0.31.0:2.90 +" +# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710 +PDEPEND=" + gnome-base/librsvg[${MULTILIB_USEDEP}] + >=x11-themes/adwaita-icon-theme-3.14 + vim-syntax? ( app-vim/gtk-syntax ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gtk-query-immodules-3.0$(get_exeext) +) + +strip_builddir() { + local rule=$1 + shift + local directory=$1 + shift + sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \ + || die "Could not strip director ${directory} from build." +} + +src_prepare() { + if ! use test ; then + # don't waste time building tests + strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in} + + # the tests dir needs to be build now because since commit + # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there + # strip_builddir SRC_SUBDIRS tests Makefile.{am,in} + fi + + if ! use examples; then + # don't waste time building demos + strip_builddir SRC_SUBDIRS demos Makefile.{am,in} + strip_builddir SRC_SUBDIRS examples Makefile.{am,in} + fi + + # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache + eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch + + # Fix broken autotools logic + eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch + + gnome2_src_prepare +} + +multilib_src_configure() { + local myconf=( + $(use_enable aqua quartz-backend) + $(use_enable broadway broadway-backend) + $(use_enable cloudprint) + $(use_enable colord) + $(use_enable cups cups auto) + $(multilib_native_use_enable gtk-doc) + $(multilib_native_use_enable introspection) + $(use_enable wayland wayland-backend) + $(use_enable X x11-backend) + $(use_enable X xcomposite) + $(use_enable X xdamage) + $(use_enable X xfixes) + $(use_enable X xkb) + $(use_enable X xrandr) + $(use_enable xinerama) + # cloudprovider is not packaged in Gentoo yet + --disable-cloudproviders + --disable-papi + # sysprof integration needs >=sysprof-3.33.2 + --disable-profiler + --enable-man + --with-xml-catalog="${EPREFIX}"/etc/xml/catalog + # need libdir here to avoid a double slash in a path that libtool doesn't + # grok so well during install (// between $EPREFIX and usr ...) + # TODO: Is this still the case? + --libdir="${EPREFIX}"/usr/$(get_libdir) + CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config" + ) + + if use wayland; then + myconf+=( + # Include wayland immodule into gtk itself, to avoid problems like + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a + # user overridden GTK_IM_MODULE envvar + --with-included-immodules=wayland + ) + fi; + + ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}" + + # work-around gtk-doc out-of-source brokedness + if multilib_is_native_abi; then + local d + for d in gdk gtk libgail-util; do + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die + done + fi +} + +multilib_src_test() { + "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die + GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check +} + +multilib_src_install() { + gnome2_src_install +} + +multilib_src_install_all() { + insinto /etc/gtk-3.0 + doins "${FILESDIR}"/settings.ini + # Skip README.{in,commits,win32} that would get installed by default + DOCS=( AUTHORS ChangeLog NEWS README ) + einstalldocs +} + +pkg_preinst() { + gnome2_pkg_preinst + + multilib_pkg_preinst() { + # Make immodules.cache belongs to gtk+ alone + local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + } + multilib_parallel_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_query_immodules_gtk3 \ + || die "Update immodules cache failed (for ${ABI})" + } + multilib_parallel_foreach_abi multilib_pkg_postinst + + if ! has_version "app-text/evince"; then + elog "Please install app-text/evince for print preview functionality." + elog "Alternatively, check \"gtk-print-preview-command\" documentation and" + elog "add it to your settings.ini file." + fi +} + +pkg_postrm() { + gnome2_pkg_postrm + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache + } + multilib_foreach_abi multilib_pkg_postrm + fi +} |