[gentoo-commits] proj/kde:master commit in: Documentation/package.accept_keywords/, ...
commit: 5626d8633ff20fd7698ee8f17c33d2d34d726040 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 10 07:23:17 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 07:23:17 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5626d863 Documentation: Add media-libs/mlt to KDE Applications 19.12 deps Signed-off-by: Andreas Sturmlechner gentoo.org> Documentation/package.accept_keywords/.kde-applications-19.12/more-deps | 1 + Documentation/package.accept_keywords/kde-applications-19.12.keywords | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/package.accept_keywords/.kde-applications-19.12/more-deps b/Documentation/package.accept_keywords/.kde-applications-19.12/more-deps index e69de29bb2..71ed203fe1 100644 --- a/Documentation/package.accept_keywords/.kde-applications-19.12/more-deps +++ b/Documentation/package.accept_keywords/.kde-applications-19.12/more-deps @@ -0,0 +1 @@ +=media-libs/mlt-6.18.0 diff --git a/Documentation/package.accept_keywords/kde-applications-19.12.keywords b/Documentation/package.accept_keywords/kde-applications-19.12.keywords index 9b7c3dc048..ffcae6d5d0 100644 --- a/Documentation/package.accept_keywords/kde-applications-19.12.keywords +++ b/Documentation/package.accept_keywords/kde-applications-19.12.keywords @@ -237,3 +237,4 @@
[gentoo-commits] proj/kde:master commit in: dev-libs/kuserfeedback/
commit: 7ab9cf9b7fb7840b35817e9fc2b5d877e248971c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 6 18:28:32 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 07:21:37 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ab9cf9b dev-libs/kuserfeedback: Sync SRC_URI with Gentoo ebuild repo Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/kuserfeedback/kuserfeedback-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/kuserfeedback/kuserfeedback-.ebuild b/dev-libs/kuserfeedback/kuserfeedback-.ebuild index 32461ef3c2..d254a943a5 100644 --- a/dev-libs/kuserfeedback/kuserfeedback-.ebuild +++ b/dev-libs/kuserfeedback/kuserfeedback-.ebuild @@ -12,7 +12,7 @@ inherit ecm kde.org DESCRIPTION="Framework to collect user feedback for applications via telemetry and surveys" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/unstable/${PN}/${P}.tar.xz" + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" KEYWORDS="~amd64 ~ppc64" fi
[gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/
commit: a9311d86d574062b18fa8f08ea0062899301f59e Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 10 07:10:17 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 07:12:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9311d86 media-libs/mlt: Sync 6.18.0-r0 with r1 This will be our ruby25 stable target. Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/mlt/mlt-6.18.0.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-libs/mlt/mlt-6.18.0.ebuild b/media-libs/mlt/mlt-6.18.0.ebuild index a2df7a96441..c835916cd8c 100644 --- a/media-libs/mlt/mlt-6.18.0.ebuild +++ b/media-libs/mlt/mlt-6.18.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau vidstab xine xml" @@ -100,7 +100,7 @@ src_prepare() { # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873 for x in python lua; do - sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die + sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die done sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kross-interpreters/
commit: b8d12bd6aa85239d83f75545794c340dedca83a6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 10 07:08:01 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 07:12:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8d12bd6 kde-apps/kross-interpreters: Add 19.12.2-r1 for ruby26 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kross-interpreters-19.12.2-r1.ebuild | 42 ++ 1 file changed, 42 insertions(+) diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.12.2-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.2-r1.ebuild new file mode 100644 index 000..9b58b5932f5 --- /dev/null +++ b/kde-apps/kross-interpreters/kross-interpreters-19.12.2-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) +USE_RUBY="ruby25" +KFMIN=5.63.0 +QTMIN=5.12.3 +inherit ecm kde.org python-single-r1 ruby-single + +DESCRIPTION="Kross interpreter plugins for programming languages" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+python ruby" + +REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )" + +DEPEND=" + >=kde-frameworks/kross-${KFMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + python? ( ${PYTHON_DEPS} ) + ruby? ( ${RUBY_DEPS} ) +" +RDEPEND="${DEPEND}" + +pkg_setup() { + use python && python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DBUILD_python=$(usex python) + -DBUILD_ruby=$(usex ruby) + ) + + ecm_src_configure +}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/kross-interpreters/
commit: 15a73c0313984189927420880edc1bce8e16fe29 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 10 07:07:35 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 07:12:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a73c03 kde-apps/kross-interpreters: Switch 19.12.2-r0 to ruby25 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild index 2e692c3325a..9b58b5932f5 100644 --- a/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild +++ b/kde-apps/kross-interpreters/kross-interpreters-19.12.2.ebuild @@ -4,7 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby26" +USE_RUBY="ruby25" KFMIN=5.63.0 QTMIN=5.12.3 inherit ecm kde.org python-single-r1 ruby-single
[gentoo-commits] repo/gentoo:master commit in: x11-terms/cool-retro-term/
commit: d65d844146eaba4c06dd3c5e069511dd3d911d97 Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Feb 10 07:10:44 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Feb 10 07:11:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65d8441 x11-terms/cool-retro-term: keyword on ~ppc64 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild index 1f9256427d7..dd5fc7cd56d 100644 --- a/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild +++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/Swordfish90/cool-retro-term/archive/${PV}.tar.gz -> LICENSE="GPL-2 GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
commit: 23fe04e8b4e04658c111b418a8fb11ed7a8f6b43 Author: Jimi Huotari gentoo org> AuthorDate: Wed Jan 29 22:47:30 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 06:52:42 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23fe04e8 dev-qt/qtwebengine: Re-add USE geolocation Package-Manager: Portage-2.3.86, Repoman-2.3.20 Signed-off-by: Jimi Huotari gentoo.org> (cherry picked from commit 7064af6a1dceefb550fcc9c43ba9ccfbff2c5187) Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 19 ++- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild index 1152cf4edeb..92e75c3c12e 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi -IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" +IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets" REQUIRED_USE="designer? ( widgets )" RDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} - ~dev-qt/qtpositioning-${PV} ~dev-qt/qtprintsupport-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat @@ -60,6 +59,7 @@ RDEPEND=" x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-${PV} ) + geolocation? ( ~dev-qt/qtpositioning-${PV} ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-60.2:= ) @@ -106,14 +106,15 @@ src_configure() { local myqmakeargs=( -- - -opus -printing-and-pdf - -webp - $(usex alsa '-alsa' '') - $(usex bindist '' '-proprietary-codecs') - $(usex pulseaudio '-pulseaudio' '') - $(usex system-ffmpeg '-ffmpeg' '') - $(usex system-icu '-webengine-icu' '') + -system-opus + -system-webp + $(usex alsa '-alsa' '-no-alsa') + $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs') + $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation') + $(usex pulseaudio '-pulseaudio' '-no-pulseaudio') + $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg') + $(usex system-icu '-webengine-icu' '-no-webengine-icu') ) qt5-build_src_configure }
[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
commit: c451f62d808f3642fa25778a9d7895e1710b69f6 Author: Stephan Hartmann googlemail com> AuthorDate: Sat Feb 8 21:35:41 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 06:47:05 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=c451f62d dev-qt/qtwebengine: fix building on x86 Closes: https://bugs.gentoo.org/695446 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Stephan Hartmann googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/14598 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtwebengine-5.14.1-disable-fatal-warnings.patch| 12 dev-qt/qtwebengine/qtwebengine-5.14..ebuild | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch new file mode 100644 index ..40f1f5d6 --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +index 97d3953..dd3d222 100644 +--- a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +@@ -25,6 +25,7 @@ gn_args += \ + v8_use_external_startup_data=false \ + toolkit_views=false \ + treat_warnings_as_errors=false \ ++fatal_linker_warnings=false \ + safe_browsing_mode=0 \ + optimize_webui=false \ + forbid_non_component_debug_builds=false diff --git a/dev-qt/qtwebengine/qtwebengine-5.14..ebuild b/dev-qt/qtwebengine/qtwebengine-5.14..ebuild index 2f92716a..c2229351 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14..ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14..ebuild @@ -77,6 +77,8 @@ DEPEND="${RDEPEND} sys-devel/bison " +PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446 + src_prepare() { if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/
commit: c5eefaf080581309a9d4c6dd03c55a84957aa3b5 Author: Stephan Hartmann googlemail com> AuthorDate: Sat Feb 8 21:35:41 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 10 06:41:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5eefaf0 dev-qt/qtwebengine: fix building on x86 Closes: https://bugs.gentoo.org/695446 Package-Manager: Portage-2.3.76, Repoman-2.3.16 Signed-off-by: Stephan Hartmann googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/14598 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/qtwebengine-5.14.1-disable-fatal-warnings.patch| 12 dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 4 2 files changed, 16 insertions(+) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch new file mode 100644 index 000..40f1f5d6c2a --- /dev/null +++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch @@ -0,0 +1,12 @@ +diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +index 97d3953..dd3d222 100644 +--- a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri +@@ -25,6 +25,7 @@ gn_args += \ + v8_use_external_startup_data=false \ + toolkit_views=false \ + treat_warnings_as_errors=false \ ++fatal_linker_warnings=false \ + safe_browsing_mode=0 \ + optimize_webui=false \ + forbid_non_component_debug_builds=false diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild index ce5929f9ca8..1152cf4edeb 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild @@ -77,6 +77,10 @@ DEPEND="${RDEPEND} sys-devel/bison " +PATCHES=( + "${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446 +) + src_prepare() { if ! use jumbo-build; then sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/jbuilder/
commit: a19f4d81fede15758d531b4df88e894547e5595c Author: Hans de Graaff gentoo org> AuthorDate: Mon Feb 10 06:07:53 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Mon Feb 10 06:07:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a19f4d81 dev-ruby/jbuilder: add 2.10.0 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/jbuilder/Manifest | 1 + dev-ruby/jbuilder/jbuilder-2.10.0.ebuild | 25 + 2 files changed, 26 insertions(+) diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest index 4c704f1d179..6ab60fbecc2 100644 --- a/dev-ruby/jbuilder/Manifest +++ b/dev-ruby/jbuilder/Manifest @@ -1 +1,2 @@ +DIST jbuilder-2.10.0.gem 28160 BLAKE2B c277a59d53f30132ebe88d6afda5c221d74a399b01cedf6a4863f29e94d329137669942957a21ae9c5c192177dc9e78b6d66d9b5a29c7d4667a0432556c6b28c SHA512 a429422d65ed3eec55f46597f73a97b267fe7d6c7554ec6a6d60e1e1c0a9306b81f7283524602a30af11a141f7cd466a0f7b0a804172bd4008787462f0fa4ffc DIST jbuilder-2.9.1.gem 28160 BLAKE2B 52e8a6ed2e6be19d73c22eddc6bcf3817e89f390da3b5eb4bc3308fa0c588f910608cbc6586cab858a5fb9ae6eb22fbade3fb32a426bed665cae18c067d85116 SHA512 aa8607696f5f14f22d163438d876b2a3017af791fdf4d6afd0df6c736ef86294db71f21a719029a2c052c24623d86f05c7aa5315e6f5066c74bc6886c50873fb diff --git a/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild b/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild new file mode 100644 index 000..765909fd06b --- /dev/null +++ b/dev-ruby/jbuilder/jbuilder-2.10.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby24 ruby25 ruby26" + +RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test" + +RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md" + +inherit ruby-fakegem + +DESCRIPTION="Create JSON structures via a Builder-style DSL" +HOMEPAGE="https://github.com/rails/jbuilder"; + +LICENSE="MIT" +SLOT="2" +KEYWORDS="~amd64" +IUSE="" + +ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*" + +all_ruby_prepare() { + sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/pluggaloid/
commit: 3e7ea5e0c7399ddaae399d70fde96411f99902cd Author: Hans de Graaff gentoo org> AuthorDate: Mon Feb 10 06:18:11 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Mon Feb 10 06:18:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7ea5e0 dev-ruby/pluggaloid: add 1.4.1 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/pluggaloid/Manifest| 1 + dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild | 26 ++ 2 files changed, 27 insertions(+) diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest index 11fb0dd7569..f523aec7262 100644 --- a/dev-ruby/pluggaloid/Manifest +++ b/dev-ruby/pluggaloid/Manifest @@ -2,3 +2,4 @@ DIST pluggaloid-1.1.2.gem 14848 BLAKE2B 72bbcfe71c3c2e6a96425639b0db2af9a10f9288 DIST pluggaloid-1.2.0.gem 14848 BLAKE2B ee092768b9aac2c64a0ded18f328f0f1a5d67d073da28a3029c9be13554f77565ed2338fe9630115067ecc1d0d712273642e0679a43f822995faaff48cdd7849 SHA512 b17bd264c2e8027ae1a9288b5b9a12f5c0e4c91bebf9cee5328bfe61aaa32662f55901d5ece030702780756474d54028272c7cef18fc79982d9d7c48f04b5acb DIST pluggaloid-1.3.1.gem 16384 BLAKE2B cea02ddee3d0edc48b5a43de7737e1ee85d3bb00fa29367e1e540e9824d0433a4973b30214f5b0a01b981d6983d9d783753565598fa9b3815fb31d0a02cbe1ea SHA512 4db3a26d940d55487614e67aeb135121f19261e6d63e77d623f89b2b4eef275c035abb83e1d2d5197a27248c944110a26196f5ff1915fd14bac7d3b39827a020 DIST pluggaloid-1.4.0.gem 18432 BLAKE2B 4df2180a2facb3d0d82f891bfcf888629fe211cb69ef3e5934619136df7b72f28c0f56e7dd76dde7667eca079beb9c9e5f716662185c565b7252713217fdde8a SHA512 75ce56c1831d79fed9216f0b217ec1a0962db2ba98cb690debeb8edca8a4c27f4f40f498440b35595d756d5a3790fe422fdd63cdf39cd8c157f8bc200879c018 +DIST pluggaloid-1.4.1.gem 18432 BLAKE2B 7f7fde7074547f27248874fa3ec0e7e9a671d8c31dfd5a53e0f377ab28034ed5a3322131bae8d178a32b3d8ad874f329670ac5899527927627d358d60d26 SHA512 fc800576bed6a99d42f43baff482d4242584a4a301d22dd243e58c43800e72e2fd35f997fcfd92a443edf3c99e489d52fd14e6413c8c6e66809fca90cdbbde06 diff --git a/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild new file mode 100644 index 000..493b5e87416 --- /dev/null +++ b/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_RUBY="ruby25 ruby26 ruby27" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +inherit ruby-fakegem +DESCRIPTION="Pluggaloid is extensible plugin system for mikutter" +HOMEPAGE="https://rubygems.org/gems/pluggaloid/"; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +ruby_add_rdepend " + >=dev-ruby/delayer-1.1.0:1 + dev-ruby/instance_storage:0 +" + +all_ruby_prepare() { + sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/ox/
commit: 4bd5ba0ada46fb4ab1c9f12910e0e1d5929cd097 Author: Hans de Graaff gentoo org> AuthorDate: Mon Feb 10 06:10:55 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Mon Feb 10 06:10:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd5ba0a dev-ruby/ox: add 2.13.2 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/ox/Manifest | 1 + dev-ruby/ox/ox-2.13.2.ebuild | 33 + 2 files changed, 34 insertions(+) diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest index 9dc082d466c..445335a967e 100644 --- a/dev-ruby/ox/Manifest +++ b/dev-ruby/ox/Manifest @@ -3,3 +3,4 @@ DIST ox-2.11.0.tar.gz 201028 BLAKE2B 52c908be2a1d08ad563137f99e68f7734c2fa6aa873 DIST ox-2.12.0.tar.gz 201909 BLAKE2B 02aad0b822463afce57447b8d2277f00015715eefd570025386d2ff745eac74a934df41c7ce4f4c742593b780783d7040dfcf712600dc6d1246de7a5d90b5e1c SHA512 09f3db6037662cbd6f4fb128f5df61ccf1d22c8949a315f766518984bf1ab57a83789d0b0a9f4982c5356e28190440092971163de3680b36285fab1fed0a91b5 DIST ox-2.12.1.tar.gz 202784 BLAKE2B b42a364e4e2c1bfbefd06bd0b5162838e473cbd48582e20336cd50173278a81e56eb6cefb826b1155a19ab7ed1484f0e4a4715d640ff0ff7d4fb82d3feade647 SHA512 0bf3b4d21e5b09695595b3846ed893a0d23f4479388036447dc2bfa5440d1b4350289ef023176a9f1fc14383c76388d3ab906ba6c8c919b519bb029438cbd1b1 DIST ox-2.13.1.tar.gz 208729 BLAKE2B 6d3b006ff252a048f1d634faee3d2d0d9b85e4a0aa06a42b84fe7dac27bf679a41ffadfab2590d925475ed88b8e7084f9d52a3c2257db51393303aaf02f36d1a SHA512 184b7cdb8a160c50b00683e6cad28532dd14d7af4d1c48c5e36c3120f0381271304a66c3ca0da381a62db6c5d628e27a2ee1ee4b866b212cabf18b3ce9a886d4 +DIST ox-2.13.2.tar.gz 208893 BLAKE2B 15e9fca55cb58c10d6336c1399048e72c059889da0b9df8050a6e4cd00393d11507768ed1cab23d452e792f4001a5935e70ba0be24186a1f96a43a7f272823fc SHA512 bc7d8d14c9e3a45529d8a4a32c01d7f51523f814407d437a7dfed0184fad16a9edf4a2b2317c28039613f8f0e0d367b42b4eb8fc00b01287b0154d520e37ce48 diff --git a/dev-ruby/ox/ox-2.13.2.ebuild b/dev-ruby/ox/ox-2.13.2.ebuild new file mode 100644 index 000..dfa02327978 --- /dev/null +++ b/dev-ruby/ox/ox-2.13.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +RUBY_FAKEGEM_EXTRADOC="README.md" + +RUBY_FAKEGEM_GEMSPEC="ox.gemspec" + +inherit ruby-fakegem + +DESCRIPTION="A fast XML parser and Object marshaller" +HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"; +SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +SLOT="0" +IUSE="" + +each_ruby_configure() { + ${RUBY} -Cext/ox extconf.rb || die +} + +each_ruby_compile() { + emake V=1 -Cext/ox + cp ext/ox/ox$(get_modname) lib/ox/ || die +} + +each_ruby_test() { + ${RUBY} test/tests.rb || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-ruby/pkg-config/
commit: 09efc550798d30afa5673b9227e015d6217d6fb0 Author: Hans de Graaff gentoo org> AuthorDate: Mon Feb 10 06:14:57 2020 + Commit: Hans de Graaff gentoo org> CommitDate: Mon Feb 10 06:14:57 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09efc550 dev-ruby/pkg-config: add 1.4.1 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Hans de Graaff gentoo.org> dev-ruby/pkg-config/Manifest| 1 + dev-ruby/pkg-config/pkg-config-1.4.1.ebuild | 31 + 2 files changed, 32 insertions(+) diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest index e344fc2fb59..559fcfb9c46 100644 --- a/dev-ruby/pkg-config/Manifest +++ b/dev-ruby/pkg-config/Manifest @@ -1,3 +1,4 @@ DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065 DIST pkg-config-1.3.9.gem 22016 BLAKE2B bb22881e07a251722e5e2344a8ebfea105456c4994da01b6cad53b93c5fab515537c04166be9985bac224944e89506040a2f89886f03c9f5d9c2227551e6e840 SHA512 ffec47956f59daea7eefe749474389cc43b500251b7d35cf268caed975d4b8483990c6c5cc0eb1cb918a7e09edd483fe88d6e7141c13496edeb4d4aac5ab3019 DIST pkg-config-1.4.0.gem 22016 BLAKE2B a9f56e68580b290bc0b09b07dc059b5ac7141a97a2a4653529fd59aa348bee7ce90a2e752172d2d0f376b67fbb7253f0d3bb38107eb68e3d6bb3f7d57637423c SHA512 d60539519e86e210def73d2536a694e2fc7a6a424c7cdd49b6046420b113520465e1863ef4d90d9491d081b78e16cfff27121d3b7f78a78330c4a242c652ebd7 +DIST pkg-config-1.4.1.gem 22016 BLAKE2B efac610221b288bb669a3783c0e70af3951478147896315c53af2186912b60045096c0ba01a0a59ce09897a2e4e747d28a091b947281fe7f6dd6f85cea31aae7 SHA512 72d61466c1ea53a5eda66a8e8f8106fef0269fefdd349ac83959a34bb8f36796bd3e9c7fbcbad5763d2fca015c65436f9d410724e27b6d1c495e3957d26757a6 diff --git a/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild new file mode 100644 index 000..b79bc3efa0b --- /dev/null +++ b/dev-ruby/pkg-config/pkg-config-1.4.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS" + +inherit ruby-fakegem + +DESCRIPTION="A pkg-config implementation by Ruby" +HOMEPAGE="https://github.com/rcairo/pkg-config"; +LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" +IUSE="test" + +ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )" +# this is used for testing +DEPEND+=" test? ( x11-libs/cairo )" + +all_ruby_prepare() { + # drop failing tests + sed -i -e "/test_cflags/,/end/d"\ + -e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die +} + +each_ruby_test() { + ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die +}
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: 4c0d34f390adb153d77b748a5c4799396ac14d4b Author: Michał Górny gentoo org> AuthorDate: Mon Feb 10 05:50:49 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Feb 10 05:50:49 2020 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=4c0d34f3 Bump pkgcheck2html Signed-off-by: Michał Górny gentoo.org> pkgcheck2html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgcheck2html b/pkgcheck2html index 9116234..908bbc5 16 --- a/pkgcheck2html +++ b/pkgcheck2html @@ -1 +1 @@ -Subproject commit 9116234beed832d9ea6c69f8e1545cccb84b65b0 +Subproject commit 908bbc58d898edd6ecfda743165abe5c302f8d96
[gentoo-commits] proj/portage:master commit in: lib/_emerge/
commit: ab472882b13ebe7a8a649c723928250dc8aeb740 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 10 05:04:20 2020 + Commit: Zac Medico gentoo org> CommitDate: Mon Feb 10 05:05:23 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=ab472882 depgraph: sort package set atoms for consistent results Traverse the unordered set returned from PackageSet.getAtoms() in sorted order, for more consistent results. Bug: https://bugs.gentoo.org/649622 Signed-off-by: Zac Medico gentoo.org> lib/_emerge/depgraph.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index 1eaf20035..dd29b607c 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -4383,7 +4383,7 @@ class depgraph(object): args = self._dynamic_config._initial_arg_list[:] for arg in self._expand_set_args(args, add_to_digraph=True): - for atom in arg.pset.getAtoms(): + for atom in sorted(arg.pset.getAtoms()): self._spinner_update() dep = Dependency(atom=atom, onlydeps=onlydeps, root=myroot, parent=arg) @@ -6975,7 +6975,7 @@ class depgraph(object): self._set_args(args) for arg in self._expand_set_args(args, add_to_digraph=True): - for atom in arg.pset.getAtoms(): + for atom in sorted(arg.pset.getAtoms(), reverse=True): self._dynamic_config._dep_stack.append( Dependency(atom=atom, root=arg.root_config.root, parent=arg, depth=self._UNREACHABLE_DEPTH)) @@ -9366,7 +9366,7 @@ class depgraph(object): # added via _add_pkg() so that they are included in the # digraph (needed at least for --tree display). for arg in self._expand_set_args(args, add_to_digraph=True): - for atom in arg.pset.getAtoms(): + for atom in sorted(arg.pset.getAtoms()): pkg, existing_node = self._select_package( arg.root_config.root, atom) if existing_node is None and \
[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/
commit: b4e246839d42a3c9a839801759c20f69c27df964 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 04:31:09 2020 + Commit: William Hubbs gentoo org> CommitDate: Mon Feb 10 04:31:09 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e24683 sys-apps/baselayout: Remove symlinked components when USE="-split-usr" Closes: https://bugs.gentoo.org/708698 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: William Hubbs gentoo.org> sys-apps/baselayout/baselayout-.ebuild | 15 +-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/sys-apps/baselayout/baselayout-.ebuild b/sys-apps/baselayout/baselayout-.ebuild index 274767b5eab..a4b8ca535ac 100644 --- a/sys-apps/baselayout/baselayout-.ebuild +++ b/sys-apps/baselayout/baselayout-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -188,6 +188,16 @@ src_prepare() { echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host fi + # don't want symlinked directories in PATH on systems with usr-merge + if ! use split-usr; then + sed \ + -e 's|/usr/local/sbin:||g' \ + -e 's|:/usr/sbin:|:|g' \ + -e 's|:/sbin:|:|g' \ + -e 's|:/bin:|:|g' \ + -i etc/env.d/50baselayout || die + fi + # handle multilib paths. do it here because we want this behavior # regardless of the C library that you're using. we do explicitly # list paths which the native ldconfig searches, but this isn't @@ -196,7 +206,8 @@ src_prepare() { # path and the symlinked path doesn't change the resulting cache. local libdir ldpaths for libdir in $(get_all_libdirs) ; do - ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}" + use split-usr && ldpaths+=":${EPREFIX}/${libdir}" + ldpaths+=":${EPREFIX}/usr/${libdir}" ldpaths+=":${EPREFIX}/usr/local/${libdir}" done echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
[gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/
commit: 63ef2e4f68dd4b6978641f4fbcd2d04af400d65c Author: William Hubbs gentoo org> AuthorDate: Mon Feb 10 04:31:31 2020 + Commit: William Hubbs gentoo org> CommitDate: Mon Feb 10 04:31:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ef2e4f sys-apps/baselayout: 2.7 bump Signed-off-by: William Hubbs gentoo.org> sys-apps/baselayout/Manifest | 1 + sys-apps/baselayout/baselayout-2.7.ebuild | 308 ++ 2 files changed, 309 insertions(+) diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest index b9d9da5be83..293c93ad739 100644 --- a/sys-apps/baselayout/Manifest +++ b/sys-apps/baselayout/Manifest @@ -1,2 +1,3 @@ DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b +DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild new file mode 100644 index 000..a4b8ca535ac --- /dev/null +++ b/sys-apps/baselayout/baselayout-2.7.ebuild @@ -0,0 +1,308 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib versionator prefix + +DESCRIPTION="Filesystem baselayout and init scripts" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"; +if [[ ${PV} = ]]; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"; + inherit git-r3 +else + SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="build kernel_FreeBSD kernel_linux +split-usr" + +pkg_setup() { + multilib_layout +} + +# Create our multilib dirs - the Makefile has no knowledge of this +multilib_layout() { + local dir def_libdir libdir libdirs + local prefix prefix_lst + def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI) + libdirs=$(get_all_libdirs) + : ${libdirs:=lib} # it isn't that we don't trust multilib.eclass... + + if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then + prefix_lst=( "${EROOT}"{,usr/,usr/local/} ) + for prefix in ${prefix_lst[@]}; do + for libdir in ${libdirs}; do + dir="${prefix}${libdir}" + if [[ -e "${dir}" ]]; then + [[ ! -d "${dir}" ]] && + die "${dir} exists but is not a directory" + continue + fi + if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then + einfo "symlinking ${dir} to usr/${libdir}" + ln -s usr/${libdir} ${dir} || + die " Unable to make ${dir} symlink" + else + einfo "creating directory ${dir}" + mkdir -p "${dir}" || + die "Unable to create ${dir} directory" + fi + done + done + return 0 + fi + + [ -z "${def_libdir}" ] && + die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid" + + # figure out which paths should be symlinks and which should be directories + local dirs syms exp d + for libdir in ${libdirs} ; do + if use split-usr ; then + exp=( {,usr/,usr/local/}${libdir} ) + else + exp=( {usr/,usr/local/}${libdir} ) + fi + for d in "${exp[@]}" ; do + # most things should be dirs + if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then + [ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}" +
[gentoo-commits] proj/baselayout: New tag: baselayout-2.7
commit: Commit: William Hubbs gentoo org> CommitDate: Mon Feb 10 04:22:56 2020 + New tag: baselayout-2.7
[gentoo-commits] proj/baselayout:master commit in: /
commit: cc1cbf18d3d1ecb8da6f3e4c6b87fec312687dcb Author: William Hubbs gentoo org> AuthorDate: Mon Feb 10 04:18:58 2020 + Commit: William Hubbs gentoo org> CommitDate: Mon Feb 10 04:18:58 2020 + URL:https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=cc1cbf18 update ChangeLog Signed-off-by: William Hubbs gentoo.org> ChangeLog | 209 -- 1 file changed, 12 insertions(+), 197 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b2107b2..cccb40f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,210 +1,25 @@ -commit dd9f112d8d400892ed9b610aee187040df307298 +commit 027ed4a8aec31f165bf224e92c193a261f3c13a9 Author: William Hubbs Commit: William Hubbs -bump version to 2.6 - -commit 8974c87e2d0e243c0fc2503fac5b40f447fac65f -Author: William Hubbs -Commit: William Hubbs - -profile: don't use ROOTPATH +update version to 2.7 -Since PATH is supposed to be the same for everyone, we can now drop the -code that handles ROOTPATH. - -commit 6e06295fd89f6e0605406dabbd7684171c034d4e -Author: William Hubbs -Commit: William Hubbs - -etc/profile: typo fix - -commit d56d1e147b23e972036fa9f6727bb2a675154435 -Author: William Hubbs -Commit: William Hubbs - -Makefile: do not touch .keep file if it already exists +Signed-off-by: William Hubbs -commit c41104c34243115adc668fdb4280d991f8e401b9 +commit 14c91b2c9dc77d6fc81746b999b92187bd9cac82 Author: William Hubbs Commit: William Hubbs -makefile: ignore touch failures for .keep files +enable protected_symlinks and protected_hardlinks by default -emerging with this being fatal worked for me, but not others, so -ignoring it. +Bug: https://bugs.gentoo.org/704914 +Signed-off-by: William Hubbs -commit 277e5b9e55717873b87eb541a95f4f2ae0c60a4d -Author: William Hubbs -Commit: William Hubbs - -Add sbin directories to path - -This is a partial revert of 9cac4dd130637fa2c1f1a64bf3c9d2509284e6dd. -We need to have path and rootpath be the same, to allow transitioning -packages before we drop rootpath. - -commit 2a075fb8bbffdbe3d948e2379a2300729a7bab93 -Author: William Hubbs +commit b46308e95323a243d976004118fb2a4f3b1e60b1 +Author: Mike Gilbert Commit: William Hubbs -Update ChangeLog - -commit bc596e56ff93ca121317a12d7033c5a5f5440046 -Author: William Hubbs -Commit: William Hubbs - -Fix installation of .keep files - -This partially reverts commit c4887e88316e2176dc99c173ccc6af825c10f745. -We need these .keep files. - -commit 9bbb700a3bfeaca7307a154564db00feff201e6e -Author: William Hubbs -Commit: William Hubbs - -Makefile: layout-usrmerge should do nothing on non-Linux systems - -commit c4887e88316e2176dc99c173ccc6af825c10f745 -Author: William Hubbs -Commit: William Hubbs - -Do not install .keep files - -commit 77e9c6f275399cdef64d432a19da51bc9c9cd0bf -Author: William Hubbs -Commit: William Hubbs - -add layout-usrmerge to optionally support the /usr merge - -commit 9cac4dd130637fa2c1f1a64bf3c9d2509284e6dd -Author: William Hubbs -Commit: William Hubbs - -Drop support for ROOTPATH - -The following is taken from /etc/profile: - -> Set up PATH depending on whether we're root or a normal user. -> There's no real reason to exclude sbin paths from the normal user, -> but it can make tab-completion easier when they aren't in the -> user's PATH to pollute the executable namespace. - -This seems like a minor inconvenience, and excluding sbin paths for the -normal user can cause bigger issues which will offset this inconvenience. - -commit ac52b58e7a8a7f8085de9f806645881740b22c5e -Author: William Hubbs -Date: Wed Oct 4 17:12:33 2017 -0500 - -Drop support for ROOTPATH - -The following is taken from /etc/profile: +services: add domain-s -This seems like a minor inconvenience, and not having *sbin in the path -can cause bigger compatibility issues which offset this inconvenience. - -diff --git a/etc/env.d/50baselayout b/etc/env.d/50baselayout -index e8662e0e..b10a2c4d 100644 ---- a/etc/env.d/50baselayout -+++ b/etc/env.d/50baselayout -@@ -1,8 +1,7 @@ - # /etc/env.d/50baselayout - # Do not edit this file - --PATH="/usr/local/bin:/usr/bin:/bin:/opt/bin" - -ROOTPATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin" - +PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin" - MANPATH="/usr/local/share/man:/usr/share/man" - INFOPATH="/usr/share/info" - CONFIG_PROTECT_MASK="/etc/gentoo-release" -diff --git a/etc/profile b/etc/profile -index 8e92e824..4579bd17 100644 ---- a/etc/profile -+++ b/etc/profile -@@ -18,16 +18,6 @@ export PAGER=${PAGER:-/usr/bin/less} - # 077 would be more secure, but 022 is generally quite realistic -
[gentoo-commits] proj/baselayout:master commit in: /
commit: 027ed4a8aec31f165bf224e92c193a261f3c13a9 Author: William Hubbs gentoo org> AuthorDate: Mon Feb 10 04:18:01 2020 + Commit: William Hubbs gentoo org> CommitDate: Mon Feb 10 04:18:01 2020 + URL:https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=027ed4a8 update version to 2.7 Signed-off-by: William Hubbs gentoo.org> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 05ed3e77..c0d7283e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ # It also has the added bonus of being easier to install on systems # without an ebuild style package manager. -PV = 2.6 +PV = 2.7 PKG = baselayout-$(PV) DISTFILE = $(PKG).tar.bz2
[gentoo-commits] proj/baselayout:master commit in: etc.Linux/sysctl.d/
commit: 14c91b2c9dc77d6fc81746b999b92187bd9cac82 Author: William Hubbs gentoo org> AuthorDate: Mon Feb 10 01:47:40 2020 + Commit: William Hubbs gentoo org> CommitDate: Mon Feb 10 04:12:03 2020 + URL:https://gitweb.gentoo.org/proj/baselayout.git/commit/?id=14c91b2c enable protected_symlinks and protected_hardlinks by default Bug: https://bugs.gentoo.org/704914 Signed-off-by: William Hubbs gentoo.org> etc.Linux/sysctl.d/00protected-links.conf | 2 ++ etc.Linux/sysctl.d/README | 15 +++ 2 files changed, 17 insertions(+) diff --git a/etc.Linux/sysctl.d/00protected-links.conf b/etc.Linux/sysctl.d/00protected-links.conf new file mode 100644 index ..5e4d7c6f --- /dev/null +++ b/etc.Linux/sysctl.d/00protected-links.conf @@ -0,0 +1,2 @@ +fs.protected_symlinks = 1 +fs.protected_hardlinks = 1 diff --git a/etc.Linux/sysctl.d/README b/etc.Linux/sysctl.d/README new file mode 100644 index ..dc609ac9 --- /dev/null +++ b/etc.Linux/sysctl.d/README @@ -0,0 +1,15 @@ +For more information on how kernel parameter configuration works, please see +the manpages sysctl(8) and sysctl.conf(5). + +In order for this to work properly, you must first +enable 'Sysctl support' in the kernel. + +Look in /proc/sys/ for all the things you can setup. +sysctl processes files that end in *.conf in directories in the +following order before processing /etc/sysctl.conf. + +- /run/sysctl.d +- /etc/sysctl.d +- /usr/local/lib/sysctl.d +- /usr/lib/sysctl.d +- /lib/sysctl.d
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
commit: 240e7124f02a84a572a7a115e9f0df22579e1c55 Author: Zac Medico gentoo org> AuthorDate: Mon Feb 10 03:18:26 2020 + Commit: Zac Medico gentoo org> CommitDate: Mon Feb 10 03:18:53 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=240e7124 ResolverPlayground: set PORTAGE_DEBUG=1 for debug mode Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/ResolverPlayground.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py index d7fbe4390..cc0aa46e9 100644 --- a/lib/portage/tests/resolver/ResolverPlayground.py +++ b/lib/portage/tests/resolver/ResolverPlayground.py @@ -555,6 +555,9 @@ class ResolverPlayground(object): "PORTAGE_REPOSITORIES": "\n".join("[%s]\n%s" % (repo_name, "\n".join("%s = %s" % (k, v) for k, v in repo_config.items())) for repo_name, repo_config in self._repositories.items()) } + if self.debug: + env["PORTAGE_DEBUG"] = "1" + trees = portage.create_trees(env=env, eprefix=self.eprefix, **create_trees_kwargs)
[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
commit: 7156f31c6ab4a26e85a2addfbebd98dbb5fadbf3 Author: Richard Freeman gentoo org> AuthorDate: Mon Feb 10 02:37:22 2020 + Commit: Richard Freeman gentoo org> CommitDate: Mon Feb 10 02:37:22 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7156f31c sys-apps/systemd: amd64 stable Bug: https://bugs.gentoo.org/708806 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Richard Freeman gentoo.org> sys-apps/systemd/systemd-244.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-244.2.ebuild b/sys-apps/systemd/systemd-244.2.ebuild index 2a74ef0ef0b..6080f4368de 100644 --- a/sys-apps/systemd/systemd-244.2.ebuild +++ b/sys-apps/systemd/systemd-244.2.ebuild @@ -16,7 +16,7 @@ else MY_P=${MY_PN}-${MY_PV} S=${WORKDIR}/${MY_P} SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi PYTHON_COMPAT=( python3_{6,7,8} )
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
commit: b98dbb357b711f64c8fc1e305c5bca38be203f1d Author: Zac Medico gentoo org> AuthorDate: Mon Feb 10 01:10:14 2020 + Commit: Zac Medico gentoo org> CommitDate: Mon Feb 10 02:24:11 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=b98dbb35 test_virtual_w3m: add realistic case, deps copied from real ebuilds Since virtual/w3m-0 is not removed in the depclean case, this test fails to reproduce bug 649622. Bug: https://bugs.gentoo.org/649622 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_or_choices.py | 142 ++ 1 file changed, 142 insertions(+) diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py index a7ede1fac..f31a5ff22 100644 --- a/lib/portage/tests/resolver/test_or_choices.py +++ b/lib/portage/tests/resolver/test_or_choices.py @@ -581,6 +581,148 @@ class OrChoicesTestCase(TestCase): playground.cleanup() + def test_virtual_w3m_realistic(self): + """ + Test for bug 649622 with realistic www-client/w3m dependencies copied + from real ebuilds. + """ + ebuilds = { + + 'app-misc/neofetch-6.1.0': { + 'EAPI': '7', + 'RDEPEND': 'www-client/w3m' + }, + + 'app-text/xmlto-0.0.28-r1' : { + 'EAPI': '7', + 'RDEPEND': '|| ( virtual/w3m www-client/lynx www-client/elinks )' + }, + + 'mail-client/neomutt-20191207': { + 'EAPI': '7', + 'RDEPEND': '|| ( www-client/lynx www-client/w3m www-client/elinks )' + }, + + 'www-client/elinks-0.13_pre_pre20180225' : { + 'EAPI': '7', + }, + + 'www-client/lynx-2.9.0_pre4' : { + 'EAPI': '7', + }, + + 'virtual/w3m-0' : { + 'EAPI': '7', + 'RDEPEND': '|| ( www-client/w3m www-client/w3mmee )' + }, + + 'www-client/w3m-0.5.3_p20190105' : { + 'EAPI': '7', + }, + + 'www-client/w3mmee-0.3.2_p24-r10' : { + 'EAPI': '7', + }, + + 'x11-base/xorg-server-1.20.7' : { + 'EAPI': '7', + 'RDEPEND': '|| ( www-client/links www-client/lynx www-client/w3m ) app-text/xmlto', + } + } + + installed = { + + 'app-misc/neofetch-6.1.0': { + 'EAPI': '7', + 'RDEPEND': 'www-client/w3m' + }, + + 'app-text/xmlto-0.0.28-r1' : { + 'EAPI': '7', + 'RDEPEND': '|| ( virtual/w3m www-client/lynx www-client/elinks )' + }, + + 'mail-client/neomutt-20191207': { + 'EAPI': '7', + 'RDEPEND': '|| ( www-client/lynx www-client/w3m www-client/elinks )' + }, + + 'www-client/lynx-2.9.0_pre4' : { + 'EAPI': '7', + }, + + 'www-client/w3m-0.5.3_p20190105' : { + 'EAPI': '7', + }, + + 'x11-base/xorg-server-1.20.7' : { + 'EAPI': '7', + 'RDEPEND': '|| ( www-client/links www-client/lynx www-client/w3m ) app-text/xmlto', + } + } + + world = ['app-misc/neofetch', 'mail-client/neomutt', 'www-client/lynx', 'x11-base/xorg-server'] + + test_cases = ( + + # Test for bug 649622 (with www-client/w3m installed via + # xorg-server dependency), where virtual/w3m was pulled in + # only to be removed by the next emerge --depclean. + ResolverPlaygroundTestCase( + ['@world'], + options = {'--update': True, '--deep': True}, + success = True, + mergelist=['virtual/w3m-0'], + ), + + ) + + playground = ResolverPlayground(ebuilds=ebuilds, + installed=installed, world=world, debug=False) + try: +
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/
commit: 924f2ee73dcbdf054690c2e5903a31a982d2dd5d Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Feb 10 02:12:36 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Feb 10 02:12:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=924f2ee7 net-im/telegram-desktop: remove empty line from ebuild Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild index fcae9f9ea3e..660977c09e0 100644 --- a/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild @@ -73,7 +73,6 @@ PATCHES=( "${FILESDIR}/musl.patch" ) - src_configure() { local mycxxflags=( -Wno-deprecated-declarations
[gentoo-commits] repo/gentoo:master commit in: app-emulation/faudio/
commit: c0f76fcf2a1063d6cfa3c075bad842f45439e6de Author: Maxime Lombard gmail com> AuthorDate: Sat Feb 8 22:50:41 2020 + Commit: Nick Sarnie gentoo org> CommitDate: Mon Feb 10 01:56:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f76fcf app-emulation/faudio: Bump to 20.02 Closes: https://bugs.gentoo.org/708748 Closes: https://github.com/gentoo/gentoo/pull/14599 Signed-off-by: Maxime Lombard gmail.com> Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/faudio/Manifest| 1 + app-emulation/faudio/faudio-20.02.ebuild | 97 app-emulation/faudio/metadata.xml| 1 + 3 files changed, 99 insertions(+) diff --git a/app-emulation/faudio/Manifest b/app-emulation/faudio/Manifest index 443bc87e55e..e25f8cfe60a 100644 --- a/app-emulation/faudio/Manifest +++ b/app-emulation/faudio/Manifest @@ -1,2 +1,3 @@ DIST FAudio-19.06.tar.gz 899089 BLAKE2B a59ad9613bcfa71e1fc8be1f2d389f56b8f96430c354b7c7148d1e1e084102b6d8559cd258f3ab6969a4ac93e55ea2397b18dc417857e9ee0f022ea0dae65c0e SHA512 ba3ee18b47d8d85dc39e777c420522349f9873cf1528dd6c266f7254fe27cdb5bb6ab5bcbeab870938b509bfd006590d2380908b7d1e3fd679d2a434ce82eca6 DIST FAudio-19.09.tar.gz 901659 BLAKE2B 8bb99c67b6da2660e71c7a8a70f83130738a07e7f4ddd2001fb857c81a593935506a8c1fe6d24bfd064537ea4a5a603973c32d839228d7b3f45c9c300ba15147 SHA512 127f975c68e2b449fa7cadae0723925f35ca7a2841ea3fd85037febe964331de4b2e3031ab09c292ee5f40d90902dcf78c75cc3fe7fbe4d6f37a822b4d9eb966 +DIST FAudio-20.02.tar.gz 908051 BLAKE2B 7f9323e7528949680b39469b3549adbef9acafe6f293c643676117648fd6871639fa8c7a47fdc0e1232c0533c0af9e89953415a0935fa4ad7b831aa8a8243f30 SHA512 69995fa1fb9ea41182e47f8143252db517adf4e9dc4a0556c9032af5c867259cc7edc81196b10ef043e6118a2e3687b34368f3ac8ffe9294398c5143b9928476 diff --git a/app-emulation/faudio/faudio-20.02.ebuild b/app-emulation/faudio/faudio-20.02.ebuild new file mode 100644 index 000..3b8290fd880 --- /dev/null +++ b/app-emulation/faudio/faudio-20.02.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# shellcheck disable=SC2034 +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake-multilib virtualx + +FAUDIO_PN="FAudio" +FAUDIO_PV="${PV}" +FAUDIO_P="${FAUDIO_PN}-${FAUDIO_PV}" + +if [[ "${PV}" == "" ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/FNA-XNA/${FAUDIO_PN}.git"; +else + SRC_URI="https://github.com/FNA-XNA/${FAUDIO_PN}/archive/${FAUDIO_PV}.tar.gz -> ${FAUDIO_P}.tar.gz" + KEYWORDS="-* ~amd64 ~x86" + S="${WORKDIR}/${FAUDIO_P}" +fi + +DESCRIPTION="FAudio - Accuracy-focused XAudio reimplementation for open platforms" +HOMEPAGE="https://fna-xna.github.io/"; +LICENSE="ZLIB" +SLOT="0" + +IUSE="+abi_x86_32 +abi_x86_64 debug dumpvoices ffmpeg xnasong test utils" +RESTRICT="!test? ( test )" +REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" + +COMMON_DEPEND=" + >=media-libs/libsdl2-2.0.9[sound,${MULTILIB_USEDEP}] + ffmpeg? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] ) +" +RDEPEND="${COMMON_DEPEND} +" +DEPEND="${COMMON_DEPEND} +" + +multilib_src_configure() { + local mycmakeargs=( + "-DCMAKE_INSTALL_BINDIR=bin" + "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" + "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" + "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" + "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" + "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" + "-DBUILD_TESTS=$(usex test ON OFF)" + "-DBUILD_UTILS=$(usex utils ON OFF)" + "-DDUMP_VOICES=$(usex dumpvoices ON OFF)" + "-DFFMPEG=$(usex ffmpeg ON OFF)" + "-DXNASONG=$(usex xnasong ON OFF)" + ) + if use ffmpeg; then + mycmakeargs+=( "-DFFmpeg_LIBRARY_DIRS=${EPREFIX}/usr/$(get_libdir)" ) + fi + cmake-utils_src_configure +} + +src_configure() { + cmake-multilib_src_configure +} + +multilib_src_compile() { + cmake-utils_src_make + emake -C "${BUILD_DIR}" all +} + +multilib_src_install() { + # FIXME: do we want to install the FAudio tools? + cmake-utils_src_install + + sed -e "s@%LIB%@$(get_libdir)@g" -e "s@%PREFIX%@${EPREFIX}/usr@g" \ + "${FILESDIR}/faudio.pc" > "${T}/faudio.pc" \ + || die "sed failed" + insinto "/usr/$(get_libdir)/pkgconfig" + doins "${T}/faudio.pc" + + if use test; then + mkdir -p "${T}/$(get_libdir)" || die + cp "${BUILD_DIR}/faudio_tests" "${T}/$(get_libdir)/" || die "cp failed" + fi +} + +faudio_test() { + XDG_RUNTIME_DIR="/run/user/0" virtx "${T}/$(get_libdir)/faudio_tests" +} + +pkg_postinst() { + use test || return + + # FIXME: FAudio tests are broken and
[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/ppc64le/17.0/musl/, ...
commit: 49531052854a63c0a4439f989cd27d731c1463de Author: Georgy Yakovlev gentoo org> AuthorDate: Mon Feb 10 01:26:48 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Mon Feb 10 01:26:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49531052 profiles/arch/{ppc64,ppc64le}/musl: change CHOST vendor string to gentoo Signed-off-by: Georgy Yakovlev gentoo.org> profiles/default/linux/ppc64/17.0/musl/make.defaults | 2 +- profiles/default/linux/ppc64le/17.0/musl/make.defaults | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/profiles/default/linux/ppc64/17.0/musl/make.defaults b/profiles/default/linux/ppc64/17.0/musl/make.defaults index 34e0d7abf46..253d3c25da0 100644 --- a/profiles/default/linux/ppc64/17.0/musl/make.defaults +++ b/profiles/default/linux/ppc64/17.0/musl/make.defaults @@ -1,6 +1,6 @@ # Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -CHOST="powerpc64-unknown-linux-musl" +CHOST="powerpc64-gentoo-linux-musl" CHOST_ppc64="${CHOST}" LIBDIR_ppc64="lib" diff --git a/profiles/default/linux/ppc64le/17.0/musl/make.defaults b/profiles/default/linux/ppc64le/17.0/musl/make.defaults index 5d7c33d5787..94b5aaa827a 100644 --- a/profiles/default/linux/ppc64le/17.0/musl/make.defaults +++ b/profiles/default/linux/ppc64le/17.0/musl/make.defaults @@ -1,6 +1,6 @@ # Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -CHOST="powerpc64le-unknown-linux-musl" +CHOST="powerpc64le-gentoo-linux-musl" CHOST_ppc64="${CHOST}" LIBDIR_ppc64="lib"
[gentoo-commits] repo/gentoo:master commit in: games-action/extreme-tuxracer/
commit: 051ba174b8fe5f83e22d6bb3bc2240c96799c2be Author: Stefan Strogin gentoo org> AuthorDate: Mon Feb 10 01:09:05 2020 + Commit: Stefan Strogin gentoo org> CommitDate: Mon Feb 10 01:11:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=051ba174 games-action/extreme-tuxracer: version bump to 0.7.5 EAPI=7; move from gnome2-utils to xdg-utils. Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Stefan Strogin gentoo.org> games-action/extreme-tuxracer/Manifest | 1 + .../extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild | 48 ++ 2 files changed, 49 insertions(+) diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest index a7043b6c193..dd0e5708ac9 100644 --- a/games-action/extreme-tuxracer/Manifest +++ b/games-action/extreme-tuxracer/Manifest @@ -1 +1,2 @@ DIST etr-0.7.4.tar.xz 44179876 BLAKE2B 040554b8053e7f513526b5394793740e002348e169453dcbd1cec28fa15e1abff13c1b02cbd61552d04974e3ec508b0d9b24e1162e4d113f284103b877d9 SHA512 780263859ee3510b0c421f10c190b479db62a1268def14f18ecf7ff84c470cf28f1a2b077fcb21d8bd447cde8b3a7f280aced5cd830eb3aa174b3e461e9efae1 +DIST extreme-tuxracer-0.7.5.tar.xz 44180024 BLAKE2B 6c4cb4cdfe19e376a6bc5fa164ea17592f0aa46b5d297957219a501e8b294e3a071909b2ce168424e734e1d06a5ef81647d5a392e6943b71a6bafd50890206e3 SHA512 62ea5ccdacb3e793760fe793133f1866179dffd938fd4b8e5c369371d847320a247bf85a89648b7c01078dc18a65ac6eac30a59bfe710032c79c16ab93f9e4aa diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild new file mode 100644 index 000..37ca8a6dbf5 --- /dev/null +++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.7.5.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop xdg-utils + +DESCRIPTION="High speed arctic racing game based on Tux Racer" +HOMEPAGE="https://extremetuxracer.sourceforge.net"; +SRC_URI="https://download.sourceforge.net/extremetuxracer/etr-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + media-libs/libsfml:0= + virtual/glu + virtual/opengl +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/etr-${PV/_/}" + +src_prepare() { + default + # kind of ugly in there so we'll do it ourselves + sed -i -e '/SUBDIRS/s/resources doc//' Makefile.am || die + eautoreconf +} + +src_install() { + default + dodoc doc/{code,courses_events,guide,score_algorithm} + doicon -s 48 resources/etr.png + doicon -s scalable resources/etr.svg + domenu resources/etr.desktop +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp5/
commit: 8d0cc69227bbca4f88d0e4da3a5879dd41ae685b Author: Miroslav Šulc gentoo org> AuthorDate: Mon Feb 10 00:53:21 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Feb 10 00:53:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d0cc692 dev-ml/camlp5: restricted 7.10 wrt ocaml Closes: https://bugs.gentoo.org/708924 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/camlp5/camlp5-7.10.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/camlp5/camlp5-7.10.ebuild b/dev-ml/camlp5/camlp5-7.10.ebuild index 542b744b42f..5d5237a3aeb 100644 --- a/dev-ml/camlp5/camlp5-7.10.ebuild +++ b/dev-ml/camlp5/camlp5-7.10.ebuild @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha ~amd64 ~ppc ~x86" IUSE="doc +ocamlopt" -DEPEND="dev-lang/ocaml" +DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp5/
commit: 265051f1c0d66801b385cfce96b75163a973b04a Author: Miroslav Šulc gentoo org> AuthorDate: Mon Feb 10 00:49:58 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Mon Feb 10 00:53:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265051f1 dev-ml/camlp5: bump to 7.11 Bug: https://bugs.gentoo.org/708924 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/camlp5/Manifest | 1 + dev-ml/camlp5/camlp5-7.11.ebuild | 48 2 files changed, 49 insertions(+) diff --git a/dev-ml/camlp5/Manifest b/dev-ml/camlp5/Manifest index 8b95932ffc1..e8a48e6da5c 100644 --- a/dev-ml/camlp5/Manifest +++ b/dev-ml/camlp5/Manifest @@ -3,3 +3,4 @@ DIST camlp5-7.00.tar.gz 755750 BLAKE2B b047422ff34c4d15c21b65bd7473ccdad8bfc1f48 DIST camlp5-7.01.tar.gz 757118 BLAKE2B 5d7c6f39f24bfee545552aae5c126305d2c767d06762aa516c21bcc5b327b312b7c38d742717eb507b92ae1e27de9c0fcde4d616754a7ce616b5f56689c8dc5a SHA512 9930957f707d9d2c8903f87f5f3444f71bad3d84c944436c7abc6de19209595c974098cd60a6a391f8ae87c4fb53b5122cba8e42e34fcf46d798dbdc28840008 DIST camlp5-7.03.tar.gz 758136 BLAKE2B 4e1169adf7e119f1f659fe684a8b06c4730db3bcd7807169552de0e3fc115f8d45bc11961f3aee0a9c2d86e1130ec776a1bb7753d7d4e95f661d65d1f841406c SHA512 0c76d469c5f8c727088f3136107b6690349b50791ef8baefffdaa90141230907f977a7a886a9e8d88d39d8fa315637d882d0205c57d752e16575c888a8a1f54d DIST camlp5-7.10.tar.gz 849559 BLAKE2B b05624156e914c2657d76afbf3dfacd295fe5985ae3809959a40029a8052669be6ae8a6ff889fbf2c602d3f19c9995f013b388c140738f4bb4f4da9970911ed5 SHA512 faa9e88f56477162038fc80429d5839c93b3e38aec90366730babe737e2e6bb260dc39975947a6601212cc0c68f465bdbccb6337da23c07181909dfb11cf8640 +DIST camlp5-7.11.tar.gz 878224 BLAKE2B f384764da43653a2f75664681a4f202ec84497720470a0a33f99fc61a1ce7b4a9d494ffe6b523c74906c122ee04ae25a08bf1fcd356145e85a11e3e3095bbf7d SHA512 109a43f0a3aaa7a3ba9bd51b1fc1273b054d32787e189b138d69b39c42642b480c13abb9e91f15e6b6e889eaf4dc422ad3ff51e4dee298fb9d8cd9a2db99c159 diff --git a/dev-ml/camlp5/camlp5-7.11.ebuild b/dev-ml/camlp5/camlp5-7.11.ebuild new file mode 100644 index 000..542b744b42f --- /dev/null +++ b/dev-ml/camlp5/camlp5-7.11.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib + +DESCRIPTION="A preprocessor-pretty-printer of ocaml" +HOMEPAGE="https://camlp5.github.io/"; +SRC_URI="https://github.com/camlp5/camlp5/archive/rel$(ver_rs 1- '').tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-rel$(ver_rs 1- '')" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~alpha ~amd64 ~ppc ~x86" +IUSE="doc +ocamlopt" + +DEPEND="dev-lang/ocaml" +RDEPEND="${DEPEND}" + +DOCS="CHANGES DEVEL ICHANGES README.md UPGRADING MODE" + +src_configure() { + ./configure \ + --strict \ + -prefix /usr \ + -bindir /usr/bin \ + -libdir /usr/$(get_libdir)/ocaml \ + -mandir /usr/share/man || die "configure failed" +} + +src_compile(){ + emake out + if use ocamlopt; then + emake opt + emake opt.opt + fi +} + +src_install() { + use doc && HTML_DOCS="doc/*" + + default + + # findlib support + insinto "$(ocamlfind printconf destdir)/${PN}" + doins etc/META +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/boost-build/
commit: 7a34463f4eb348a42eda5d6a6e686cf64c3d3f9b Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:25:40 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:25:40 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a34463f dev-util/boost-build: Remove old Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> dev-util/boost-build/Manifest | 1 - dev-util/boost-build/boost-build-1.71.0.ebuild | 104 - 2 files changed, 105 deletions(-) diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest index 2fab5165b1b..34653ed7e2e 100644 --- a/dev-util/boost-build/Manifest +++ b/dev-util/boost-build/Manifest @@ -1,2 +1 @@ -DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 diff --git a/dev-util/boost-build/boost-build-1.71.0.ebuild b/dev-util/boost-build/boost-build-1.71.0.ebuild deleted file mode 100644 index 721f88bcf9f..000 --- a/dev-util/boost-build/boost-build-1.71.0.ebuild +++ /dev/null @@ -1,104 +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 prefix python-single-r1 toolchain-funcs - -MY_PV="$(ver_rs 1- _)" - -DESCRIPTION="A system for large project software construction, simple to use and powerful" -HOMEPAGE="https://boostorg.github.io/build/"; -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"; - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="examples python test" -RESTRICT="test" - -RDEPEND="python? ( ${PYTHON_DEPS} ) - !/dev/null || die - eapply "${FILESDIR}"/${PN}-1.71.0-fix-test.patch - popd >/dev/null || die -} - -src_configure() { - hprefixify engine/Jambase - tc-export CXX -} - -src_compile() { - cd engine || die - ./build.sh cxx -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed" -} - -src_test() { - cd ../test || die - - local -x TMP="${T}" - - DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py - - if [[ -s test_results.txt ]]; then - eerror "At least one test failed: $(
[gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/
commit: f4bbdc6b4ecdee3af95ccd05a073fe66d47a9611 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:25:37 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:25:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4bbdc6b dev-libs/boost: Remove old Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> dev-libs/boost/Manifest| 1 - dev-libs/boost/boost-1.71.0.ebuild | 335 - 2 files changed, 336 deletions(-) diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest index 2fab5165b1b..34653ed7e2e 100644 --- a/dev-libs/boost/Manifest +++ b/dev-libs/boost/Manifest @@ -1,2 +1 @@ -DIST boost_1_71_0.tar.bz2 100124647 BLAKE2B edf5a03d5a5a63ef5826ef3c19a5ee862a43eb93e8e3d76f8a0d1f2c23122f5a0535e045058110574cd19092f3199c28ab9dae53f9db05ffe8c0b0b8cdbe27a9 SHA512 b7937d50c4512cf13cadd0ca829de36cf2cbc6fb788f45b1d4565ad0753e2b206c545125a5862016c2f16016f2e4a6b687928963b466fff17c3e0a4437142c20 DIST boost_1_72_0.tar.bz2 106907358 BLAKE2B ab270a0e3cb24da687d86785e2d2e6d7731b4dbc07bd839eadb642dfa5a428ad584acb1f3529661a8de9a986008ff3427491041059ea2b742348d02e00761cd8 SHA512 63bbd1743e7c904b2e69fdc2eafd1c2a8a30fd70d960dcd366059d0100f000cb605d56cbd9397bb18421631f1c9552a772c434d0f0caddbe56302273f51fd1f6 diff --git a/dev-libs/boost/boost-1.71.0.ebuild b/dev-libs/boost/boost-1.71.0.ebuild deleted file mode 100644 index d4c6da3453b..000 --- a/dev-libs/boost/boost-1.71.0.ebuild +++ /dev/null @@ -1,335 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) - -inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal - -MY_PV="$(ver_rs 1- _)" -MAJOR_V="$(ver_cut 1-2)" - -DESCRIPTION="Boost Libraries for C++" -HOMEPAGE="https://www.boost.org/"; -SRC_URI="https://dl.bintray.com/boostorg/release/${PV}/source/boost_${MY_PV}.tar.bz2"; - -LICENSE="Boost-1.0" -SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122 -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt" -IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd" -REQUIRED_USE=" - mpi? ( threads ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# the tests will never fail because these are not intended as sanity -# tests at all. They are more a way for upstream to check their own code -# on new compilers. Since they would either be completely unreliable -# (failing for no good reason) or completely useless (never failing) -# there is no point in having them in the ebuild to begin with. -RESTRICT="test" - -RDEPEND=" - !app-admin/eselect-boost - !dev-libs/boost-numpy - bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] ) - !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] ) - python? ( - ${PYTHON_DEPS} - numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] ) - ) - zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="=dev-util/boost-build-${MAJOR_V}*" - -S="${WORKDIR}/${PN}_${MY_PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.71.0-disable_icu_rpath.patch - "${FILESDIR}"/${PN}-1.71.0-context-x32.patch - "${FILESDIR}"/${PN}-1.71.0-build-auto_index-tool.patch -) - -python_bindings_needed() { - multilib_is_native_abi && use python -} - -tools_needed() { - multilib_is_native_abi && use tools -} - -create_user-config.jam() { - local user_config_jam="${BUILD_DIR}"/user-config.jam - if [[ -s ${user_config_jam} ]]; then - einfo "${user_config_jam} already exists, skipping configuration" - return - else - einfo "Creating configuration in ${user_config_jam}" - fi - - local compiler compiler_version compiler_executable="$(tc-getCXX)" - if [[ ${CHOST} == *-darwin* ]]; then - compiler="darwin" - compiler_version="$(gcc-fullversion)" - else - compiler="gcc" - compiler_version="$(gcc-version)" - fi - - if use mpi; then - local mpi_configuration="using mpi ;" - fi - - cat > "${user_config_jam}" <<- __EOF__ || die - using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ; - ${mpi_configuration} - __EOF__ - - if python_bindings_needed; then - append_to_user_config() { -
[gentoo-commits] repo/gentoo:master commit in: net-libs/zeromq/
commit: ea2e327b10caed02f6fbb0d996f34756b2cdab74 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:25:43 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:25:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2e327b net-libs/zeromq: [QA] Fix dependency.equalsversion Closes: https://github.com/gentoo/gentoo/pull/14609 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> net-libs/zeromq/zeromq-4.3.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-libs/zeromq/zeromq-4.3.2.ebuild b/net-libs/zeromq/zeromq-4.3.2.ebuild index cbd9d012e30..0874e5a0f29 100644 --- a/net-libs/zeromq/zeromq-4.3.2.ebuild +++ b/net-libs/zeromq/zeromq-4.3.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -18,7 +18,7 @@ RESTRICT="!test? ( test )" RDEPEND=" !elibc_Darwin? ( unwind? ( sys-libs/libunwind ) ) sodium? ( dev-libs/libsodium:= ) - pgm? ( =net-libs/openpgm-5.2.122 )" + pgm? ( ~net-libs/openpgm-5.2.122 )" DEPEND="${RDEPEND} !elibc_Darwin? ( sys-apps/util-linux ) doc? (
[gentoo-commits] repo/gentoo:master commit in: sys-apps/gpet/
commit: ae8ba39eb2d302a9cb7028ba897598de00be40ab Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:04 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae8ba39e sys-apps/gpet: Port to EAPI 7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> sys-apps/gpet/gpet-0.4.ebuild | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sys-apps/gpet/gpet-0.4.ebuild b/sys-apps/gpet/gpet-0.4.ebuild index 116891f3994..70a0b701a92 100644 --- a/sys-apps/gpet/gpet-0.4.ebuild +++ b/sys-apps/gpet/gpet-0.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 DESCRIPTION="GTK+ based TOMOYO policy editor" HOMEPAGE="http://en.sourceforge.jp/projects/gpet/"; @@ -10,13 +10,14 @@ SRC_URI="mirror://sourceforge.jp/gpet/53178/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="" -RDEPEND="gnome-base/gconf +RDEPEND=" + gnome-base/gconf sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: c7d2cf5e111398e66d7520852aaf4c095ed4b5a2 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:19 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d2cf5e package.mask: Mask sys-apps/hbaapi for last rites Signed-off-by: David Seifert gentoo.org> profiles/package.mask | 6 ++ 1 file changed, 6 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 6b29f509a41..42ef564f405 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,12 @@ #--- END OF EXAMPLES --- +# David Seifert (2020-02-10) +# Unmaintained, EAPI 4, doesn't respect CFLAGS and LDFLAGS, which masks +# undefined symbols in the shared object, upstream gone, no other distro +# packages this anymore, no revdeps. Removal in 30 days. +sys-apps/hbaapi + # Andreas Sturmlechner (2020-02-09) # Dead upstream, broken by Qt 5.14, bug #703930. Masked for removal in 30 days. net-nntp/kwooty
[gentoo-commits] repo/gentoo:master commit in: sys-apps/gscanbus/files/, sys-apps/gscanbus/
commit: ee6618e3c33ea3fce11ae1d0821a54c13d5151c4 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:16 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6618e3 sys-apps/gscanbus: Port to EAPI 7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> ...canbus-0.8-Wimplicit-function-declaration.patch | 22 ++ sys-apps/gscanbus/gscanbus-0.8.ebuild | 14 +++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch b/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch new file mode 100644 index 000..79a585694ab --- /dev/null +++ b/sys-apps/gscanbus/files/gscanbus-0.8-Wimplicit-function-declaration.patch @@ -0,0 +1,22 @@ +--- a/decodeselfid.c b/decodeselfid.c +@@ -25,6 +25,8 @@ + + #include "decodeselfid.h" + ++#include ++ + void printbin(FILE *stream, unsigned int i, unsigned char width) { + int j; + for (j=0; j ++ + void fatal(char *s) { + fprintf(stderr, "Error: %s\n", s); + exit(1); diff --git a/sys-apps/gscanbus/gscanbus-0.8.ebuild b/sys-apps/gscanbus/gscanbus-0.8.ebuild index 693ade0c091..98a308f1c30 100644 --- a/sys-apps/gscanbus/gscanbus-0.8.ebuild +++ b/sys-apps/gscanbus/gscanbus-0.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 DESCRIPTION="Bus scanning, testing and topology visualizing tool for Linux IEEE1394 subsystem" HOMEPAGE="https://sourceforge.net/projects/gscanbus.berlios/"; @@ -10,11 +10,11 @@ SRC_URI="mirror://sourceforge/${PN}.berlios/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -IUSE="" -RDEPEND="sys-libs/libraw1394 +RDEPEND=" + sys-libs/libraw1394 x11-libs/gtk+:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -DOCS=( AUTHORS README TODO ) +PATCHES=( "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch )
[gentoo-commits] repo/gentoo:master commit in: sys-apps/collectl/
commit: 09fc0162f52973550fe38d66caa1af01805fe4a7 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:10 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fc0162 sys-apps/collectl: Remove old Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> sys-apps/collectl/Manifest | 6 - sys-apps/collectl/collectl-3.7.4.ebuild | 36 -- sys-apps/collectl/collectl-4.0.5.ebuild | 36 -- sys-apps/collectl/collectl-4.1.0.ebuild | 36 -- sys-apps/collectl/collectl-4.1.3.ebuild | 36 -- sys-apps/collectl/collectl-4.2.0.ebuild | 45 - sys-apps/collectl/collectl-4.3.0.ebuild | 45 - 7 files changed, 240 deletions(-) diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest index 76ef5d30404..d7fd4783adf 100644 --- a/sys-apps/collectl/Manifest +++ b/sys-apps/collectl/Manifest @@ -1,7 +1 @@ -DIST collectl-3.7.4.src.tar.gz 462752 BLAKE2B 40d5e0e4f78951c6e28187e585c3079e5a25366e2569808f42a588ce2985277f42525d4876679a9398ed157e4b1d62861adec00f3171eee0b8547a93a54a71ff SHA512 f25686fe977e0a3ea45a1980eea87baaa92a2d81ec308838c137d181e2bf182df6cdf453c5c6e7f3f0b2ccd3066d17ab9c4137303b587f55303dd4afe7ae35da -DIST collectl-4.0.5.src.tar.gz 624040 BLAKE2B 83e9c0eff03bc1560aa62e97fd788bb3e22b3484333afc72fea1e35e97b9db723f690ed6b06728f641b1f7ec3f939423eca198926cfa821fb8121973a39c2746 SHA512 a7bcc8c100f4aa1bc24b6f65bf1271ae3757dc37adba67982e85a7159faa9c1ea912553e5e918a79b95cf2ec1126094abad0a654e343a9be940ad11c4cdcc42c -DIST collectl-4.1.0.src.tar.gz 625147 BLAKE2B 60361e16bdc1ac7619d3e36b12f17f02703266fe43f0c0ec59e89a1a0c8d2ffd5a0eb6bc693fab98fdd14d4d8416865f2520f55026105bfef6697e93627c0d4b SHA512 b74918e458f4e7e9c6b598b078ef9522ba307b0055c0488167785d226f74a960bd075804128caef756d40a9c5a3f0189e912984c1b0c9bf62c537921e94714c5 -DIST collectl-4.1.3.src.tar.gz 634862 BLAKE2B a76fe50a9c26c5e25d951a4efceceb6474a46593180ef18d1cf346a8d52e6b3f43bd6d0b410fc36dcfd694f2ebfd35b232e6939df319e086897a74679affe57c SHA512 2938f349708dba164915fd44e7c2a58cc5088e3bafa9009c82973d5f03f8f62395cde925c6e3c1d49c6e22b653a7d1be352ec70dbabcc68b68fb3a795c1b5da8 -DIST collectl-4.2.0.src.tar.gz 634317 BLAKE2B 2c6f34dbc5ddc6616c5eb2a917d5c20dba10c9a600bb08a2cfeb6fc01ed7d916423d4fd1e1fdb7447f53c76a0fddc46087296ece671ca401e60a0c6c042dc20f SHA512 a0c3fd393a3fd3e34a838be26ebe4f111d5b62016d6c319cc556af93bec42672bd700c30c1b9a877fce049b0c11a6fbaf70c4c140ecf8f854408849a6d3a7855 -DIST collectl-4.3.0.src.tar.gz 634357 BLAKE2B 1e5e500d8c7b06e9d6262a599700d2b2104eea18c0fd57e36a493eb8c6c56e3701b73bbb60a1b5c12cd14cd7bced1730db737109da5d07bab73290a9fa5e818e SHA512 bc1cf9f36748ca496599bc52b3fe786fda44459b17b7410c96588ca28fe24529f51534318f62915da276a23085c33947abbe3ece479ba76a86ba7e0317587879 DIST collectl-4.3.1.src.tar.gz 620693 BLAKE2B bcf8c41e0f6b51daa32fa9752dfd603230321718de190a8a9d71bf71e2c5f65e3b170bc85fbdcc78d2ab131bf5a5bfdfebf49225151ecf2cc444d2ca4ef0faaf SHA512 6f2df8a3da37f7ccb9d7f34a20e63b0601e5da7126bb3a9a11af7ee4959b682d59f44a1885bfb5882410e9de0191093ea4d5d43c8f2fa0f0904fd2ca4a3c5a90 diff --git a/sys-apps/collectl/collectl-3.7.4.ebuild b/sys-apps/collectl/collectl-3.7.4.ebuild deleted file mode 100644 index 11b4890af55..000 --- a/sys-apps/collectl/collectl-3.7.4.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk" -HOMEPAGE="http://collectl.sourceforge.net/"; -SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz" - -LICENSE="GPL-2 Artistic" -SLOT="0" -KEYWORDS="~alpha amd64 ia64 x86" -IUSE="" - -RDEPEND=">=dev-lang/perl-5.8.8 - virtual/perl-Time-HiRes - >=dev-perl/Archive-Zip-1.20 - sys-apps/ethtool - sys-apps/pciutils" - -src_prepare() { - sed -i INSTALL -e "/^DOCDIR/s:doc/collectl:doc/${PF}:" || die -} - -src_install() { - DESTDIR="${D}" bash -ex ./INSTALL || die - - rm "${D}"/etc/init.d/* || die - newinitd "${FILESDIR}"/collectl.initd-2 collectl - - rm "${D}"/usr/share/${PN}/UNINSTALL || die - - cd "${D}"/usr/share/doc/${PF} || die - dohtml * - rm ARTISTIC GPL COPYING *.html *.jpg *.css || die -} diff --git a/sys-apps/collectl/collectl-4.0.5.ebuild b/sys-apps/collectl/collectl-4.0.5.ebuild deleted file mode 100644 index c09f142f882..000 --- a/sys-apps/collectl/collectl-4.0.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Performance monitoring tool capable of interactive reporting an
[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtester/files/, sys-apps/memtester/
commit: dca74e8493fee4b80a20d44c281feb9a20894d78 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:13 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca74e84 sys-apps/memtester: Port to EAPI 7 Closes: https://bugs.gentoo.org/708052 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../memtester-4.3.0-fix-gcc10-fno-common.patch | 31 ++ sys-apps/memtester/memtester-4.3.0.ebuild | 16 ++- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch new file mode 100644 index 000..8bb58e5771c --- /dev/null +++ b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch @@ -0,0 +1,31 @@ +--- a/tests.c b/tests.c +@@ -27,6 +27,9 @@ + #define PROGRESSOFTEN 2500 + #define ONE 0x0001L + ++union mword8_type mword8; ++union mword16_type mword16; ++ + /* Function definitions. */ + + int compare_regions(ulv *bufa, ulv *bufb, size_t count) { +--- a/types.h b/types.h +@@ -25,12 +25,12 @@ + int (*fp)(); + }; + +-union { ++union mword8_type { + unsigned char bytes[UL_LEN/8]; + ul val; +-} mword8; ++}; + +-union { ++union mword16_type { + unsigned short u16s[UL_LEN/16]; + ul val; +-} mword16; ++}; diff --git a/sys-apps/memtester/memtester-4.3.0.ebuild b/sys-apps/memtester/memtester-4.3.0.ebuild index 56a07613ef1..cccff64b5d4 100644 --- a/sys-apps/memtester/memtester-4.3.0.ebuild +++ b/sys-apps/memtester/memtester-4.3.0.ebuild @@ -1,23 +1,25 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 inherit toolchain-funcs DESCRIPTION="userspace utility for testing the memory subsystem for faults" HOMEPAGE="http://pyropus.ca/software/memtester/"; -SRC_URI="http://pyropus.ca/software/memtester/${P}.tar.gz +SRC_URI=" + http://pyropus.ca/software/memtester/${P}.tar.gz http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86" -IUSE="" -src_prepare() { - echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc - echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld +PATCHES=( "${FILESDIR}"/${PN}-4.3.0-fix-gcc10-fno-common.patch ) + +src_configure() { + echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die + echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die } src_install() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/, dev-libs/libg15render/files/
commit: 1668cfaaa0e6a036e3ae6d5831f0fd476ce67d90 Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:17:58 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:17:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1668cfaa dev-libs/libg15render: Port to EAPI 7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../libg15render-1.2-freetype_pkgconfig.patch | 22 ++-- dev-libs/libg15render/libg15render-1.2-r2.ebuild | 30 ++ 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch index 83df9fa4f0f..313d2ef5b6e 100644 --- a/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch +++ b/dev-libs/libg15render/files/libg15render-1.2-freetype_pkgconfig.patch @@ -1,5 +1,5 @@ libg15render-1.2/configure.in -+++ libg15render-1.2/configure.in +--- a/configure.in b/configure.in @@ -13,19 +13,20 @@ AC_PROG_LIBTOOL @@ -33,3 +33,21 @@ # Checks for libraries. AC_CHECK_LIB([g15], [writePixmapToLCD], ,AC_MSG_ERROR(["libg15 not found. please install it"])) +--- a/Makefile.am b/Makefile.am +@@ -1,5 +1,3 @@ +-LLIBDIR=@LIBDIR@ +-AM_CFLAGS=@CFLAGS@ + lib_LTLIBRARIES = libg15render.la + libg15render_la_SOURCES = libg15render.h text.c pixel.c screen.c font_6x4.c font_7x5.c font_8x8.c + libg15render_la_LIBADD = @FTLIB@ +@@ -7,8 +5,7 @@ + include_HEADERS= libg15render.h + EXTRA_DIST = debian Doxyfile libg15render.3 + man3_MANS = $(top_srcdir)/libg15render.3 +-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) +-doc_DATA = AUTHORS ChangeLog COPYING NEWS README ++doc_DATA = AUTHORS ChangeLog NEWS README + + dist-hook: + rm -rf `find $(distdir)/debian -name .svn` diff --git a/dev-libs/libg15render/libg15render-1.2-r2.ebuild b/dev-libs/libg15render/libg15render-1.2-r2.ebuild index 816da20255e..1082ceb99bf 100644 --- a/dev-libs/libg15render/libg15render-1.2-r2.ebuild +++ b/dev-libs/libg15render/libg15render-1.2-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -12,19 +12,18 @@ SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" - IUSE="truetype" RDEPEND=" dev-libs/libg15 - truetype? ( media-libs/freetype ) -" -DEPEND="${RDEPEND} + truetype? ( media-libs/freetype )" +DEPEND="${RDEPEND}" +BDEPEND=" truetype? ( virtual/pkgconfig )" PATCHES=( - "${FILESDIR}/${P}-pixel-c.patch" - "${FILESDIR}/${P}-freetype_pkgconfig.patch" + "${FILESDIR}"/${P}-pixel-c.patch + "${FILESDIR}"/${P}-freetype_pkgconfig.patch ) src_prepare() { @@ -34,17 +33,14 @@ src_prepare() { } src_configure() { - local myeconfargs=( - --disable-static - $(use_enable truetype ttf ) - ) - econf "${myeconfargs[@]}" + econf \ + --disable-static \ + $(use_enable truetype ttf) } src_install() { - emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} install - rm "${ED%/}/usr/share/doc/${PF}/COPYING" + default - find "${ED}" -name '*.la' -delete || die + # no static archives + find "${D}" -name '*.la' -delete || die }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libg15render/
commit: c07398e6a75da45d011131651a5493feac61278a Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:01 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c07398e6 dev-libs/libg15render: Remove broken live ebuild Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> dev-libs/libg15render/libg15render-.ebuild | 57 -- 1 file changed, 57 deletions(-) diff --git a/dev-libs/libg15render/libg15render-.ebuild b/dev-libs/libg15render/libg15render-.ebuild deleted file mode 100644 index 58ded405385..000 --- a/dev-libs/libg15render/libg15render-.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 -ESVN_PROJECT=g15tools/trunk -ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"; - -inherit subversion base eutils autotools - -DESCRIPTION="Small library for display text and graphics on a Logitech G15 keyboard" -HOMEPAGE="https://sourceforge.net/projects/g15tools/"; -[[ $PV = ** ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" - -IUSE="truetype" - -RDEPEND=" - dev-libs/libg15 - truetype? ( media-libs/freetype ) -" -DEPEND=${RDEPEND} - -src_unpack() { - if [[ ${PV} = ** ]]; then - subversion_src_unpack - fi -} - -src_prepare() { - # Merged upstream - #epatch "${FILESDIR}/${PN}-1.2-pixel-c.patch" - - if [[ ${PV} = ** ]]; then - subversion_wc_info - fi - base_src_prepare - if [[ ${PV} = ** ]]; then - eautoreconf - fi -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable truetype ttf ) -} - -src_install() { - emake DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} install || die "make install failed" - rm "${ED}/usr/share/doc/${PF}/COPYING" - - find "${ED}" -name '*.la' -exec rm -f {} + -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/renameutils/
commit: a6c45dd6e550a3b1f90911489aafae3c07e282dc Author: David Seifert gentoo org> AuthorDate: Mon Feb 10 00:18:07 2020 + Commit: David Seifert gentoo org> CommitDate: Mon Feb 10 00:18:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6c45dd6 sys-apps/renameutils: Port to EAPI 7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> sys-apps/renameutils/renameutils-0.12.0.ebuild | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys-apps/renameutils/renameutils-0.12.0.ebuild b/sys-apps/renameutils/renameutils-0.12.0.ebuild index 95b7981085a..7d0f5dfb332 100644 --- a/sys-apps/renameutils/renameutils-0.12.0.ebuild +++ b/sys-apps/renameutils/renameutils-0.12.0.ebuild @@ -1,25 +1,29 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit autotools eutils +inherit autotools DESCRIPTION="Use your favorite text editor to rename files" HOMEPAGE="http://www.nongnu.org/renameutils/"; SRC_URI="https://savannah.nongnu.org/download/renameutils/${P}.tar.gz"; + LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="nls" -DEPEND=">=sys-libs/readline-5.0-r2" +DEPEND="sys-libs/readline:=" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-typo.patch + "${FILESDIR}"/${P}-autopoint.patch +) + src_prepare() { - epatch \ - "${FILESDIR}/${P}-typo.patch" \ - "${FILESDIR}/${P}-autopoint.patch" + default eautoreconf }
[gentoo-commits] proj/sci:master commit in: dev-tex/pythontex/
commit: a5646b8ed7f4741c0bfa7512aef38d5e72392907 Author: Marcin Woźniak aol com> AuthorDate: Sun Feb 9 12:26:48 2020 + Commit: Benda XU gentoo org> CommitDate: Mon Feb 10 00:13:50 2020 + URL:https://gitweb.gentoo.org/proj/sci.git/commit/?id=a5646b8e dev-tex/pythontex: bump to 0.17 and drop old. Bump to EAPI=7. Closes: https://github.com/gentoo/sci/pull/940 Closes: https://bugs.gentoo.org/708832 Package-Manager: Portage-2.3.85, Repoman-2.3.18 Signed-off-by: Marcin Woźniak aol.com> Signed-off-by: Benda Xu gentoo.org> dev-tex/pythontex/metadata.xml | 2 +- dev-tex/pythontex/pythontex-0.14-r1.ebuild | 55 -- ...pythontex-0.15.ebuild => pythontex-0.17.ebuild} | 12 ++--- dev-tex/pythontex/pythontex-.ebuild| 12 ++--- 4 files changed, 9 insertions(+), 72 deletions(-) diff --git a/dev-tex/pythontex/metadata.xml b/dev-tex/pythontex/metadata.xml index 02c7c504c..419fac610 100644 --- a/dev-tex/pythontex/metadata.xml +++ b/dev-tex/pythontex/metadata.xml @@ -6,7 +6,7 @@ Gentoo Science Project - PLEASE FIX MY DESCRIPTION + enable code highlight gpoore/pythontex diff --git a/dev-tex/pythontex/pythontex-0.14-r1.ebuild b/dev-tex/pythontex/pythontex-0.14-r1.ebuild deleted file mode 100644 index 63645e881..0 --- a/dev-tex/pythontex/pythontex-0.14-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4} ) - -inherit latex-package python-r1 - -DESCRIPTION="Fast Access to Python from within LaTeX" -HOMEPAGE="https://github.com/gpoore/pythontex"; -SRC_URI="https://github.com/gpoore/pythontex/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="LPPL-1.3 BSD" -KEYWORDS="~amd64" -IUSE="highlighting" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS} - dev-texlive/texlive-latex" -RDEPEND="${DEPEND} - dev-texlive/texlive-latex - highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )" - -TEXMF=/usr/share/texmf-site - -src_compile() { - cd ${PN} || die - ebegin "Compiling ${PN}" - rm ${PN}.sty || die - VARTEXFONTS="${T}/fonts" latex ${PN}.ins extra || die - eend -} - -src_install() { - dodoc ${PN}/README "${S}"/*rst ${PN}_quickstart/* - - cd ${PN} || die - - installation() { - if python_is_python3; then - python_domodule {de,}${PN}3.py - else - python_domodule {de,}${PN}2.py - fi - python_domodule ${PN}_{engines,utils}.py - python_doscript {de,}${PN}.py syncpdb.py - python_optimize - } - python_foreach_impl installation - - latex-package_src_doinstall dtx ins sty -} diff --git a/dev-tex/pythontex/pythontex-0.15.ebuild b/dev-tex/pythontex/pythontex-0.17.ebuild similarity index 83% rename from dev-tex/pythontex/pythontex-0.15.ebuild rename to dev-tex/pythontex/pythontex-0.17.ebuild index 6526b9fc6..06e33d11a 100644 --- a/dev-tex/pythontex/pythontex-0.15.ebuild +++ b/dev-tex/pythontex/pythontex-0.17.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{4,5} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit latex-package python-r1 @@ -40,11 +40,7 @@ src_install() { cd ${PN} || die installation() { - if python_is_python3; then - python_domodule {de,}${PN}3.py - else - python_domodule {de,}${PN}2.py - fi + python_domodule {de,}${PN}3.py python_domodule ${PN}_{engines,utils}.py python_doscript {de,}${PN}.py syncpdb.py python_optimize diff --git a/dev-tex/pythontex/pythontex-.ebuild b/dev-tex/pythontex/pythontex-.ebuild index b5bc2fd02..9866a0fdb 100644 --- a/dev-tex/pythontex/pythontex-.ebuild +++ b/dev-tex/pythontex/pythontex-.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{3,4} ) +PYTHON_COMPAT=( python3_{6,7} ) inherit latex-package python-r1 git-r3 @@ -41,11 +41,7 @@ src_install() { cd ${PN} || die installation() { - if python_is_python3; then - python_domodule {de,}${PN}3.py - else - python_domodule {de,}${PN}2.py - fi + python_domodule {de,}${PN}3.py python_domodule ${PN}_{engines,u
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
commit: c3e9a0fe26434edcc2c034c6b863789eb6afbc34 Author: Zac Medico gentoo org> AuthorDate: Sun Feb 9 23:53:42 2020 + Commit: Zac Medico gentoo org> CommitDate: Sun Feb 9 23:56:16 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=c3e9a0fe test_virtual_w3m: test without www-client/w3m installed Add test case showing that virtual/w3m-0 is not pulled in when www-client/w3m is not installed and not in @world. Bug: https://bugs.gentoo.org/649622 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_or_choices.py | 39 +++ 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py index a295c9a22..a7ede1fac 100644 --- a/lib/portage/tests/resolver/test_or_choices.py +++ b/lib/portage/tests/resolver/test_or_choices.py @@ -455,18 +455,47 @@ class OrChoicesTestCase(TestCase): 'EAPI': '7', }, + } + + world = ['app-text/xmlto', 'www-client/elinks', 'www-client/lynx'] + + test_cases = ( + + # Test for bug 649622 (without www-client/w3m installed), + # where virtual/w3m was pulled in only to be removed by the + # next emerge --depclean. + ResolverPlaygroundTestCase( + ['@world'], + options = {'--update': True, '--deep': True}, + success = True, + mergelist = [] + ), + + ) + + playground = ResolverPlayground(ebuilds=ebuilds, + installed=installed, world=world, debug=False) + try: + for test_case in test_cases: + playground.run_TestCase(test_case) + self.assertEqual(test_case.test_success, True, test_case.fail_msg) + finally: + playground.debug = False + playground.cleanup() + + installed = dict(itertools.chain(installed.items(), { + 'www-client/w3m-0.5.3_p20190105' : { 'EAPI': '7', }, - } - - world = ['app-text/xmlto', 'www-client/elinks', 'www-client/lynx'] + }.items())) test_cases = ( - # Test for bug 649622, where virtual/w3m was pulled in only - # to be removed by the next emerge --depclean. + # Test for bug 649622 (with www-client/w3m installed), + # where virtual/w3m was pulled in only to be removed by the + # next emerge --depclean. ResolverPlaygroundTestCase( ['@world'], options = {'--update': True, '--deep': True},
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
commit: 865079ef4395e5c9da3c7ca818ddd063a4e77830 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 23:43:53 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 23:43:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865079ef dev-java/tomcat-servlet-api: dropped 9.0.7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 1 - .../tomcat-servlet-api-9.0.7.ebuild| 39 -- 2 files changed, 40 deletions(-) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 9e6422a2e08..911cabc69db 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -9,4 +9,3 @@ DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd DIST apache-tomcat-9.0.30-src.tar.gz 5798307 BLAKE2B 27e3f238e25f62860852977140e9ab53e4121d200600e842e7b73cf8baa03dd80b678504531ce252c0fefbcc10783846d6dcf96866f7616f7ebdcf8bc118 SHA512 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d -DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild deleted file mode 100644 index a0340d723de..000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.7.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${PN}-${PV}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation" -HOMEPAGE="https://tomcat.apache.org/"; -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.0" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -S="${WORKDIR}/${MY_P}/" - -src_prepare() { - default - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm -fR */*/build.xml - einfo "Removing bundled jars and classes" - find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + - - java-pkg-2_src_prepare -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar - use source && java-pkg_dosrc java/javax/servlet/ -}
[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/, www-servers/tomcat/files/
commit: c819430774cee0183fba70c187c3244d883c2b45 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 23:38:05 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 23:38:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8194307 www-servers/tomcat: dropping 9.0.7 + dropping to unstable Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> www-servers/tomcat/Manifest| 1 - .../tomcat/files/tomcat-9.0.4-build.xml.patch | 256 - www-servers/tomcat/tomcat-9.0.7.ebuild | 157 - 3 files changed, 414 deletions(-) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 07d17aa1390..bd849bc0f4b 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -2,6 +2,5 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421 DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 -DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 DIST biz.aQute.bnd-4.1.0.jar 9263260 BLAKE2B e251a9d8b653f3e815e6c2f7774d64f1d594f3ce4b2f77956c806698df4d873310067cece68663324b11fcef8d90796b087abb289dbe2a13164a9038da4a6260 SHA512 f5d230358840f4909e35de40343fb7ee50a2d4d4691691f5ea896cfe212a086ad4859e0ee6ed4c315211223663b2fb2c07af7ea88786cedbcd4f891e5a4589ef DIST biz.aQute.bndlib-4.1.0.jar 2897463 BLAKE2B c29a55e07cc103919dca1e938722bf94b107e2989a4a8ae887998152a93b641a659a5209129b992432bcb2673dd4b56ec9a929627530a631db10666f2177c0e4 SHA512 2acccbb323f3d740506e89a74c5affab85e628f9062ee0d799ccd09efe0b55436d8887a46d7d94ad636a2c793632635974f1bbb045e4789391937222c8d00d30 diff --git a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch deleted file mode 100644 index feb5f126a37..000 --- a/www-servers/tomcat/files/tomcat-9.0.4-build.xml.patch +++ /dev/null @@ -1,256 +0,0 @@ a/build.xml -+++ b/build.xml -@@ -719,24 +719,30 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - - -+ - - -+ - - - -- -+ - - - -@@ -1074,7 +1080,7 @@ - - - -- -+ - - - -@@ -1108,7 +1114,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1766,6 +1775,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - -+ - - - -+ - - http://docs.oracle.com/javase/8/docs/api/"/> - http://commons.apache.org/proper/commons-io/javadocs/api-release/"/> -@@ -2617,7 +2630,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download (and build) components necessary to compile" unless="noget"> - - - -@@ -2637,7 +2650,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2694,7 +2707,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2734,18 +2747,18 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - - -- -+ - - - -@@ -2757,7 +2770,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2776,7 +2789,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2787,7 +2800,7 @@ skip.installer property in
[gentoo-commits] repo/gentoo:master commit in: www-servers/tomcat/files/, www-servers/tomcat/
commit: 91e6fa30f4bcd1278c5423b370f42d0b3700df4e Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 23:33:46 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 23:33:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e6fa30 www-servers/tomcat: bump to 7.0.99 + eapi7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> www-servers/tomcat/Manifest| 1 + .../tomcat/files/tomcat-7.0.99-build.xml.patch | 163 + www-servers/tomcat/tomcat-7.0.99.ebuild| 146 ++ 3 files changed, 310 insertions(+) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 939f324b27c..07d17aa1390 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,4 +1,5 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 +DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch new file mode 100644 index 000..29cf6c2e403 --- /dev/null +++ b/www-servers/tomcat/files/tomcat-7.0.99-build.xml.patch @@ -0,0 +1,163 @@ +diff --git a/build.xml b/build.xml +index dbad7cb..101bc57 100644 +--- a/build.xml b/build.xml +@@ -715,12 +715,14 @@ + + + ++ + + ++ + + ++ + + ++ + + + + + +- ++ filesId="files.tomcat-dbcp" /> --> + + + +- ++ + + + +@@ -1149,7 +1157,7 @@ + + + +- ++ + + + +@@ -1839,7 +1847,7 @@ + + ++ description="Prepare to build web services extras package" unless="noget"> + + + +@@ -2034,11 +2042,12 @@ + + + ++ + + + Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. +@@ -2070,6 +2079,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. + + + ++ + + + ++ + + https://docs.oracle.com/javase/7/docs/api/"/> + https://docs.oracle.com/javaee/6/api/"/> +@@ -2889,7 +2902,7 @@ skip.installer property in build.properties" /> + + + ++ description="Download components necessary to compile" unless="noget" > + + + +@@ -2925,7 +2938,7 @@ skip.installer property in build.properties" /> + + + ++ description="Download additional components for the tests" unless="noget"> + + + +@@ -2989,7 +3002,7 @@ skip.installer property in build.properties" /> + + + ++ description="Download additional components for a distribution" unless="noget"> + + + diff --git a/www-servers/tomcat/tomcat-7.0.99.ebuild b/www-servers/tomcat/tomcat-7.0.99.ebuild new file mode 100644 index 000..7fa74915d25 --- /dev/null +++ b/www-servers/tomcat/tomcat-7.0.99.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 java-ant-2 prefix user + +MY_P="apache-${P}-src" + +DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container" +HOMEPAGE="https://tomcat.apache.org/"; +SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="7" +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="extra-webapps
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
commit: acbc033fc1fca905bb68962fe9c0d1daa1b42422 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 23:19:54 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 23:19:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acbc033f dev-java/tomcat-servlet-api: bump to 7.0.99 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 1 + .../tomcat-servlet-api-7.0.99.ebuild | 38 ++ 2 files changed, 39 insertions(+) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 79cab970613..9e6422a2e08 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -2,6 +2,7 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 +DIST apache-tomcat-7.0.99-src.tar.gz 5242549 BLAKE2B e24933364bae6ddd2b7aeec342f3bfe0293533e2513a34ec6e9b5b6da7ecc3c2fb1d88c1b49f470532d8db821a0b8f0821698d8ec52a6d88a7769cd86912a8bc SHA512 3148879d4a893167b9e60fd1ee6972fc9be8a5be97016ad1d86117c0cb681ac40702680bd21562a284f78aac327f0388e99af458cf1868a3b0ad5e31899b23c0 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b3d646b84af9b6eabee55d7d6c418c270142f9626d9797137a18dce037a6290904911edc6f3609feec96cdf48f37e9431c98da SHA512 e96343179ccb21525ad2bae31aadbdc0ee4b9e94a59186eb1f5d7928b72312c8a6e631b335ff07d4e36d6c9512ce2d8daefcc0a108356f45f8ad987a392ab7b6 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild new file mode 100644 index 000..88c4f9f8e14 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.99.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_A="apache-${P}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation" +HOMEPAGE="https://tomcat.apache.org/"; +SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3.0" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.6" +RDEPEND=">=virtual/jre-1.6" + +S="${WORKDIR}/${MY_P}/" + +src_prepare() { + default + + cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" + rm -fR */*/build.xml ||die + java-pkg_clean + + java-pkg-2_src_prepare +} + +src_install() { + java-pkg_dojar "${S}"/output/build/lib/*.jar + use source && java-pkg_dosrc java/javax/servlet/ +}
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: euscanwww/euscanwww/
commit: c9b3f8148df243dd30497afcba8aefbdd24a9400 Author: Sebastian Pipping gentoo org> AuthorDate: Sun Feb 9 14:14:30 2020 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:35 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=c9b3f814 euscanwww: Support loading oad Django SECRET_KEY from environment Signed-off-by: Sebastian Pipping gentoo.org> euscanwww/euscanwww/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/euscanwww/euscanwww/settings.py b/euscanwww/euscanwww/settings.py index 4ee020b..7523da3 100644 --- a/euscanwww/euscanwww/settings.py +++ b/euscanwww/euscanwww/settings.py @@ -115,7 +115,7 @@ STATICFILES_FINDERS = ( ) # Make this unique, and don't share it with anybody. -SECRET_KEY = '' +SECRET_KEY = os.environ.get('EUSCAN_SECRET_KEY', '') # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = (
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: /
commit: bca3c0151fcb2fa409c26bc28044eba297250822 Author: Sebastian Pipping gentoo org> AuthorDate: Sat Feb 8 18:40:50 2020 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:35 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=bca3c015 docker: Dockerize euscanwww (W.I.P.) Signed-off-by: Sebastian Pipping gentoo.org> Dockerfile | 67 docker-compose.yml | 44 ++ docker-entrypoint.sh | 20 requirements.txt | 41 4 files changed, 172 insertions(+) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000..9dda8ec --- /dev/null +++ b/Dockerfile @@ -0,0 +1,67 @@ +# Copyright 2020 Gentoo Authors +# Licensed under the GNU General Public License v2 + +FROM gentoo/stage3-amd64:20200208 + +RUN wget https://gentoo.osuosl.org/snapshots/gentoo-latest.tar.xz \ +&& \ +tar -C /var/db/repos/ -x -p -f gentoo-latest.tar.xz \ +&& \ +mv /var/db/repos/gentoo-20??/ /var/db/repos/gentoo/ \ +&& \ +rm gentoo-latest.tar.xz + +RUN emaint sync --repo gentoo + +RUN eselect profile show \ +&& \ +echo 'net-analyzer/rrdtool python' > /etc/portage/package.use/net-analyzer--rrdtool \ +&& \ +echo 'dev-lang/python:2.7 sqlite tk' > /etc/portage/package.use/dev-lang--python \ +&& \ +echo 'PYTHON_TARGETS="${PYTHON_TARGETS} python2_7"' >> /etc/portage/make.conf \ +&& \ +echo 'PYTHON_SINGLE_TARGET="python2_7"' >> /etc/portage/make.conf \ +&& \ +echo 'USE="${USE} bindist -syslog"' >> /etc/portage/make.conf + +# NOTE: First build dependencies, then runtime-only dependencies +RUN emerge --tree -v -j2 --color y -1uU \ +dev-lang/python:2.7 \ +dev-libs/cyrus-sasl \ +dev-python/pip \ +dev-python/setuptools \ +dev-python/wheel \ +net-nds/openldap \ +\ +app-portage/eix \ +app-portage/gentoolkit \ +app-portage/layman \ +net-analyzer/rrdtool \ +sys-apps/portage \ +&& \ +rm -f /var/cache/distfiles/* + +ENV PATH=/root/.local/bin/:${PATH} +COPY requirements.txt/tmp/euscan/ +RUN pip2 install --user -r /tmp/euscan/requirements.txt + +COPY setup.py README.rst /tmp/euscan/ +COPY bin//tmp/euscan/bin/ +COPY pym//tmp/euscan/pym/ + +WORKDIR /tmp/euscan/ +RUN pip2 install --user . + +RUN pip2 check +RUN bash -c 'diff -U0 <(pip2 freeze --user | sed "/^\(euscan\|virtualenv\)==/d" | sort -f) <(sed -e "s/ *#.*//" -e "/^$/d" /tmp/euscan/requirements.txt | sort -f)' + +COPY euscanwww/ /tmp/euscan/euscanwww/ + +COPY docker-entrypoint.sh/root/ + +WORKDIR /tmp/euscan/euscanwww/ + +EXPOSE 55080 +ENTRYPOINT ["/root/docker-entrypoint.sh"] +CMD [] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000..4daf0e2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,44 @@ +# Copyright 2020 Gentoo Authors +# Licensed under the GNU General Public License v2 + +version: "3" + +services: + runserver: +depends_on: + - celeryd +image: ${COMPOSE_PROJECT_NAME}_celeryd:latest +environment: + DJANGO_SETTINGS_MODULE: euscanwww.settings + EUSCAN_SECRET_KEY: ${EUSCAN_SECRET_KEY:?} +volumes: + - "./euscanwww/:/tmp/euscan/euscanwww/" + - "./pym/euscan/:/root/.local/lib64/python2.7/site-packages/euscan" +ports: + - "127.0.0.1:55080:55080" +tty: true + + celerycam: +depends_on: + - celeryd +image: ${COMPOSE_PROJECT_NAME}_celeryd:latest +environment: + DJANGO_SETTINGS_MODULE: euscanwww.settings + EUSCAN_SECRET_KEY: ${EUSCAN_SECRET_KEY:?} +volumes: + - "./euscanwww/:/tmp/euscan/euscanwww/" + - "./pym/euscan/:/root/.local/lib64/python2.7/site-packages/euscan" +command: python2 manage.py celerycam +tty: true + + celeryd: +build: + context: . +environment: + DJANGO_SETTINGS_MODULE: euscanwww.settings + EUSCAN_SECRET_KEY: ${EUSCAN_SECRET_KEY:?} +volumes: + - "./euscanwww/:/tmp/euscan/euscanwww/" + - "./pym/euscan/:/root/.local/lib64/python2.7/site-packages/euscan" +command: python2 manage.py celeryd -B -E -l INFO +tty: true diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 000..4d27768 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,20 @@ +#! /usr/bin/env bash +# Copyright 2020 Gentoo Authors +# Licensed under the GNU General Public License v2 + +set -e +set -u + +PS4='# ' +set -x + +id +ip addr + +if [[ $# -gt 0 ]]; then +exec "$@" +fi + +python2 manage.py migrate + +exec python2 manage.py runserver 0.0.0.0:55080 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..cde5aa8
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: /
commit: 6aba927414d7befa769ede3f60c6773041d6d4df Author: NP-Hardass gmail com> AuthorDate: Sun Jun 11 08:05:28 2017 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:31 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=6aba9274 setup.py: drop south, update minimum django version Signed-off-by: Sebastian Pipping gentoo.org> setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fd9e6da..9a71420 100755 --- a/setup.py +++ b/setup.py @@ -91,7 +91,7 @@ setup( # Command line utility 'BeautifulSoup>=3.2.1', # Web interface -'Django>=1.4', 'django-annoying>=0.7.6', 'South>=0.7', +'Django>=1.7', 'django-annoying>=0.7.6', 'django-piston>=0.2.3', 'matplotlib>=1.1.0', 'django-celery>=3.0.1', 'django-registration>=0.8', 'python-ldap>=2.4.10', 'django-auth-ldap>=1.1',
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: euscanwww/djeuscan/api/
commit: b5a82548c5d36191d6eae86b33d82069de3b5eaa Author: Sebastian Pipping gentoo org> AuthorDate: Sun Feb 9 23:11:25 2020 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:35 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=b5a82548 Stop using django.conf.urls.defaults for Django >=1.6 Signed-off-by: Sebastian Pipping gentoo.org> euscanwww/djeuscan/api/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/euscanwww/djeuscan/api/urls.py b/euscanwww/djeuscan/api/urls.py index 578a8be..27c8b95 100644 --- a/euscanwww/djeuscan/api/urls.py +++ b/euscanwww/djeuscan/api/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import url, patterns +from django.conf.urls import url, patterns from piston.resource import Resource from handlers import RootHandler, StatisticsHandler, HerdsHandler, \
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: euscanwww/djeuscan/migrations/, euscanwww/euscan_accounts/migrations/
commit: 4c3bbd4bea7d102f41e4efc9e3fec6c523e1f21f Author: NP-Hardass gmail com> AuthorDate: Sun Jun 11 07:32:07 2017 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:28 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=4c3bbd4b euscanwww: Add initial migrations for django 1.8 Signed-off-by: Sebastian Pipping gentoo.org> euscanwww/djeuscan/migrations/0001_initial.py | 225 + .../euscan_accounts/migrations/0001_initial.py | 39 2 files changed, 264 insertions(+) diff --git a/euscanwww/djeuscan/migrations/0001_initial.py b/euscanwww/djeuscan/migrations/0001_initial.py new file mode 100644 index 000..5f9e1b3 --- /dev/null +++ b/euscanwww/djeuscan/migrations/0001_initial.py @@ -0,0 +1,225 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +from django.conf import settings +import django.core.validators + + +class Migration(migrations.Migration): + +dependencies = [ +migrations.swappable_dependency(settings.AUTH_USER_MODEL), +] + +operations = [ +migrations.CreateModel( +name='Category', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('name', models.CharField(unique=True, max_length=128, validators=[django.core.validators.RegexValidator(b'^(?:\\w+?-\\w+?)|virtual$')])), +('description', models.TextField(null=True, blank=True)), +], +options={ +'verbose_name_plural': 'categories', +}, +), +migrations.CreateModel( +name='EuscanResult', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('datetime', models.DateTimeField()), +('result', models.TextField(blank=True)), +('scan_time', models.FloatField(null=True, blank=True)), +('ebuild', models.CharField(max_length=256, blank=True)), +], +options={ +'get_latest_by': 'datetime', +}, +), +migrations.CreateModel( +name='Herd', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('herd', models.CharField(unique=True, max_length=128, validators=[django.core.validators.RegexValidator(b'^\\S+?$')])), +('email', models.CharField(blank=True, max_length=128, null=True, validators=[django.core.validators.EmailValidator()])), +], +), +migrations.CreateModel( +name='Log', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('datetime', models.DateTimeField()), +('n_packages_gentoo', models.IntegerField(default=0)), +('n_packages_overlay', models.IntegerField(default=0)), +('n_packages_outdated', models.IntegerField(default=0)), +('n_versions_gentoo', models.IntegerField(default=0)), +('n_versions_overlay', models.IntegerField(default=0)), +('n_versions_upstream', models.IntegerField(default=0)), +], +), +migrations.CreateModel( +name='Maintainer', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('name', models.CharField(max_length=128)), +('email', models.CharField(unique=True, max_length=128, validators=[django.core.validators.EmailValidator()])), +], +), +migrations.CreateModel( +name='Overlay', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('name', models.CharField(unique=True, max_length=128, validators=[django.core.validators.RegexValidator(b'^\\S+?$')])), +('description', models.TextField(null=True, blank=True)), +('homepage', models.TextField(null=True, blank=True)), +('overlay_path', models.CharField(max_length=256, null=True, blank=True)), +], +), +migrations.CreateModel( +name='Package', +fields=[ +('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), +('category', models.CharField(max_length=128, validators=[django.core.validators.RegexValidator(b'^(?:\\w+?-\\w+?)|virtual$')])), +('name', models.CharField(max_length=128, validators=[django
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: euscanwww/euscanwww/
commit: f3fd93158f4fadf7290c8e2369d88db632d78612 Author: Sebastian Pipping gentoo org> AuthorDate: Sun Feb 9 22:33:32 2020 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:35 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=f3fd9315 settings: Set ALLOWED_HOSTS default to satisfy DEBUG=False Signed-off-by: Sebastian Pipping gentoo.org> euscanwww/euscanwww/settings.py | 6 ++ 1 file changed, 6 insertions(+) diff --git a/euscanwww/euscanwww/settings.py b/euscanwww/euscanwww/settings.py index d9879ff..4ee020b 100644 --- a/euscanwww/euscanwww/settings.py +++ b/euscanwww/euscanwww/settings.py @@ -5,6 +5,12 @@ import os.path DEBUG = False TEMPLATE_DEBUG = DEBUG +ALLOWED_HOSTS = [ +'0.0.0.0', +'127.0.0.1', +'172.0.0.0/8', # Docker internal +] + ADMINS = ( ('admin', 'ad...@example.com'), )
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
commit: a4e90acbc1e8ca4c8aff85256fcc57b93f3448b5 Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 23:14:04 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 23:15:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4e90acb dev-java/tomcat-servlet-api: bump to 9.0.30 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 1 + .../tomcat-servlet-api-9.0.30.ebuild | 39 ++ 2 files changed, 40 insertions(+) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index ce155882c4d..79cab970613 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -7,4 +7,5 @@ DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea6 DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b3d646b84af9b6eabee55d7d6c418c270142f9626d9797137a18dce037a6290904911edc6f3609feec96cdf48f37e9431c98da SHA512 e96343179ccb21525ad2bae31aadbdc0ee4b9e94a59186eb1f5d7928b72312c8a6e631b335ff07d4e36d6c9512ce2d8daefcc0a108356f45f8ad987a392ab7b6 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd +DIST apache-tomcat-9.0.30-src.tar.gz 5798307 BLAKE2B 27e3f238e25f62860852977140e9ab53e4121d200600e842e7b73cf8baa03dd80b678504531ce252c0fefbcc10783846d6dcf96866f7616f7ebdcf8bc118 SHA512 5a693c26bc78c504ca9c30cab6356927dbeded199798b558f2efe428a98fd68a88e0c113cc7b710fe3b2109e5ae3a970ff3989f909b95eb782d47d12a2a3a20d DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild new file mode 100644 index 000..9ddac4eebd9 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.30.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" +HOMEPAGE="https://tomcat.apache.org/"; +SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="4.0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}/" + +src_prepare() { + default + + cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" + rm -fR */*/build.xml + einfo "Removing bundled jars and classes" + find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + + + java-pkg-2_src_prepare +} + +src_install() { + java-pkg_dojar "${S}"/output/build/lib/*.jar + use source && java-pkg_dosrc java/javax/servlet/ +}
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: euscanwww/euscanwww/
commit: 531fc6248f3edda82105fa2925dabf70056c4a5c Author: NP-Hardass gmail com> AuthorDate: Sun Jun 11 07:28:12 2017 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:13 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=531fc624 euscanwww/settings.py: drop south Signed-off-by: Sebastian Pipping gentoo.org> euscanwww/euscanwww/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/euscanwww/euscanwww/settings.py b/euscanwww/euscanwww/settings.py index e1e752c..d9879ff 100644 --- a/euscanwww/euscanwww/settings.py +++ b/euscanwww/euscanwww/settings.py @@ -168,7 +168,6 @@ INSTALLED_APPS = ( 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', -'south', 'djcelery', 'registration', 'captcha'
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: euscanwww/djeuscan/processing/scan/, euscanwww/djeuscan/processing/misc/
commit: 778c8f4d3c4663457b180a6c7cee2e6d85fd135e Author: Sebastian Pipping gentoo org> AuthorDate: Sun Feb 9 21:40:04 2020 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 23:16:35 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=778c8f4d Stop using django.db.transaction.commit_on_success for Django >=1.8 Signed-off-by: Sebastian Pipping gentoo.org> euscanwww/djeuscan/processing/misc/update_counters.py | 4 ++-- euscanwww/djeuscan/processing/scan/scan_metadata.py | 4 ++-- euscanwww/djeuscan/processing/scan/scan_portage.py| 4 ++-- euscanwww/djeuscan/processing/scan/scan_upstream.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/euscanwww/djeuscan/processing/misc/update_counters.py b/euscanwww/djeuscan/processing/misc/update_counters.py index 392b7b5..3abc6a2 100644 --- a/euscanwww/djeuscan/processing/misc/update_counters.py +++ b/euscanwww/djeuscan/processing/misc/update_counters.py @@ -1,4 +1,4 @@ -from django.db.transaction import commit_on_success +from django.db.transaction import atomic from django.utils import timezone from djeuscan.models import Package, Herd, Maintainer, Version, HerdLog, \ @@ -36,7 +36,7 @@ def _add_last_ver(storage, version): storage[key] = version -@commit_on_success +@atomic def update_counters(fast=False, nolog=False, logger=None): logger = logger or FakeLogger() diff --git a/euscanwww/djeuscan/processing/scan/scan_metadata.py b/euscanwww/djeuscan/processing/scan/scan_metadata.py index 22bad3f..16474f5 100644 --- a/euscanwww/djeuscan/processing/scan/scan_metadata.py +++ b/euscanwww/djeuscan/processing/scan/scan_metadata.py @@ -5,7 +5,7 @@ from gentoolkit.metadata import MetaData import xml.etree.cElementTree as etree -from django.db.transaction import commit_on_success +from django.db.transaction import atomic from django.core.management.color import color_style from django.core.exceptions import ValidationError @@ -236,7 +236,7 @@ class ScanMetadata(object): herd.maintainers.add(maintainer) -@commit_on_success +@atomic def scan_metadata(packages=None, category=None, logger=None, populate=False): scan_handler = ScanMetadata(logger=logger) diff --git a/euscanwww/djeuscan/processing/scan/scan_portage.py b/euscanwww/djeuscan/processing/scan/scan_portage.py index 857fce2..44abc2c 100644 --- a/euscanwww/djeuscan/processing/scan/scan_portage.py +++ b/euscanwww/djeuscan/processing/scan/scan_portage.py @@ -11,7 +11,7 @@ from layman import Layman from xml.etree.ElementTree import iterparse, ParseError -from django.db.transaction import commit_on_success +from django.db.transaction import atomic from django.db import models from django.core.management.color import color_style from django.conf import settings @@ -395,7 +395,7 @@ def populate_overlays(logger): logger.info("+ [o] %s", overlay) -@commit_on_success +@atomic def scan_portage(packages=None, category=None, no_log=False, upstream=False, purge_packages=False, purge_versions=False, logger=None): diff --git a/euscanwww/djeuscan/processing/scan/scan_upstream.py b/euscanwww/djeuscan/processing/scan/scan_upstream.py index dc7ba1b..2686202 100644 --- a/euscanwww/djeuscan/processing/scan/scan_upstream.py +++ b/euscanwww/djeuscan/processing/scan/scan_upstream.py @@ -1,7 +1,7 @@ import portage from django.utils import timezone -from django.db.transaction import commit_on_success +from django.db.transaction import atomic from euscan import CONFIG, output from euscan.scan import scan_upstream as euscan_scan_upstream @@ -150,7 +150,7 @@ class ScanUpstream(object): version.delete() -@commit_on_success +@atomic def scan_upstream(packages=None, purge_versions=False, logger=None): logger = logger or FakeLogger()
[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/
commit: 3e1aff19083e24d03e511451ed830fadb5808b57 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Feb 9 20:55:10 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Feb 9 23:13:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1aff19 net-im/telegram-desktop: revbump, fixes, optional pulse Bug: https://bugs.gentoo.org/707372 Bug: https://bugs.gentoo.org/707288 Closes: https://bugs.gentoo.org/708606 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> ...10.ebuild => telegram-desktop-1.9.10-r1.ebuild} | 22 +- .../telegram-desktop-1.9.10.ebuild | 1 + 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild similarity index 89% copy from net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild copy to net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild index d08b1979022..fcae9f9ea3e 100644 --- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild @@ -13,11 +13,13 @@ DESCRIPTION="Official desktop client for Telegram" HOMEPAGE="https://desktop.telegram.org"; SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"; -LICENSE="GPL-3-with-openssl-exception Unlicense" +LICENSE="GPL-3-with-openssl-exception" SLOT="0" KEYWORDS="~amd64 ~ppc64" -IUSE="dbus gtk3 libressl spell" +IUSE="alsa dbus gtk3 libressl pulseaudio spell" +# dbus still required to build, but use flag disables dbus usage at runtime +# pkg-config will pick up gtk2 first if found, needs a workaround RDEPEND="!net-im/telegram-desktop-bin app-arch/lz4 app-arch/xz-utils @@ -25,16 +27,18 @@ RDEPEND="!net-im/telegram-desktop-bin libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 + dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 + dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 media-libs/fontconfig:= - media-libs/openal[pulseaudio] - media-libs/opus - media-sound/pulseaudio + media-libs/libtgvoip[alsa?,pulseaudio?] + media-libs/openal[alsa?,pulseaudio?] sys-libs/zlib[minizip] virtual/ffmpeg + virtual/libiconv x11-libs/libva[X,drm] x11-libs/libX11 || ( @@ -45,12 +49,11 @@ RDEPEND="!net-im/telegram-desktop-bin dev-qt/qtwidgets:5[png,X(-)] dev-qt/qtwidgets:5[png,xcb(-)] ) - dbus? ( dev-qt/qtdbus:5 ) gtk3? ( dev-libs/libappindicator:3 x11-libs/gtk+:3 - sys-apps/xdg-desktop-portal ) + pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/enchant:= ) " @@ -61,13 +64,15 @@ BDEPEND=" >=dev-util/cmake-3.16 virtual/pkgconfig " +REQUIRED_USE="|| ( alsa pulseaudio )" + +S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/0002-PPC-big-endian.patch" "${FILESDIR}/musl.patch" ) -S="${WORKDIR}/${MY_P}" src_configure() { local mycxxflags=( @@ -91,7 +96,6 @@ src_configure() { -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild index d08b1979022..9ef754c699f 100644 --- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild @@ -25,6 +25,7 @@ RDEPEND="!net-im/telegram-desktop-bin libressl? ( dev-libs/libressl:0= ) >=dev-cpp/ms-gsl-2.1.0 dev-cpp/range-v3 + dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 dev-qt/qtimageformats:5
[gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/
commit: 58829b24380648616d99be09eed27d0357b8697d Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 23:07:30 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 23:15:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58829b24 dev-java/tomcat-servlet-api: bump to 8.5.50 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-servlet-api/Manifest | 1 + .../tomcat-servlet-api-8.5.50.ebuild | 39 ++ 2 files changed, 40 insertions(+) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 13f2fe3e255..ce155882c4d 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -4,6 +4,7 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713 DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d +DIST apache-tomcat-8.5.50-src.tar.gz 5646813 BLAKE2B cb9ebc0fca2827f1686c28a462b3d646b84af9b6eabee55d7d6c418c270142f9626d9797137a18dce037a6290904911edc6f3609feec96cdf48f37e9431c98da SHA512 e96343179ccb21525ad2bae31aadbdc0ee4b9e94a59186eb1f5d7928b72312c8a6e631b335ff07d4e36d6c9512ce2d8daefcc0a108356f45f8ad987a392ab7b6 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild new file mode 100644 index 000..b6216e53c6b --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.50.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +JAVA_PKG_IUSE="source" + +inherit eutils java-pkg-2 java-ant-2 + +MY_A="apache-${P}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" +HOMEPAGE="https://tomcat.apache.org/"; +SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3.1" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8" +RDEPEND=">=virtual/jre-1.8" + +S="${WORKDIR}/${MY_P}/" + +src_prepare() { + default + + cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" + rm -fR */*/build.xml + einfo "Removing bundled jars and classes" + find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} + + + java-pkg-2_src_prepare +} + +src_install() { + java-pkg_dojar "${S}"/output/build/lib/*.jar + use source && java-pkg_dosrc java/javax/servlet/ +}
[gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/
commit: 21d9b579dc3fda2105caf3328ac5f0afbd80b9a2 Author: Zac Medico gentoo org> AuthorDate: Sun Feb 9 23:04:50 2020 + Commit: Zac Medico gentoo org> CommitDate: Sun Feb 9 23:15:01 2020 + URL:https://gitweb.gentoo.org/proj/portage.git/commit/?id=21d9b579 test_virtual_w3m: test with www-client/w3m in @world Test for behavior reported in bug 649622 comment #10, where depclean removed virtual/w3m-0 even though www-client/w3m was in the world file. Since nothing is removed here, it means that we have not reproduced the behavior reported in this comment. Bug: https://bugs.gentoo.org/649622#c19 Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/resolver/test_or_choices.py | 29 +++ 1 file changed, 29 insertions(+) diff --git a/lib/portage/tests/resolver/test_or_choices.py b/lib/portage/tests/resolver/test_or_choices.py index 5679d0b5b..a295c9a22 100644 --- a/lib/portage/tests/resolver/test_or_choices.py +++ b/lib/portage/tests/resolver/test_or_choices.py @@ -523,6 +523,35 @@ class OrChoicesTestCase(TestCase): playground.cleanup() + test_cases = ( + + # Test for behavior reported in bug 649622 comment #10, where + # depclean removed virtual/w3m-0 even though www-client/w3m + # was in the world file. Since nothing is removed here, it + # means that we have not reproduced the behavior reported in + # this comment. + ResolverPlaygroundTestCase( + [], + options={'--depclean': True}, + success=True, + cleanlist=[], + ), + + ) + + world += ['www-client/w3m'] + + playground = ResolverPlayground(ebuilds=ebuilds, + installed=installed, world=world, debug=False) + try: + for test_case in test_cases: + playground.run_TestCase(test_case) + self.assertEqual(test_case.test_success, True, test_case.fail_msg) + finally: + playground.debug = False + playground.cleanup() + + class OrChoicesLibpostprocTestCase(TestCase): def testOrChoicesLibpostproc(self):
[gentoo-commits] repo/gentoo:master commit in: media-libs/libtgvoip/files/, media-libs/libtgvoip/
commit: 9da4a361021f21e25da137f3c7d505c82b3f9961 Author: Georgy Yakovlev gentoo org> AuthorDate: Sun Feb 9 22:40:08 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Sun Feb 9 23:11:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da4a361 media-libs/libtgvoip: new package dep of telegram-desktop Bug: https://bugs.gentoo.org/707372 Bug: https://bugs.gentoo.org/707288 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev gentoo.org> media-libs/libtgvoip/Manifest | 1 + media-libs/libtgvoip/files/2.4.4-pulseaudio.patch | 36 +++ .../libtgvoip/libtgvoip-2.4.4_p20200123.ebuild | 54 ++ media-libs/libtgvoip/metadata.xml | 11 + 4 files changed, 102 insertions(+) diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest new file mode 100644 index 000..0a7202319ce --- /dev/null +++ b/media-libs/libtgvoip/Manifest @@ -0,0 +1 @@ +DIST libtgvoip-2.4.4_p20200123.tar.gz 1481831 BLAKE2B 5c6b4ecee4d8daf31f52db1070431cb6caee324d58a20207405ebcd2b275a07c57fa524f3f29e8aaa05e50451730d34ad47bb94a180e3ac8a169dac9979582be SHA512 5da722244d66d3793439e0d3132046f1bb7fa8a56941bcac7779e3779f0c8f517fb5a8f3af546e31d16d4f8deedb9bf7a2d694194fef76bbce233bf1ed6579c3 diff --git a/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch b/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch new file mode 100644 index 000..ecb0d88a07a --- /dev/null +++ b/media-libs/libtgvoip/files/2.4.4-pulseaudio.patch @@ -0,0 +1,36 @@ +From 1b029a0eb8b65057a31001e812b28f4685298ea4 Mon Sep 17 00:00:00 2001 +From: Seven Du +Date: Fri, 17 May 2019 22:19:08 +0800 +Subject: [PATCH] fix build with pulse audio + +--- + audio/AudioInput.cpp | 2 +- + audio/AudioOutput.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/audio/AudioInput.cpp b/audio/AudioInput.cpp +index dae647a..7b0c4da 100644 +--- a/audio/AudioInput.cpp b/audio/AudioInput.cpp +@@ -79,7 +79,7 @@ void AudioInput::EnumerateDevices(std::vector& devs){ + #elif defined(WITHOUT_PULSE) + AudioInputALSA::EnumerateDevices(devs); + #else +- AudioInputPulse::EnumerateDevices(devs) ++ AudioInputPulse::EnumerateDevices(devs); + #endif + #endif + } +diff --git a/audio/AudioOutput.cpp b/audio/AudioOutput.cpp +index 458e8a5..07a3e31 100644 +--- a/audio/AudioOutput.cpp b/audio/AudioOutput.cpp +@@ -90,7 +90,7 @@ void AudioOutput::EnumerateDevices(std::vector& devs){ + #elif defined(WITHOUT_PULSE) + AudioOutputALSA::EnumerateDevices(devs); + #else +- AudioOutputPulse::EnumerateDevices(devs) ++ AudioOutputPulse::EnumerateDevices(devs); + #endif + #endif + } diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild new file mode 100644 index 000..06ad597854c --- /dev/null +++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20200123.ebuild @@ -0,0 +1,54 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +EGIT_COMMIT="c5651ffc728336e56d8567f5c6c179e8a5d4fe55" + +DESCRIPTION="VoIP library for Telegram clients" +HOMEPAGE="https://github.com/telegramdesktop/libtgvoip"; +SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" +IUSE="alsa +dsp libressl pulseaudio" + +DEPEND=" + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + media-libs/opus + alsa? ( media-libs/alsa-lib ) + pulseaudio? ( media-sound/pulseaudio ) +" +RDEPEND="${DEPEND}" +BDEPEND="" + +REQUIRED_USE="|| ( alsa pulseaudio )" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +PATCHES=( "${FILESDIR}/2.4.4-pulseaudio.patch" ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-static + $(use_enable dsp) + $(use_with alsa) + $(use_with pulseaudio pulse) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libtgvoip/metadata.xml b/media-libs/libtgvoip/metadata.xml new file mode 100644 index 000..c5af453673d --- /dev/null +++ b/media-libs/libtgvoip/metadata.xml @@ -0,0 +1,11 @@ + +http://www.gentoo.org/dtd/metadata.dtd";> + + + gyakov...@gentoo.org + Georgy Yakovlev + + + Enable signal processing (echo cancellation, noise suppression, and automatic gain control) + +
[gentoo-commits] repo/gentoo:master commit in: dev-libs/liblist/
commit: 315629a9d94bef298b082be0f8fe561f5d0c8132 Author: David Seifert gentoo org> AuthorDate: Sun Feb 9 23:05:04 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Feb 9 23:05:04 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315629a9 dev-libs/liblist: Port to EAPI 7 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> dev-libs/liblist/liblist-2.4.ebuild | 39 +++-- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/dev-libs/liblist/liblist-2.4.ebuild b/dev-libs/liblist/liblist-2.4.ebuild index 0133d56da43..928ed1b2bfa 100644 --- a/dev-libs/liblist/liblist-2.4.ebuild +++ b/dev-libs/liblist/liblist-2.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit autotools-utils multilib +inherit autotools DESCRIPTION="Generic linked-list manipulation routines, plus queues and stacks" HOMEPAGE="http://ohnopub.net/liblist"; @@ -12,36 +12,37 @@ SRC_URI="ftp://ohnopublishing.net/mirror/${P}.tar.bz2"; LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux" -IUSE="doc examples static-libs" +IUSE="doc examples" -RDEPEND="doc? ( media-gfx/transfig +RDEPEND=" + doc? ( dev-texlive/texlive-metapost - virtual/latex-base )" + media-gfx/transfig + virtual/latex-base + )" DEPEND="${RDEPEND}" src_configure() { - local myeconfargs=( - --docdir="${EPREFIX}"/usr/share/doc/${PF} - $(use_enable doc docs) + econf \ + --disable-static \ + $(use_enable doc docs) \ $(use_enable examples) - ) - - autotools-utils_src_configure } src_install() { - autotools-utils_src_install - - dodoc README + default if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/{*.c,Makefile,README} - insinto /usr/share/doc/${PF}/examples/cache - doins examples/cache/{*.c,README} + docinto examples + dodoc examples/{*.c,Makefile,README} + docinto examples/cache + dodoc examples/cache/{*.c,README} fi docompress -x /usr/share/doc/${PF}/{list.0,paper.dvi,examples} + + # no static archives + find "${D}" -name '*.la' -delete || die } pkg_postinst() {
[gentoo-commits] repo/gentoo:master commit in: eclass/
commit: 46cef3eb3321fe6e446323801ee1c3fe04943ee2 Author: David Seifert gentoo org> AuthorDate: Sun Feb 9 23:05:07 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Feb 9 23:05:07 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cef3eb rpm.eclass: Fix for EAPI 7 Signed-off-by: David Seifert gentoo.org> eclass/rpm.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass index c6daecea365..c39e7f3e0f2 100644 --- a/eclass/rpm.eclass +++ b/eclass/rpm.eclass @@ -6,7 +6,7 @@ # base-sys...@gentoo.org # @BLURB: convenience class for extracting RPMs -inherit eutils +inherit estack eutils DEPEND=">=app-arch/rpm2targz-9.0.0.3g"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/transfig/, media-gfx/transfig/files/
commit: cd9d188a8f54069511f93f0846bb2cd3b57e Author: David Seifert gentoo org> AuthorDate: Sun Feb 9 23:05:01 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Feb 9 23:05:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9d188a media-gfx/transfig: Fix GCC10 -fno-common Closes: https://bugs.gentoo.org/706706 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../files/transfig-3.2.5e-gcc10-fno-common.patch | 30 ++ media-gfx/transfig/transfig-3.2.5e.ebuild | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch new file mode 100644 index 000..e0c92161e3f --- /dev/null +++ b/media-gfx/transfig/files/transfig-3.2.5e-gcc10-fno-common.patch @@ -0,0 +1,30 @@ +--- a/fig2dev/dev/gensvg.c b/fig2dev/dev/gensvg.c +@@ -230,10 +230,12 @@ + }; + + /* arrowhead arrays */ +-Point points[50], fillpoints[50], clippoints[50]; +-int npoints, nfillpoints, nclippoints; +-int arrowx1, arrowy1; /* first point of object */ +-int arrowx2, arrowy2; /* second point of object */ ++Point fillpoints[50]; ++int nfillpoints; ++extern Point points[50], clippoints[50]; ++extern int npoints, nclippoints; ++extern int arrowx1, arrowy1; /* first point of object */ ++extern int arrowx2, arrowy2; /* second point of object */ + + static int tileno=0; /* number of current tile */ + +--- a/fig2dev/fig2dev.h b/fig2dev/fig2dev.h +@@ -127,7 +127,7 @@ + extern char *prog, *from, *to; + extern char *name; + extern double font_size; +-Boolean correct_font_size; /* use correct font size */ ++extern Booleancorrect_font_size; /* use correct font size */ + extern double mag, fontmag; + extern FILE *tfp; + diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild index 7e9dcc63d77..668facad5ec 100644 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -54,6 +54,7 @@ src_prepare() { epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-typos.patch epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-man-hyphen.patch epatch "${WORKDIR}/${P}-gentoo-patchset"/${PN}-3.2.5e-fprintf_format_warnings.patch + epatch "${FILESDIR}"/${PN}-3.2.5e-gcc10-fno-common.patch sed -e 's:-L$(ZLIBDIR) -lz::' \ -e 's: -lX11::' \
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libx86emu/files/, dev-libs/libx86emu/
commit: d332eb47396f2afcd46f59a3aeec3c962f860552 Author: David Seifert gentoo org> AuthorDate: Sun Feb 9 23:05:10 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Feb 9 23:05:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d332eb47 dev-libs/libx86emu: Port to EAPI 7 Closes: https://bugs.gentoo.org/684466 Closes: https://bugs.gentoo.org/706558 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> .../files/libx86emu-1.1-fix-makefile.patch | 82 ++ .../files/libx86emu-1.1-gcc10-fno-common.patch | 13 dev-libs/libx86emu/libx86emu-1.1.ebuild| 28 +++- 3 files changed, 104 insertions(+), 19 deletions(-) diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch new file mode 100644 index 000..6e565340e67 --- /dev/null +++ b/dev-libs/libx86emu/files/libx86emu-1.1-fix-makefile.patch @@ -0,0 +1,82 @@ +--- a/Makefile b/Makefile +@@ -1,15 +1,4 @@ +-ARCH := $(shell uname -m) +-ifneq ($(filter i386 i486 i586 i686, $(ARCH)),) +-ARCH := i386 +-endif +- +-CC= gcc +-CFLAGS= -g -O2 -fPIC -fomit-frame-pointer -Wall +-ifneq ($(filter x86_64, $(ARCH)),) +-LIBDIR= /usr/lib64 +-else +-LIBDIR= /usr/lib +-endif ++CFLAGS+= -fPIC -Wall + LIBX86= libx86emu + + VERSION := $(shell cat VERSION) +@@ -24,9 +13,6 @@ + + .PHONY: all shared install test clean + +-%.o: %.c +- $(CC) -c $(CFLAGS) $< +- + all: shared + + shared: $(LIB_NAME) +@@ -38,13 +24,15 @@ + install -m 644 -D include/x86emu.h $(DESTDIR)/usr/include/x86emu.h + + $(LIB_NAME): .depend $(OBJS) +- $(CC) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME) ++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) $(OBJS) -o $(LIB_NAME) ++ ln -snf $(LIB_NAME) $(LIB_SONAME) ++ ln -snf $(LIB_SONAME) $(LIBX86).so + +-test: +- make -C test ++check: ++ $(MAKE) -C test + + clean: +- make -C test clean ++ $(MAKE) -C test clean + rm -f *.o *~ include/*~ *.so.* .depend + + ifneq "$(MAKECMDGOALS)" "clean" +--- a/test/Makefile b/test/Makefile +@@ -1,9 +1,10 @@ +-CC = gcc +-CFLAGS = -g -Wall -fomit-frame-pointer -O2 ++CFLAGS += -fPIC -Wall ++CPPFLAGS += -I../include + TST_FILES = $(wildcard *.tst) + INIT_FILES = $(addsuffix .init,$(basename $(wildcard *.tst))) + RES_FILES = $(addsuffix .result,$(basename $(wildcard *.tst))) + TEST_OPTS = --verbose --show code,regs,data,acc,io,ints,attr,time ++LDLIBS = -L.. -lx86emu + + .PHONY: all test clean + .SECONDARY: $(INIT_FILES) +@@ -12,13 +13,12 @@ + + all: x86test + @./prepare_test *.tst +- @./x86test $(TEST_OPTS) *.init ++ @LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) *.init + +-x86test: x86test.c +- $(CC) $(CFLAGS) $< -lx86emu -o $@ ++x86test: x86test.o + +-%.result: %.init +- @./x86test $(TEST_OPTS) $< ++%.result: %.init x86test ++ @LD_LIBRARY_PATH=.. ./x86test $(TEST_OPTS) $< + + %.init: %.tst + @./prepare_test $< diff --git a/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch new file mode 100644 index 000..8d69e874523 --- /dev/null +++ b/dev-libs/libx86emu/files/libx86emu-1.1-gcc10-fno-common.patch @@ -0,0 +1,13 @@ +--- a/include/ops.h b/include/ops.h +@@ -39,8 +39,8 @@ + #ifndef __X86EMU_OPS_H + #define __X86EMU_OPS_H + +-void (*x86emu_optab[0x100])(u8 op1) L_SYM; +-void (*x86emu_optab2[0x100])(u8 op2) L_SYM; ++extern void (*x86emu_optab[0x100])(u8 op1) L_SYM; ++extern void (*x86emu_optab2[0x100])(u8 op2) L_SYM; + + void decode_cond(int type) L_SYM; + diff --git a/dev-libs/libx86emu/libx86emu-1.1.ebuild b/dev-libs/libx86emu/libx86emu-1.1.ebuild index b8392b9291f..21c131149a9 100644 --- a/dev-libs/libx86emu/libx86emu-1.1.ebuild +++ b/dev-libs/libx86emu/libx86emu-1.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 -inherit multilib rpm toolchain-funcs +inherit rpm toolchain-funcs DESCRIPTION="A library for emulating x86" HOMEPAGE="https://www.opensuse.org/"; @@ -12,24 +12,14 @@ SRC_URI="https://download.opensuse.org/source/factory/repo/oss/suse/src/${P}-9.8 LICENSE="HPND" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" -src_prepare() { - sed -i \ - -e 's:$(CC) -shared:& $(LDFLAGS):' \ - Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -fPIC -Wall" -} +PATCHES=( + "${FILESDIR}"/${PN}-1.1-fix-makefile.patch + "${FILESDIR}"/${PN}-1.1-gcc10-fno-common.patch +) -src_test() { - ln -sf libx86emu.so.1.1 libx86emu.so || die - ln -sf libx86emu.so.1.1 libx86emu.so.1 || die -
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libtommath/, dev-libs/libtommath/files/
commit: 1258b1cdce5caf9af04442f82918f7108532b0bc Author: David Seifert gentoo org> AuthorDate: Sun Feb 9 23:04:58 2020 + Commit: David Seifert gentoo org> CommitDate: Sun Feb 9 23:04:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1258b1cd dev-libs/libtommath: Remove old Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert gentoo.org> dev-libs/libtommath/Manifest | 2 - .../files/libtommath-0.42.0-makefile.patch | 47 -- dev-libs/libtommath/libtommath-0.42.0-r1.ebuild| 65 --- dev-libs/libtommath/libtommath-1.0.1.ebuild| 72 -- 4 files changed, 186 deletions(-) diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest index 252e843e5fd..f9af84786c5 100644 --- a/dev-libs/libtommath/Manifest +++ b/dev-libs/libtommath/Manifest @@ -1,3 +1 @@ -DIST libtommath-0.42.0.tar.gz 1732144 BLAKE2B 624697bfa0bab0244783c3d2c92df2a1c0418611dc7f25989d038a5689beae325a426d8de38967ec856bd1e6f2d9413615333eebbf9316add838deda5b122de3 SHA512 d26e7737e5750530a7b96432502f0d458931e67af528872c46ad8dfc921b8f6ef4b3e05cb07d22bd13a8b24db65812928ae4c381250a4df95f6ca55efc3dae23 -DIST ltm-1.0.1.tar.xz 2210120 BLAKE2B e616f0359a1fffe8e1280dc24df1a83eb568d55f9f8acd0e4016fdd63b8ef10d939a8acbd4d49d70a69adf0e492ea5127200798f02af6af1c30e2e1f57870e3a SHA512 f98f7b0f91268e898803478fd52f578f476d378d096a25e48fa2e291159dc89bd1a6dc7d8c5c2254df840c731e5d009ec9728b72190318b6d1ba2916f5c66fb6 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 diff --git a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch b/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch deleted file mode 100644 index b3f1ed6252c..000 --- a/dev-libs/libtommath/files/libtommath-0.42.0-makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ makefile.shared -+++ makefile.shared -@@ -3,7 +3,8 @@ - #Tom St Denis - VERSION=0:41 - --CC = libtool --mode=compile --tag=CC gcc -+LT?= libtool -+LTCOMPILE = $(LT) --mode=compile --tag=CC $(CC) - - CFLAGS += -I./ -Wall -W -Wshadow -Wsign-compare - -@@ -82,21 +83,24 @@ - - objs: $(OBJECTS) - -+%.lo: %.c -+ $(LTCOMPILE) $(CFLAGS) $(CPPFLAGS) -o $@ -c $< -+ --$(LIBNAME): $(OBJECTS) -- libtool --mode=link gcc *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) -+$(LIBNAME): $(OBJECTS:.o=.lo) -+ $(LT) --mode=link --tag=CC $(CC) $(CFLAGS) $(LDFLAGS) *.lo -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION) - - install: $(LIBNAME) -- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH) -- libtool --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME) -- install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH) -- install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH) -+ install -d $(DESTDIR)$(LIBPATH) -+ $(LT) --mode=install install -c $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME) -+ install -d $(DESTDIR)$(INCPATH) -+ install -m 644 $(HEADERS) $(DESTDIR)$(INCPATH) - - test: $(LIBNAME) demo/demo.o -- gcc $(CFLAGS) -c demo/demo.c -o demo/demo.o -- libtool --mode=link gcc -o test demo/demo.o $(LIBNAME_S) -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c demo/demo.c -o demo/demo.o -+ $(LT) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o test demo/demo.o $(LIBNAME_S) - - mtest: test -- cd mtest ; gcc $(CFLAGS) mtest.c -o mtest -+ cd mtest ; $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) mtest.c -o mtest - - timing: $(LIBNAME) -- gcc $(CFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest -+ $(LT) --mode=link $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DTIMER demo/timing.c $(LIBNAME_S) -o ltmtest diff --git a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild b/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild deleted file mode 100644 index a1596d889e3..000 --- a/dev-libs/libtommath/libtommath-0.42.0-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools eutils multilib toolchain-funcs - -DESCRIPTION="Optimized and portable routines for integer theoretic applications" -HOMEPAGE="https://github.com/libtom/libtommath"; -SRC_URI="https://github.com/libtom/libtommath/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="WTFPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples static-libs" - -DEPEND="sys-devel/libtool" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${P}-makefile.patch - - # need libtool for cross compilation. Bug #
[gentoo-commits] repo/gentoo:master commit in: mail-client/roundcube/
commit: 2db4642378cb97be10c5e4858bcb7263e0e482b4 Author: Philippe Chaintreuil parallaxshift com> AuthorDate: Fri Jan 3 12:14:41 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 22:33:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db46423 mail-client/roundcube: 1.4.2 version bump - Also bumped copyright date: Happy New Year! Closes: https://bugs.gentoo.org/704690 Closes: https://github.com/gentoo/gentoo/pull/14226 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Philippe Chaintreuil parallaxshift.com> Signed-off-by: Miroslav Šulc gentoo.org> mail-client/roundcube/Manifest | 1 + mail-client/roundcube/roundcube-1.4.2.ebuild | 73 2 files changed, 74 insertions(+) diff --git a/mail-client/roundcube/Manifest b/mail-client/roundcube/Manifest index 09042d04c26..3a7c96218d0 100644 --- a/mail-client/roundcube/Manifest +++ b/mail-client/roundcube/Manifest @@ -3,3 +3,4 @@ DIST roundcubemail-1.3.8-complete.tar.gz 5534385 BLAKE2B 2f0cb528d0901d267c74d57 DIST roundcubemail-1.3.9-complete.tar.gz 5521697 BLAKE2B 4689bb43ff02b99a9b2b06d6370a5dce0ec4eca4e4da2a74e33e77ec74ec14bf22b6bab415c8b5fde9bd76bfaed87f183a8979edb353da3ed947f9bfdb0ecb15 SHA512 42ae9b772272b3e82476beeeb0fc5a909fb07ed0bfbdb655627b1e31da1c292f67f5a305452de31b2d60fe5905bcacabd6874dea394a9b0fd66b7921d73500ac DIST roundcubemail-1.4.0-complete.tar.gz 6997256 BLAKE2B b19a2d049512ceb53b3844f4680ed061044d2d142bef322c067b381e3be57ecb3181cac4f2492a162da1417fefb4028c36d34dae4bf9064c97568f681bd0c78b SHA512 274372793f1f3af761702f8972f6360f8c8e64a705ff96f1432f6a520d24c9ca0e8ccc3933f26433f1c864bd6c381066fc9eb48bf97e9497b4cbff855412d811 DIST roundcubemail-1.4.1-complete.tar.gz 6998687 BLAKE2B ff33e512bb202d37d77ae2a4c7820f1061598bee1eb01bed5f15b25ad0e27c0cfe3611b44d451982491b702abcf6d7ae1bc88cbd303bc9a2573fc79efc54bec5 SHA512 0c8e09e93c86aad0f3e3a5a81c5e9ad8ab8aee101ae8ebb78d29556575db94a51a07cbf955ec79235425a961427b826ad27fae750b8eae785eedd195161dabed +DIST roundcubemail-1.4.2-complete.tar.gz 7006013 BLAKE2B f92b94de3ce58cd145ce3d30875902d44410cb039176be5c2d09a23741b08405b21107b03a0ae302cfdf5a845a49cf044f13a09b582f291639648aac3b2f4c81 SHA512 3f705bc38b44a0b7ea3241b0222f607b040ec01c8ea400b6b6222fbe346570c5f3450e5a188bab99ea171481453eb3f5b1e7457070ace1144558ec662a4273bb diff --git a/mail-client/roundcube/roundcube-1.4.2.ebuild b/mail-client/roundcube/roundcube-1.4.2.ebuild new file mode 100644 index 000..6d3b3ede4e4 --- /dev/null +++ b/mail-client/roundcube/roundcube-1.4.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit webapp + +MY_PN=${PN}mail +MY_PV=${PV/_/-} +MY_P=${MY_PN}-${MY_PV} + +DESCRIPTION="A browser-based multilingual IMAP client with an application-like user interface" +HOMEPAGE="https://roundcube.net"; +SRC_URI="https://github.com/${PN}/${MY_PN}/releases/download/${MY_PV}/${MY_P}-complete.tar.gz"; + +# roundcube is GPL-licensed, the rest of the licenses here are +# for bundled PEAR components, googiespell and utf8.class.php +LICENSE="GPL-3 BSD PHP-2.02 PHP-3 MIT public-domain" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" + +IUSE="change-password enigma ldap mysql postgres sqlite ssl spell" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +# this function only sets DEPEND so we need to include that in RDEPEND +need_httpd_cgi + +RDEPEND=" + ${DEPEND} + >=dev-lang/php-5.4.0[filter,gd,iconv,json,ldap?,pdo,postgres?,session,sqlite?,ssl?,unicode,xml] + virtual/httpd-php + change-password? ( + dev-lang/php[sockets] + ) + enigma? ( + app-crypt/gnupg + ) + mysql? ( + || ( + dev-lang/php[mysql] + dev-lang/php[mysqli] + ) + ) + spell? ( dev-lang/php[curl,spell] ) +" + +S="${WORKDIR}/${MY_P}" + +src_install() { + webapp_src_preinst + + dodoc CHANGELOG INSTALL README.md UPGRADING + + insinto "${MY_HTDOCSDIR}" + doins -r [[:lower:]]* SQL + doins .htaccess + + webapp_serverowned "${MY_HTDOCSDIR}"/logs + webapp_serverowned "${MY_HTDOCSDIR}"/temp + + webapp_configfile "${MY_HTDOCSDIR}"/config/defaults.inc.php + webapp_postupgrade_txt en "${FILESDIR}/POST-UPGRADE_complete.txt" + + webapp_src_install +} + +pkg_postinst() { + webapp_pkg_postinst + + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog "You can review the post-upgrade instructions at:" + elog "${EROOT%/}/usr/share/webapps/${PN}/${PV}/postupgrade-en.txt" + fi +}
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/files/, kde-frameworks/kio/
commit: 8dba7f7eba3b961468d2477f4e35da63419298f9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 20:20:41 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 22:27:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dba7f7e kde-frameworks/kio: Fix memory leak in KUrlNavigatorPlacesSelector Reported-by: David Korth gerbilsoft.com> Closes: https://bugs.gentoo.org/708876 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kio/files/kio-5.67.0-memleak.patch | 43 +++ kde-frameworks/kio/kio-5.67.0-r1.ebuild | 88 +++ 2 files changed, 131 insertions(+) diff --git a/kde-frameworks/kio/files/kio-5.67.0-memleak.patch b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch new file mode 100644 index 000..cf168b79183 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.67.0-memleak.patch @@ -0,0 +1,43 @@ +From 213ed50634c02d8ec4aa91f0c307cfdd6f78170d Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Wed, 29 Jan 2020 19:50:33 +0100 +Subject: Fix memory leak in KUrlNavigatorPlacesSelector::updateMenu + +Summary: +This method gets called each time solid notices a change, which can in some +setups be very frequent. It leaked memory as the submenus and their actions +were not deallocated properly. + +Test Plan: Builds. User feedback: "so far so good, 160 MB Memory usage". It was ~7GiB before this patch. + +Reviewers: #frameworks, davidedmundson, meven + +Reviewed By: davidedmundson, meven + +Subscribers: anthonyfieroni, meven, kde-frameworks-devel + +Tags: #frameworks + +Differential Revision: https://phabricator.kde.org/D27002 +--- + src/filewidgets/kurlnavigatorplacesselector.cpp | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/src/filewidgets/kurlnavigatorplacesselector.cpp b/src/filewidgets/kurlnavigatorplacesselector.cpp +index 7d33930..103a5fc 100644 +--- a/src/filewidgets/kurlnavigatorplacesselector.cpp b/src/filewidgets/kurlnavigatorplacesselector.cpp +@@ -71,6 +71,11 @@ void KUrlNavigatorPlacesSelector::updateMenu() + { + m_placesMenu->clear(); + ++// Submenus have to be deleted explicitly (QTBUG-11070) ++for(QObject *obj : QObjectList(m_placesMenu->children())) { ++delete qobject_cast(obj); // Noop for nullptr ++} ++ + updateSelection(m_selectedUrl); + + QString previousGroup; +-- +cgit v1.1 diff --git a/kde-frameworks/kio/kio-5.67.0-r1.ebuild b/kde-frameworks/kio/kio-5.67.0-r1.ebuild new file mode 100644 index 000..3bd5e746e87 --- /dev/null +++ b/kde-frameworks/kio/kio-5.67.0-r1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-2) +QTMIN=5.12.3 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Framework providing transparent file and data management" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="acl +handbook kerberos +kwallet X" + +# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0 +RDEPEND=" + dev-libs/libxml2 + dev-libs/libxslt + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5=[ssl] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + =kde-frameworks/kauth-${PVCUT}*:5 + =kde-frameworks/karchive-${PVCUT}*:5 + =kde-frameworks/kbookmarks-${PVCUT}*:5 + =kde-frameworks/kcodecs-${PVCUT}*:5 + =kde-frameworks/kcompletion-${PVCUT}*:5 + =kde-frameworks/kconfig-${PVCUT}*:5 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5 + =kde-frameworks/kcoreaddons-${PVCUT}*:5 + =kde-frameworks/kcrash-${PVCUT}*:5 + =kde-frameworks/kdbusaddons-${PVCUT}*:5 + =kde-frameworks/ki18n-${PVCUT}*:5 + =kde-frameworks/kiconthemes-${PVCUT}*:5 + =kde-frameworks/kitemviews-${PVCUT}*:5 + =kde-frameworks/kjobwidgets-${PVCUT}*:5 + =kde-frameworks/knotifications-${PVCUT}*:5 + =kde-frameworks/kservice-${PVCUT}*:5 + =kde-frameworks/ktextwidgets-${PVCUT}*:5 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 + =kde-frameworks/kwindowsystem-${PVCUT}*:5 + =kde-frameworks/kxmlgui-${PVCUT}*:5 + =kde-frameworks/solid-${PVCUT}*:5 + acl? ( + sys-apps/attr + virtual/acl + ) + handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) + kerberos? ( virtual/krb5 ) + kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) + X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) +" +DEPEND="${RDEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 + test? ( sys-libs/zlib ) + X? ( + x11-base/xorg-proto + x11-libs/libX11 + x11-libs/libXrender + ) +" +PDEPEND=" + >=kde-frameworks
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/
commit: 8d4e92cd844c0824481dccde71953ae5dc33a874 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 20:22:20 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 22:27:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4e92cd kde-frameworks/kio: Drop 5.67.0 (r0) Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kio/kio-5.67.0.ebuild | 84 1 file changed, 84 deletions(-) diff --git a/kde-frameworks/kio/kio-5.67.0.ebuild b/kde-frameworks/kio/kio-5.67.0.ebuild deleted file mode 100644 index cfa5f2ece81..000 --- a/kde-frameworks/kio/kio-5.67.0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Framework providing transparent file and data management" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="acl +handbook kerberos +kwallet X" - -# drop qtnetwork subslot operator when QT_MINIMAL >= 5.15.0 -RDEPEND=" - dev-libs/libxml2 - dev-libs/libxslt - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5=[ssl] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - =kde-frameworks/kauth-${PVCUT}*:5 - =kde-frameworks/karchive-${PVCUT}*:5 - =kde-frameworks/kbookmarks-${PVCUT}*:5 - =kde-frameworks/kcodecs-${PVCUT}*:5 - =kde-frameworks/kcompletion-${PVCUT}*:5 - =kde-frameworks/kconfig-${PVCUT}*:5 - =kde-frameworks/kconfigwidgets-${PVCUT}*:5 - =kde-frameworks/kcoreaddons-${PVCUT}*:5 - =kde-frameworks/kcrash-${PVCUT}*:5 - =kde-frameworks/kdbusaddons-${PVCUT}*:5 - =kde-frameworks/ki18n-${PVCUT}*:5 - =kde-frameworks/kiconthemes-${PVCUT}*:5 - =kde-frameworks/kitemviews-${PVCUT}*:5 - =kde-frameworks/kjobwidgets-${PVCUT}*:5 - =kde-frameworks/knotifications-${PVCUT}*:5 - =kde-frameworks/kservice-${PVCUT}*:5 - =kde-frameworks/ktextwidgets-${PVCUT}*:5 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 - =kde-frameworks/kwindowsystem-${PVCUT}*:5 - =kde-frameworks/kxmlgui-${PVCUT}*:5 - =kde-frameworks/solid-${PVCUT}*:5 - acl? ( - sys-apps/attr - virtual/acl - ) - handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) - kerberos? ( virtual/krb5 ) - kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 - test? ( sys-libs/zlib ) - X? ( - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - ) -" -PDEPEND=" - >=kde-frameworks/kded-${PVCUT}:5 -" - -# tests hang -RESTRICT+=" test" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package acl ACL) - $(cmake_use_find_package handbook KF5DocTools) - $(cmake_use_find_package kerberos GSSAPI) - $(cmake_use_find_package kwallet KF5Wallet) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/
commit: a8e4fb82227346910789e09217d2631b44516fd8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 22:09:09 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 22:27:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8e4fb82 media-gfx/kphotoalbum: Drop 5.6 (r0) Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild | 67 1 file changed, 67 deletions(-) diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild deleted file mode 100644 index 2e4ae7efba7..000 --- a/media-gfx/kphotoalbum/kphotoalbum-5.6.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Tool for indexing, searching, and viewing images" -HOMEPAGE="https://www.kphotoalbum.org/"; - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+ FDL-1.2" -SLOT="5" -IUSE="+kipi map +raw share" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/phonon[qt5(+)] - virtual/jpeg:0 - kipi? ( kde-apps/libkipi:5= ) - map? ( kde-apps/libkgeomap:5 ) - raw? ( kde-apps/libkdcraw:5 ) - share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - media-video/ffmpeg - kipi? ( kde-apps/kipi-plugins:5 ) -" - -DOCS=( ChangeLog README.md ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kipi KF5Kipi) - $(cmake_use_find_package map KF5KGeoMap) - $(cmake_use_find_package raw KF5KDcraw) - $(cmake_use_find_package share KF5Purpose) - ) - - ecm_src_configure -}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/kphotoalbum/, media-gfx/kphotoalbum/files/
commit: 31d115347979a361eb9e0aa666c5333a9b9591b2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 22:08:09 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 22:27:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d11534 media-gfx/kphotoalbum: Fix crash when associating a tag with an area Upstream commit 583e10e8356d2ed64f0358ebf107bff35a98db31 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/kphotoalbum-5.6-crashfix.patch | 41 + media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild| 69 ++ 2 files changed, 110 insertions(+) diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch new file mode 100644 index 000..96b752bf075 --- /dev/null +++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.6-crashfix.patch @@ -0,0 +1,41 @@ +From 583e10e8356d2ed64f0358ebf107bff35a98db31 Mon Sep 17 00:00:00 2001 +From: Johannes Zarl-Zierl +Date: Sun, 9 Feb 2020 22:51:15 +0100 +Subject: Fix crash when associating a tag with an area. + +If a tag is being associated with an area, the context menu has two +levels: the direct "associate with " and the sub-menu +"associate with..." followed by a list of tags. + +Each version uses a different function signature for +ResizableFrame::associateTags. When refactoring connections to the "new" +signal-slot syntax in commit c38f5136 (thus released in version 5.6), I +applied the wrong signature to the connect statement. + +This resulted in a crash/failed assertion when selecting a tag in the +described way. +--- + AnnotationDialog/ResizableFrame.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp +index f2dba86..44175fb 100644 +--- a/AnnotationDialog/ResizableFrame.cpp b/AnnotationDialog/ResizableFrame.cpp +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2014-2019 The KPhotoAlbum Development Team ++/* Copyright (C) 2014-2020 The KPhotoAlbum Development Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public +@@ -522,7 +522,7 @@ void AnnotationDialog::ResizableFrame::addTagActions(QMenu *menu) + submenu->addAction(createAssociateTagAction(tag)); + } + +-connect(submenu, &QMenu::triggered, this, QOverload<>::of(&ResizableFrame::associateTag)); ++connect(submenu, &QMenu::triggered, this, QOverload::of(&ResizableFrame::associateTag)); + } + } + } +-- +cgit v1.1 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild new file mode 100644 index 000..5c27d00b9ab --- /dev/null +++ b/media-gfx/kphotoalbum/kphotoalbum-5.6-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Tool for indexing, searching, and viewing images" +HOMEPAGE="https://www.kphotoalbum.org/"; + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+ FDL-1.2" +SLOT="5" +IUSE="+kipi map +raw share" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5[sqlite] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/phonon[qt5(+)] + virtual/jpeg:0 + kipi? ( kde-apps/libkipi:5= ) + map? ( kde-apps/libkgeomap:5 ) + raw? ( kde-apps/libkdcraw:5 ) + share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) +" +RDEPEND="${DEPEND} + media-video/ffmpeg + kipi? ( kde-apps/kipi-plugins:5 ) +" + +DOCS=( ChangeLog README.md ) + +PATCHES=( "${FILESDIR}/${P}-crashfix.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package kipi KF5Kipi) + $(cmake_use_find_package map KF5KGeoMap) + $(cmake_use_find_package raw KF5KDcraw) +
[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/kio/
commit: f3de16b2a9706f0e1bd2e6f6a73a0dc11d23bd4a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 20:45:38 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 22:27:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3de16b2 kde-frameworks/kio: Add missing xdg-utils Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kio/kio-5.67.0-r1.ebuild | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kde-frameworks/kio/kio-5.67.0-r1.ebuild b/kde-frameworks/kio/kio-5.67.0-r1.ebuild index 3bd5e746e87..ab22fcb4504 100644 --- a/kde-frameworks/kio/kio-5.67.0-r1.ebuild +++ b/kde-frameworks/kio/kio-5.67.0-r1.ebuild @@ -8,7 +8,7 @@ ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-2) QTMIN=5.12.3 VIRTUALX_REQUIRED="test" -inherit ecm kde.org +inherit ecm kde.org xdg-utils DESCRIPTION="Framework providing transparent file and data management" LICENSE="LGPL-2+" @@ -86,3 +86,13 @@ src_configure() { ecm_src_configure } + +pkg_postinst() { + ecm_pkg_postinst + xdg_desktop_database_update +} + +pkg_postrm() { + ecm_pkg_postrm + xdg_desktop_database_update +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/camlp4/
commit: 11354812d60bb7d3b189884f4ca9b1d41652e56c Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 22:25:33 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 22:25:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11354812 dev-ml/camlp4: restricted ocaml versions in deps Bug: https://bugs.gentoo.org/708696 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/camlp4/camlp4-4.04_p1.ebuild | 4 ++-- dev-ml/camlp4/camlp4-4.05_p1.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild index 20df6f9f34f..c19c5780cca 100644 --- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild +++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.04_beta:=[ocamlopt?]" +DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]" RDEPEND="${DEPEND} !
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/
commit: b84e7cc0f017d4c72cef9ad9b5157dca7ee679da Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 22:14:52 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 22:16:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b84e7cc0 dev-ml/ppx_tools: bumped to 5.3.4.08.0 + eapi7 Bug: https://bugs.gentoo.org/708696 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/ppx_tools/Manifest| 1 + dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild | 29 2 files changed, 30 insertions(+) diff --git a/dev-ml/ppx_tools/Manifest b/dev-ml/ppx_tools/Manifest index 4c5a9570e8e..ee595bfd62d 100644 --- a/dev-ml/ppx_tools/Manifest +++ b/dev-ml/ppx_tools/Manifest @@ -1,2 +1,3 @@ DIST ppx_tools-5.0.4.03.0.tar.gz 17209 BLAKE2B bd51e5b2482a9eab09bf9a02ac0231fa7bbc721d54a932e6cfdc1d719c106eca0fe90563b636601110e796fab439f6c6d7fccd5d2920f5bcb3c115f622d90381 SHA512 d1867b084885704757f390b6f6ca8b5d7702f0476149d99ea227f98230ab35d57f5c4aa779881231a0a77cfd1861255118fa2551a49ab85553f63e9aab9baae4 DIST ppx_tools-5.0.4.05.0.tar.gz 17893 BLAKE2B 0902f53ef19338396cf2a2319a4c2d4b7bbbfb66bbfd0fb2290c29ecebcda02ff90d2f0d0221b08d027c41c863c2bc0a02c50363d83474864c08e619641b7ad6 SHA512 33b4420500a2b5880e770f8fdf2b37ef08e52ff84f96f955c6321492de906568979feccb1b2b477b1117619ba28edd8d3e0f178c5684f0dc43c6ed56266c4d64 +DIST ppx_tools-5.3.4.08.0.tar.gz 18590 BLAKE2B fac872d113ab1bf9135357dea47d468924e16a1a038b64152d5ebb27daa69a8c2d906750146157954f4d95769535f4a93c1ecc9582ca0313d601a06606196c00 SHA512 817e2688d60f013fa42ffa263cfcc15cfae820240d2e54dfedf1f4a4191f9b9fc365a190cc7eeb9082ed72fbf3c94d6ba72c38c7db3e2bcac49a17ba590d71b5 diff --git a/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild new file mode 100644 index 000..7e9d0206f34 --- /dev/null +++ b/dev-ml/ppx_tools/ppx_tools-5.3.4.08.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit findlib eutils + +MY_PV=$(ver_rs 2 '+') +DESCRIPTION="Tools for authors of ppx rewriters" +HOMEPAGE="https://github.com/alainfrisch/ppx_tools"; +SRC_URI="https://github.com/alainfrisch/ppx_tools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="+ocamlopt" + +DEPEND="dev-lang/ocaml:=[ocamlopt?]" +RDEPEND="${DEPEND}" +S="${WORKDIR}/${PN}-$(ver_rs 2 '-')" + +src_compile() { + emake -j1 $(usex ocamlopt "" "ARCH=none") +} + +src_install() { + findlib_src_install + dodoc README.md +}
[gentoo-commits] repo/gentoo:master commit in: dev-ada/libadalang/
commit: 76fddc52844f1553ce86c9e1dbabcc0b6c183525 Author: Tupone Alfredo gentoo org> AuthorDate: Sun Feb 9 21:37:59 2020 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Feb 9 21:37:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76fddc52 dev-ada/libadalang: fix dependency Closes: https://bugs.gentoo.org/708472 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Alfredo Tupone gentoo.org> dev-ada/libadalang/libadalang-2019-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ada/libadalang/libadalang-2019-r1.ebuild b/dev-ada/libadalang/libadalang-2019-r1.ebuild index a19f499cfc2..02d37bc0123 100644 --- a/dev-ada/libadalang/libadalang-2019-r1.ebuild +++ b/dev-ada/libadalang/libadalang-2019-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -20,7 +20,7 @@ KEYWORDS="amd64 x86" IUSE="+shared static-libs" RDEPEND="dev-python/pyyaml - dev-ada/gnatcoll-bindings[${ADA_USEDEP},iconv,shared=,static-libs=] + dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared=,static-libs=] ${ADA_DEPS} ${PYTHON_DEPS}" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/
commit: 8a06926472246a298d761679a1e200b4a0721c6d Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 21:35:53 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 21:36:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a069264 dev-ml/ppx_tools: doesn't compile with ocaml-4.09 Bug: https://bugs.gentoo.org/708696 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild | 4 ++-- dev-ml/ppx_tools/ppx_tools-5.0.4.05.0.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild index 3b440d54aeb..d0acc2b9fac 100644 --- a/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild +++ b/dev-ml/ppx_tools/ppx_tools-5.0.4.03.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,7 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.03.0:=[ocamlopt?]" +DEPEND="
[gentoo-commits] proj/euscan:docker-compose--wip--expect-force-pushes commit in: /
commit: f3cfe82d587d5efa73b828a1f69e3fa0136bdc1d Author: Sebastian Pipping gentoo org> AuthorDate: Sat Feb 8 18:40:50 2020 + Commit: Sebastian Pipping gentoo org> CommitDate: Sun Feb 9 21:24:54 2020 + URL:https://gitweb.gentoo.org/proj/euscan.git/commit/?id=f3cfe82d docker: Dockerize euscanwww (W.I.P.) Signed-off-by: Sebastian Pipping gentoo.org> Dockerfile | 70 docker-compose.yml | 33 + docker-entrypoint.sh | 24 ++ requirements.txt | 42 +++ 4 files changed, 169 insertions(+) diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000..c8e088d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,70 @@ +# Copyright 2020 Gentoo Authors +# Licensed under the GNU General Public License v2 + +FROM gentoo/stage3-amd64:20200208 + +RUN wget https://gentoo.osuosl.org/snapshots/gentoo-latest.tar.xz \ +&& \ +tar -C /var/db/repos/ -x -p -f gentoo-latest.tar.xz \ +&& \ +mv /var/db/repos/gentoo-20??/ /var/db/repos/gentoo/ \ +&& \ +rm gentoo-latest.tar.xz + +RUN emaint sync --repo gentoo + +RUN eselect profile show \ +&& \ +echo 'net-analyzer/rrdtool python' > /etc/portage/package.use/net-analyzer--rrdtool \ +&& \ +echo 'dev-lang/python:2.7 sqlite tk' > /etc/portage/package.use/dev-lang--python \ +&& \ +echo 'PYTHON_TARGETS="${PYTHON_TARGETS} python2_7"' >> /etc/portage/make.conf \ +&& \ +echo 'PYTHON_SINGLE_TARGET="python2_7"' >> /etc/portage/make.conf \ +&& \ +echo 'USE="${USE} bindist -syslog"' >> /etc/portage/make.conf + +# NOTE: First build dependencies, then runtime-only dependencies +RUN emerge --tree -v -j2 --color y -1uU \ +dev-lang/python:2.7 \ +dev-libs/cyrus-sasl \ +dev-python/pip \ +dev-python/setuptools \ +dev-python/wheel \ +net-nds/openldap \ +\ +app-portage/eix \ +app-portage/gentoolkit \ +app-portage/layman \ +net-analyzer/rrdtool \ +sys-apps/portage \ +&& \ +rm -f /var/cache/distfiles/* + +ENV PATH=/root/.local/bin/:${PATH} +COPY requirements.txt/tmp/euscan/ +RUN pip2 install --user -r /tmp/euscan/requirements.txt + +COPY setup.py README.rst /tmp/euscan/ +COPY bin//tmp/euscan/bin/ +COPY pym//tmp/euscan/pym/ +COPY euscanwww/djeuscan/ /tmp/euscan/pym/djeuscan/ +COPY euscanwww/euscan_accounts/ /tmp/euscan/pym/euscan_accounts/ +COPY euscanwww/euscan_captcha/ /tmp/euscan/pym/euscan_captcha/ +COPY euscanwww/euscanwww//tmp/euscan/pym/euscanwww/ + +COPY docker-entrypoint.sh /root/ + +WORKDIR /tmp/euscan/ + +RUN pip2 install --user . + +RUN pip2 check +RUN bash -c 'diff -U0 <(pip2 freeze --user | sed "/^\(euscan\|virtualenv\)==/d" | sort -f) <(sed -e "s/ *#.*//" -e "/^$/d" /tmp/euscan/requirements.txt | sort -f)' + +RUN rm -Rf /tmp/euscan/ + +EXPOSE 55080 +ENTRYPOINT ["/root/docker-entrypoint.sh"] +CMD [] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000..5bcec2f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,33 @@ +# Copyright 2020 Gentoo Authors +# Licensed under the GNU General Public License v2 + +version: "3" + +services: + runserver: +depends_on: + - celeryd +image: ${COMPOSE_PROJECT_NAME}_celeryd:latest +environment: + DJANGO_SETTINGS_MODULE: euscanwww.settings + EUSCAN_SECRET_KEY: ${EUSCAN_SECRET_KEY:?} +tty: true + + celerycam: +depends_on: + - celeryd +image: ${COMPOSE_PROJECT_NAME}_celeryd:latest +environment: + DJANGO_SETTINGS_MODULE: euscanwww.settings + EUSCAN_SECRET_KEY: ${EUSCAN_SECRET_KEY:?} +command: django-admin celerycam +tty: true + + celeryd: +build: + context: . +environment: + DJANGO_SETTINGS_MODULE: euscanwww.settings + EUSCAN_SECRET_KEY: ${EUSCAN_SECRET_KEY:?} +command: django-admin celeryd -B -E -l INFO +tty: true diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100755 index 000..508d265 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,24 @@ +#! /usr/bin/env bash +# Copyright 2020 Gentoo Authors +# Licensed under the GNU General Public License v2 + +set -e +set -u + +PS4='# ' +set -x + +id +ip addr + +manage_py() { +django-admin "$@" +} + +if [[ $# -gt 0 ]]; then +exec "$@" +fi + +manage_py migrate + +exec manage_py runserver 0.0.0.0:55080 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 000..8bfe7f6 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,42 @@ +# Direct dependencies (testing) +factory-boy==1.1.3 + +# Direct dependencies (command line utility) +BeautifulSoup==3.2.1 + +# Direct dependencies (web interface) +ansi2html==0.9.1 +Django==1.8 +django-ann
[gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/
commit: 26620e1b5534a3bf05781bf67dd1fedf9f52cfb3 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Feb 9 21:17:14 2020 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Feb 9 21:18:46 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26620e1b sys-apps/man-pages: 5.04 stable on all arches Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Anthony G. Basile gentoo.org> sys-apps/man-pages/man-pages-5.04.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild index 63013ab5b77..6450c0bbb0a 100644 --- a/sys-apps/man-pages/man-pages-5.04.ebuild +++ b/sys-apps/man-pages/man-pages-5.04.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz LICENSE="man-pages GPL-2+ BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" IUSE_L10N=" de fr it ja nl pl ru zh-CN" IUSE="nls ${IUSE_L10N// / l10n_}" RESTRICT="binchecks"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/
commit: 6fbb12ef137e1b009f1433f594e0078105ed17d4 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Feb 9 21:18:36 2020 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Feb 9 21:18:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbb12ef sys-apps/man-pages: remove older stable Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Anthony G. Basile gentoo.org> sys-apps/man-pages/Manifest | 1 - sys-apps/man-pages/man-pages-5.03.ebuild | 52 2 files changed, 53 deletions(-) diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest index 76b95ac7c47..f7ef711b8a3 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -1,4 +1,3 @@ -DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 diff --git a/sys-apps/man-pages/man-pages-5.03.ebuild b/sys-apps/man-pages/man-pages-5.03.ebuild deleted file mode 100644 index 6450c0bbb0a..000 --- a/sys-apps/man-pages/man-pages-5.03.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -GENTOO_PATCH=2 - -DESCRIPTION="A somewhat comprehensive collection of Linux man pages" -HOMEPAGE="https://www.kernel.org/doc/man-pages/"; -SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz - https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz - mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 - https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"; - -LICENSE="man-pages GPL-2+ BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux" -IUSE_L10N=" de fr it ja nl pl ru zh-CN" -IUSE="nls ${IUSE_L10N// / l10n_}" -RESTRICT="binchecks" - -# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462 -RDEPEND="virtual/man - !
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlbuild/
commit: c96cea487e4791a2e61c210a2ec036d2649377ba Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 21:12:59 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 21:13:20 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96cea48 dev-ml/ocamlbuild: 0.10.1 and 0.11.0 don't compile with ocaml-4.09 Bug: https://bugs.gentoo.org/708872 Bug: https://bugs.gentoo.org/708696 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild | 5 +++-- dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild index 62366767e29..10847fc11e6 100644 --- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild +++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,8 @@ SLOT="0/${PV}" KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="+ocamlopt" -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]" +# does not compile with ocaml-4.09 (bug # 708696 and #708872) +DEPEND="
[gentoo-commits] repo/gentoo:master commit in: sys-apps/man-pages/
commit: 34707f2bcc7e2d7fb9cf1dc70a0ca4004aa7227b Author: Anthony G. Basile gentoo org> AuthorDate: Sun Feb 9 21:08:52 2020 + Commit: Anthony G. Basile gentoo org> CommitDate: Sun Feb 9 21:09:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34707f2b sys-apps/man-pages: version bump to 5.05 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Anthony G. Basile gentoo.org> sys-apps/man-pages/Manifest | 1 + sys-apps/man-pages/man-pages-5.05.ebuild | 52 2 files changed, 53 insertions(+) diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest index d1803106adf..76b95ac7c47 100644 --- a/sys-apps/man-pages/Manifest +++ b/sys-apps/man-pages/Manifest @@ -1,3 +1,4 @@ DIST man-pages-5.03.tar.xz 1677908 BLAKE2B 54ba60a0ef772259fe8facf9e8d36155b16a3c990adb7bcc63e57bdd969d1853e6eadbc3d21186c23730c65dd7cefe497819921b9b5c8622bee74f656430723a SHA512 e7e0d1952abe75dd2503fd7bd7fbe34532ef22b70d82f299099e38e08a92604df0f23ed83267b57ca6d9d90e697651c46f6a95c1a077e3f193ba89f6293af7be DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe +DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770 diff --git a/sys-apps/man-pages/man-pages-5.05.ebuild b/sys-apps/man-pages/man-pages-5.05.ebuild new file mode 100644 index 000..63013ab5b77 --- /dev/null +++ b/sys-apps/man-pages/man-pages-5.05.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +GENTOO_PATCH=2 + +DESCRIPTION="A somewhat comprehensive collection of Linux man pages" +HOMEPAGE="https://www.kernel.org/doc/man-pages/"; +SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz + https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz + mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2 + https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"; + +LICENSE="man-pages GPL-2+ BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE_L10N=" de fr it ja nl pl ru zh-CN" +IUSE="nls ${IUSE_L10N// / l10n_}" +RESTRICT="binchecks" + +# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462 +RDEPEND="virtual/man + !
[gentoo-commits] repo/gentoo:master commit in: dev-python/snakeoil/
commit: 3bc898417d15c8b67f7ef1ccec09ac7f69e83c5e Author: Tim Harder gentoo org> AuthorDate: Sun Feb 9 20:51:56 2020 + Commit: Tim Harder gentoo org> CommitDate: Sun Feb 9 20:56:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc89841 dev-python/snakeoil: version bump to 0.8.8 Signed-off-by: Tim Harder gentoo.org> dev-python/snakeoil/Manifest | 1 + dev-python/snakeoil/snakeoil-0.8.8.ebuild | 32 +++ 2 files changed, 33 insertions(+) diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest index 7da150dea5f..7e5f35e858e 100644 --- a/dev-python/snakeoil/Manifest +++ b/dev-python/snakeoil/Manifest @@ -1,3 +1,4 @@ DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5 DIST snakeoil-0.8.5.tar.gz 296311 BLAKE2B d88b3f5fe299511343676ffad5a1f1efd10078f50d029b74feea66f6b6f65897e2d4dac2e96f65e0cbaae0942c5b9867fce868adf12be746c9c4ebf6f6a7f52f SHA512 d25cbc105d5c881d8e99d5c2970d524914838917a4a716d8f7269a85af0d9a067b9bb9c26a37b9eb49239f97360938bece1a1ebe87aba04340b0fe528f44dc4b DIST snakeoil-0.8.7.tar.gz 296593 BLAKE2B ecc745d63e50c5393ee2cf2bea62a0f356b5aa5432f4b6ca2578c7324139592ad38aaf71336715342298da9a2b8bc8c90efab3f9512835b17b4af56632997bfe SHA512 010bbaa08f84ce59f20324ae86af4ad71c167442557934e31fc2040e3ced8d2ce0f1657272057d06e9fd1c22fd8ec89ad3233f24443ace4861121319f2772679 +DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d diff --git a/dev-python/snakeoil/snakeoil-0.8.8.ebuild b/dev-python/snakeoil/snakeoil-0.8.8.ebuild new file mode 100644 index 000..424cd085a42 --- /dev/null +++ b/dev-python/snakeoil/snakeoil-0.8.8.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_REQ_USE="threads(+)" +inherit distutils-r1 + +if [[ ${PV} == * ]] ; then + EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"; + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="misc common functionality and useful optimizations" +HOMEPAGE="https://github.com/pkgcore/snakeoil"; + +LICENSE="BSD BSD-2 MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" +[[ ${PV} == ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" + +python_test() { + esetup.py test +}
[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/
commit: 1b9afcfa2d2bdfbb6996e4bbed14daf3531f22b7 Author: Tim Harder gentoo org> AuthorDate: Sun Feb 9 20:55:52 2020 + Commit: Tim Harder gentoo org> CommitDate: Sun Feb 9 20:56:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b9afcfa dev-util/pkgcheck: remove old Signed-off-by: Tim Harder gentoo.org> dev-util/pkgcheck/Manifest | 1 - dev-util/pkgcheck/pkgcheck-0.7.4.ebuild | 54 - 2 files changed, 55 deletions(-) diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest index e176b6d60a2..230f4f40783 100644 --- a/dev-util/pkgcheck/Manifest +++ b/dev-util/pkgcheck/Manifest @@ -1,3 +1,2 @@ -DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74 DIST pkgcheck-0.7.5.tar.gz 229979 BLAKE2B 134a67e139fed22f70fc5af5a1644df17ac46ca093b47cae0d362702ff33be320b838ac7c3c6e6d3c309644f7399ff0c33d6e6152d385be8312311b760d636d8 SHA512 eb46847ad5293e5cd6043e5f1edbb4307bf41593bc19a44c73ccb67590545055ce9fd3cddc25e4cc693bb2666aaf24944070796546743e0d7417f8e47cd516d0 DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136 diff --git a/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild deleted file mode 100644 index bbcc3dd247b..000 --- a/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8} ) -DISTUTILS_IN_SOURCE_BUILD=1 -inherit distutils-r1 - -if [[ ${PV} == * ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"; - inherit git-r3 -else - KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="pkgcore-based QA utility" -HOMEPAGE="https://github.com/pkgcore/pkgcheck"; - -LICENSE="BSD" -SLOT="0" -IUSE="network perl test" -RESTRICT="!test? ( test )" - -if [[ ${PV} == * ]]; then - RDEPEND=" - ~dev-python/snakeoil-[${PYTHON_USEDEP}] - ~sys-apps/pkgcore-[${PYTHON_USEDEP}]" -else - RDEPEND=" - >=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}] - >=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]" -fi -RDEPEND+=" - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pathspec[${PYTHON_USEDEP}] - network? ( dev-python/requests[${PYTHON_USEDEP}] ) - perl? ( dev-perl/Gentoo-PerlMod-Version ) -" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -python_test() { - esetup.py test -} - -python_install_all() { - local DOCS=( AUTHORS NEWS.rst ) - [[ ${PV} == * ]] || doman man/* - distutils-r1_python_install_all -}
[gentoo-commits] repo/gentoo:master commit in: dev-python/snakeoil/
commit: d8812fac1037d2234e1344f1e4fda9d646df4ce2 Author: Tim Harder gentoo org> AuthorDate: Sun Feb 9 20:54:38 2020 + Commit: Tim Harder gentoo org> CommitDate: Sun Feb 9 20:56:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8812fac dev-python/snakeoil: remove old Signed-off-by: Tim Harder gentoo.org> dev-python/snakeoil/Manifest | 1 - dev-python/snakeoil/snakeoil-0.8.5.ebuild | 32 --- 2 files changed, 33 deletions(-) diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest index 7e5f35e858e..f62b9e83aa8 100644 --- a/dev-python/snakeoil/Manifest +++ b/dev-python/snakeoil/Manifest @@ -1,4 +1,3 @@ DIST snakeoil-0.7.5.tar.gz 303270 BLAKE2B 66d00cf50c8efd73d765904b9c7e8ba725caef9608e68f5707ddc09358507fe64214af73b333ec5bee2ef950d8dbad474cb5d9e4412757bc3c82d75909f6fc23 SHA512 b9f6efce2e3f5df83248b1faa84493aa11d8a08935e3991a56daace96e0de39dd5c7d25a69a4394f7ba163de78ed56a2619ef64c33114128fc02052d676a86a5 -DIST snakeoil-0.8.5.tar.gz 296311 BLAKE2B d88b3f5fe299511343676ffad5a1f1efd10078f50d029b74feea66f6b6f65897e2d4dac2e96f65e0cbaae0942c5b9867fce868adf12be746c9c4ebf6f6a7f52f SHA512 d25cbc105d5c881d8e99d5c2970d524914838917a4a716d8f7269a85af0d9a067b9bb9c26a37b9eb49239f97360938bece1a1ebe87aba04340b0fe528f44dc4b DIST snakeoil-0.8.7.tar.gz 296593 BLAKE2B ecc745d63e50c5393ee2cf2bea62a0f356b5aa5432f4b6ca2578c7324139592ad38aaf71336715342298da9a2b8bc8c90efab3f9512835b17b4af56632997bfe SHA512 010bbaa08f84ce59f20324ae86af4ad71c167442557934e31fc2040e3ced8d2ce0f1657272057d06e9fd1c22fd8ec89ad3233f24443ace4861121319f2772679 DIST snakeoil-0.8.8.tar.gz 296519 BLAKE2B 5a5f6326d01874b46a5cb85f5370217f4f3dfd5743679280f1f59737567cd5d79deb945be847fd3cd47ff0ed67cc836d2a3e53c4aefbe8080da767f380295538 SHA512 ea1ff6ea45c9f5fc3bc539cc65031050093cc1fbdda869b7160b286dcf3233577ca297ab55ee3d7ee4253c5485f9e956e14ee2a97bfb88680811d1b8af6cd62d diff --git a/dev-python/snakeoil/snakeoil-0.8.5.ebuild b/dev-python/snakeoil/snakeoil-0.8.5.ebuild deleted file mode 100644 index e073443aa4a..000 --- a/dev-python/snakeoil/snakeoil-0.8.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{6,7,8} ) -PYTHON_REQ_USE="threads(+)" -inherit distutils-r1 - -if [[ ${PV} == * ]] ; then - EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"; - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="misc common functionality and useful optimizations" -HOMEPAGE="https://github.com/pkgcore/snakeoil"; - -LICENSE="BSD BSD-2 MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" -[[ ${PV} == ]] && DEPEND+=" dev-python/cython[${PYTHON_USEDEP}]" - -python_test() { - esetup.py test -}
[gentoo-commits] repo/gentoo:master commit in: dev-util/pkgcheck/
commit: 0664508f2c985dc9e68714f4d7e41d473a152b00 Author: Tim Harder gentoo org> AuthorDate: Sun Feb 9 20:55:29 2020 + Commit: Tim Harder gentoo org> CommitDate: Sun Feb 9 20:56:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0664508f dev-util/pkgcheck: version bump to 0.7.6 Signed-off-by: Tim Harder gentoo.org> dev-util/pkgcheck/Manifest| 1 + dev-util/pkgcheck/{pkgcheck-.ebuild => pkgcheck-0.7.6.ebuild} | 2 +- dev-util/pkgcheck/pkgcheck-.ebuild| 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest index 10ae4e49fe3..e176b6d60a2 100644 --- a/dev-util/pkgcheck/Manifest +++ b/dev-util/pkgcheck/Manifest @@ -1,2 +1,3 @@ DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74 DIST pkgcheck-0.7.5.tar.gz 229979 BLAKE2B 134a67e139fed22f70fc5af5a1644df17ac46ca093b47cae0d362702ff33be320b838ac7c3c6e6d3c309644f7399ff0c33d6e6152d385be8312311b760d636d8 SHA512 eb46847ad5293e5cd6043e5f1edbb4307bf41593bc19a44c73ccb67590545055ce9fd3cddc25e4cc693bb2666aaf24944070796546743e0d7417f8e47cd516d0 +DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136 diff --git a/dev-util/pkgcheck/pkgcheck-.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild similarity index 96% copy from dev-util/pkgcheck/pkgcheck-.ebuild copy to dev-util/pkgcheck/pkgcheck-0.7.6.ebuild index 61ffc645f69..d3aed7fc337 100644 --- a/dev-util/pkgcheck/pkgcheck-.ebuild +++ b/dev-util/pkgcheck/pkgcheck-0.7.6.ebuild @@ -28,7 +28,7 @@ if [[ ${PV} == * ]]; then ~sys-apps/pkgcore-[${PYTHON_USEDEP}]" else RDEPEND=" - >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}] + >=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}] >=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]" fi RDEPEND+=" diff --git a/dev-util/pkgcheck/pkgcheck-.ebuild b/dev-util/pkgcheck/pkgcheck-.ebuild index 61ffc645f69..d3aed7fc337 100644 --- a/dev-util/pkgcheck/pkgcheck-.ebuild +++ b/dev-util/pkgcheck/pkgcheck-.ebuild @@ -28,7 +28,7 @@ if [[ ${PV} == * ]]; then ~sys-apps/pkgcore-[${PYTHON_USEDEP}]" else RDEPEND=" - >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}] + >=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}] >=sys-apps/pkgcore-0.10.11[${PYTHON_USEDEP}]" fi RDEPEND+="
[gentoo-commits] repo/gentoo:master commit in: app-text/calibre/, app-text/calibre/files/
commit: e2488d93b0267444a7e14c52da34e31ec0b97e18 Author: Zac Medico gentoo org> AuthorDate: Sun Feb 9 20:46:19 2020 + Commit: Zac Medico gentoo org> CommitDate: Sun Feb 9 20:50:24 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2488d93 app-text/calibre: kobo py3 fix for bug 708742 Closes: https://bugs.gentoo.org/708742 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Zac Medico gentoo.org> ...e-4.10.1-r1.ebuild => calibre-4.10.1-r2.ebuild} | 3 +- ...bre-4.9.1-r1.ebuild => calibre-4.9.1-r2.ebuild} | 3 +- ...Ignore-TypeError-sorting-collections-kobo.patch | 63 ++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/app-text/calibre/calibre-4.10.1-r1.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild similarity index 98% rename from app-text/calibre/calibre-4.10.1-r1.ebuild rename to app-text/calibre/calibre-4.10.1-r2.ebuild index 87653101234..2004b89741d 100644 --- a/app-text/calibre/calibre-4.10.1-r1.ebuild +++ b/app-text/calibre/calibre-4.10.1-r2.ebuild @@ -121,7 +121,8 @@ src_prepare() { # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" + "${FILESDIR}/${PN}-disable_plugins.patch" \ + "${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" eapply_user diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild similarity index 98% rename from app-text/calibre/calibre-4.9.1-r1.ebuild rename to app-text/calibre/calibre-4.9.1-r2.ebuild index 10509962f2e..3718b23741e 100644 --- a/app-text/calibre/calibre-4.9.1-r1.ebuild +++ b/app-text/calibre/calibre-4.9.1-r2.ebuild @@ -121,7 +121,8 @@ src_prepare() { # disable_plugins: walking sec-hole, wait for upstream to use GHNS interface eapply \ "${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \ - "${FILESDIR}/${PN}-disable_plugins.patch" + "${FILESDIR}/${PN}-disable_plugins.patch" \ + "${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" eapply_user diff --git a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch new file mode 100644 index 000..fb55e0025b7 --- /dev/null +++ b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch @@ -0,0 +1,63 @@ +From 6f947d88d323bb08bb6e076d442662aa281fe197 Mon Sep 17 00:00:00 2001 +From: Zac Medico +Date: Sun, 9 Feb 2020 12:16:04 -0800 +Subject: [PATCH] py3: Ignore TypeError when sorting device collections for + kobo driver + +https://github.com/kovidgoyal/calibre/pull/1098 + +Use the same approach as the usbms driver when cmp raises a +TypeError (see a8deb4b1f8dfb768a32b95b1540be32d5d6e871e). + +This should suppress the following error which was reported for +python3 and not python2: + +Traceback (most recent call last): + File "/usr/lib64/calibre/calibre/gui2/device.py", line 90, in run +self.result = self.func(*self.args, **self.kwargs) + File "/usr/lib64/calibre/calibre/gui2/device.py", line 543, in _sync_booklists +self.device.sync_booklists(booklists, end_session=False) + File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 970, in sync_booklists +self.update_device_database_collections(blist, collections, oncard) + File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 2398, in update_device_database_collections +collections = booklists.get_collections(collections_attributes) if bookshelf_attribute else None + File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 314, in get_collections +books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp)) + File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 307, in none_cmp +c = cmp(x, y) + File "/usr/lib64/calibre/polyglot/builtins.py", line 106, in cmp +return (a > b) - (a < b) +TypeError: '>' not supported between instances of 'float' and 'str' + +See: https://bugs.gentoo.org/708742 +--- + src/calibre/devices/kobo/books.py | 10 -- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py +index f725751d00..fc1dee6b7e 100644 +--- a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py +@@ -304,11 +304,17 @@ class KTCollectionsBookList(CollectionsBookList): + return -1 + if isinstance(x, string_or_bytes) and isinstance(y, string_or_bytes): + x, y = sort_key(force_unicode(x)), sort_key(force_unicode(y)) +-c = cmp(x, y) ++try: ++c = cmp(x, y) ++
[gentoo-commits] repo/gentoo:master commit in: dev-ml/findlib/
commit: 30653374dc06b0810dbf542349cd18121a99751e Author: Miroslav Šulc gentoo org> AuthorDate: Sun Feb 9 20:44:37 2020 + Commit: Miroslav Šulc gentoo org> CommitDate: Sun Feb 9 20:44:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30653374 dev-ml/findlib: 1.7* does not compile with ocaml-4.09 Bug: https://bugs.gentoo.org/708696 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> dev-ml/findlib/findlib-1.7.1.ebuild | 5 +++-- dev-ml/findlib/findlib-1.7.2.ebuild | 5 +++-- dev-ml/findlib/findlib-1.7.3.ebuild | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dev-ml/findlib/findlib-1.7.1.ebuild b/dev-ml/findlib/findlib-1.7.1.ebuild index 2db44577751..52d717f9e35 100644 --- a/dev-ml/findlib/findlib-1.7.1.ebuild +++ b/dev-ml/findlib/findlib-1.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -15,7 +15,8 @@ LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] +# it does not compile with ocaml-4.09 (bug #708696) +DEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-sound/cmus/
commit: 7677b6cfdbdc981a7e2f0c90df1392b4125fdbd8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 20:08:05 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 20:11:27 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7677b6cf media-sound/cmus: Drop USE cue Closes: https://bugs.gentoo.org/700122 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-sound/cmus/cmus-2.8.0.ebuild | 34 -- media-sound/cmus/cmus-.ebuild | 34 -- media-sound/cmus/metadata.xml | 1 - 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild index 83c05f7dc5e..e4cfd45303e 100644 --- a/media-sound/cmus/cmus-2.8.0.ebuild +++ b/media-sound/cmus/cmus-2.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"; LICENSE="GPL-2" SLOT="0" -IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate +IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack" @@ -34,7 +34,6 @@ DEPEND=" ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) - cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) @@ -74,16 +73,24 @@ PATCHES=( S="${WORKDIR}/${P/_/-}" -my_config() { - local value - use ${1} && value=a || value=n - myconf="${myconf} ${2}=${value}" -} - src_configure() { - local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n" + my_config() { + local value + use ${1} && value=a || value=n + myconf+=( ${2}=${value} ) + } + local debuglevel=1 use debug && debuglevel=2 + local myconf=( + CONFIG_CUE=y + CONFIG_ARTS=n + CONFIG_SUN=n + CONFIG_SNDIO=n + CONFIG_WAVEOUT=n + CONFIG_VTX=n + CONFIG_ROAR=n + ) my_config cddb CONFIG_CDDB my_config cdio CONFIG_CDIO @@ -100,7 +107,6 @@ src_configure() { my_config mp4 CONFIG_MP4 my_config aac CONFIG_AAC my_config ffmpeg CONFIG_FFMPEG - my_config cue CONFIG_CUE my_config pulseaudio CONFIG_PULSE my_config alsa CONFIG_ALSA my_config jack CONFIG_JACK @@ -109,12 +115,12 @@ src_configure() { my_config oss CONFIG_OSS if use elogind || use systemd; then - myconf="${myconf} CONFIG_MPRIS=a" + myconf+=( CONFIG_MPRIS=a ) else - myconf="${myconf} CONFIG_MPRIS=n" + myconf+=( CONFIG_MPRIS=n ) fi - ./configure prefix="${EPREFIX}"/usr ${myconf} \ + ./configure prefix="${EPREFIX}"/usr "${myconf[@]}" \ exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \ libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die } diff --git a/media-sound/cmus/cmus-.ebuild b/media-sound/cmus/cmus-.ebuild index 6ae109af57a..283dda19519 100644 --- a/media-sound/cmus/cmus-.ebuild +++ b/media-sound/cmus/cmus-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ HOMEPAGE="https://cmus.github.io/"; LICENSE="GPL-2" SLOT="0" -IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate +IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate +mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode +vorbis wavpack" @@ -34,7 +34,6 @@ DEPEND=" ao? ( media-libs/libao ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) - cue? ( media-libs/libcue ) discid? ( media-libs/libdiscid ) elogind? ( sys-auth/elogind ) ffmpeg? ( media-video/ffmpeg:= ) @@ -68,16 +67,24 @@ DOCS=( AUTHORS README.md ) S="${WORKDIR}/${P/_/-}" -my_config() { - local value - use ${1} && value=a || value=n - myconf="${myconf} ${2}=${value}" -} - src_configure() { - local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n" + my_config() { + local value + use ${1
[gentoo-commits] repo/gentoo:master commit in: dev-libs/hyphen/
commit: 9673d96b0c6418c23143a6d736d629ef82c54a77 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 19:55:17 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:55:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9673d96b dev-libs/hyphen: Drop 2.8.8 (r0) Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/hyphen/hyphen-2.8.8.ebuild | 33 - 1 file changed, 33 deletions(-) diff --git a/dev-libs/hyphen/hyphen-2.8.8.ebuild b/dev-libs/hyphen/hyphen-2.8.8.ebuild deleted file mode 100644 index 315fe7fa932..000 --- a/dev-libs/hyphen/hyphen-2.8.8.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="ALTLinux hyphenation library" -HOMEPAGE="http://hunspell.github.io/"; -SRC_URI="mirror://sourceforge/hunspell/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -RDEPEND="app-text/hunspell" -DEPEND="${RDEPEND} - dev-lang/perl -" - -DOCS=( AUTHORS ChangeLog NEWS README{,_hyph_en_US.txt,.nonstandard,.hyphen,.compound} THANKS TODO ) - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - - docinto pdf - dodoc doc/*.pdf - - rm -f "${ED}"usr/lib*/libhyphen.la -}
[gentoo-commits] proj/qa-scripts:master commit in: /
commit: e2814ad092a1f62a8342fce82c4b11a7166b0a74 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 9 19:45:42 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 19:45:42 2020 + URL:https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=e2814ad0 Bump pkgcheck2html Signed-off-by: Michał Górny gentoo.org> pkgcheck2html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgcheck2html b/pkgcheck2html index 2509822..9116234 16 --- a/pkgcheck2html +++ b/pkgcheck2html @@ -1 +1 @@ -Subproject commit 25098229ced10914cebd4092cc4455d9885c4ba0 +Subproject commit 9116234beed832d9ea6c69f8e1545cccb84b65b0
[gentoo-commits] repo/gentoo:master commit in: profiles/
commit: 1142285206ed065cc3ae0777dc23d0a8149455df Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 19:39:28 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:41:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11422852 profiles: Mask net-nntp/kwooty for removal Bug: https://bugs.gentoo.org/703930 Signed-off-by: Andreas Sturmlechner gentoo.org> profiles/package.mask | 4 1 file changed, 4 insertions(+) diff --git a/profiles/package.mask b/profiles/package.mask index 94a4955db06..6b29f509a41 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -32,6 +32,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2020-02-09) +# Dead upstream, broken by Qt 5.14, bug #703930. Masked for removal in 30 days. +net-nntp/kwooty + # Mike Pagano (2020-02-07) # The standalone ebuild for this driver is made # unnecessary as it is included in the package:
[gentoo-commits] repo/gentoo:master commit in: dev-python/rootpy/
commit: 40896339037bf291eee2896540a6158937c4fbba Author: Michał Górny gentoo org> AuthorDate: Sun Feb 9 19:26:02 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 19:40:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40896339 dev-python/rootpy: Use dodoc Signed-off-by: Michał Górny gentoo.org> dev-python/rootpy/rootpy-1.0.1-r1.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-python/rootpy/rootpy-1.0.1-r1.ebuild b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild index f1b3bbd7379..6b13cc9333d 100644 --- a/dev-python/rootpy/rootpy-1.0.1-r1.ebuild +++ b/dev-python/rootpy/rootpy-1.0.1-r1.ebuild @@ -46,7 +46,6 @@ python_test() { python_install_all() { distutils-r1_python_install_all if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples + dodoc -r examples fi }
[gentoo-commits] repo/gentoo:master commit in: net-im/gajim/
commit: ea52473d750e7a96c1c02b57a28e45cea50c712c Author: Michał Górny gentoo org> AuthorDate: Sun Feb 9 19:31:45 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 19:40:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea52473d net-im/gajim: Fix missing pygobject slot Signed-off-by: Michał Górny gentoo.org> net-im/gajim/gajim-1.0.3-r2.ebuild | 2 +- net-im/gajim/gajim-1.0.3-r3.ebuild | 2 +- net-im/gajim/gajim-1.1.3-r1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-im/gajim/gajim-1.0.3-r2.ebuild b/net-im/gajim/gajim-1.0.3-r2.ebuild index ecd507a5add..5fc452242c2 100644 --- a/net-im/gajim/gajim-1.0.3-r2.ebuild +++ b/net-im/gajim/gajim-1.0.3-r2.ebuild @@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND} dev-python/pyasn1[${PYTHON_MULTI_USEDEP}] dev-python/pycairo[${PYTHON_MULTI_USEDEP}] dev-python/pycurl[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject[cairo,${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] >=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}] >=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}] x11-libs/libXScrnSaver diff --git a/net-im/gajim/gajim-1.0.3-r3.ebuild b/net-im/gajim/gajim-1.0.3-r3.ebuild index 6bda29b9abd..619619a8087 100644 --- a/net-im/gajim/gajim-1.0.3-r3.ebuild +++ b/net-im/gajim/gajim-1.0.3-r3.ebuild @@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND} dev-python/pyasn1[${PYTHON_MULTI_USEDEP}] dev-python/pycairo[${PYTHON_MULTI_USEDEP}] dev-python/pycurl[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject[cairo,${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] >=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}] >=dev-python/python-nbxmpp-0.6.6[${PYTHON_MULTI_USEDEP}] x11-libs/libXScrnSaver diff --git a/net-im/gajim/gajim-1.1.3-r1.ebuild b/net-im/gajim/gajim-1.1.3-r1.ebuild index cfa793c7bc5..60aa6556145 100644 --- a/net-im/gajim/gajim-1.1.3-r1.ebuild +++ b/net-im/gajim/gajim-1.1.3-r1.ebuild @@ -35,7 +35,7 @@ RDEPEND="${COMMON_DEPEND} dev-python/pyasn1[${PYTHON_MULTI_USEDEP}] dev-python/pycairo[${PYTHON_MULTI_USEDEP}] dev-python/pycurl[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject[cairo,${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] >=dev-python/pyopenssl-0.14[${PYTHON_MULTI_USEDEP}] >=dev-python/python-nbxmpp-0.6.9[${PYTHON_MULTI_USEDEP}] x11-libs/libXScrnSaver
[gentoo-commits] repo/gentoo:master commit in: media-tv/plex-media-server/
commit: 7d970e5a74e0e593f459fe81f10a828af6b2bb5e Author: Michał Górny gentoo org> AuthorDate: Sun Feb 9 19:30:18 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 19:40:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d970e5a media-tv/plex-media-server: Remove redundant dodir Signed-off-by: Michał Górny gentoo.org> media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild | 1 - media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild | 1 - 2 files changed, 2 deletions(-) diff --git a/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild index 2c14112897b..3633cd824ba 100644 --- a/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild +++ b/media-tv/plex-media-server/plex-media-server-1.13.2-r2.ebuild @@ -61,7 +61,6 @@ src_install() { # Move the config to the correct place local CONFIG_VANILLA="/etc/default/plexmediaserver" local CONFIG_PATH="/etc/${_SHORTNAME}" - dodir "${CONFIG_PATH}" insinto "${CONFIG_PATH}" doins "${CONFIG_VANILLA#/}" sed -e "s#${CONFIG_VANILLA}#${CONFIG_PATH}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die diff --git a/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild index 18b00f34a9b..ff7382861de 100644 --- a/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild +++ b/media-tv/plex-media-server/plex-media-server-1.18.4-r1.ebuild @@ -66,7 +66,6 @@ src_install() { # Move the config to the correct place local config_vanilla="/etc/default/plexmediaserver" local config_path="/etc/${_SHORTNAME}" - dodir "${config_path}" insinto "${config_path}" doins "${config_vanilla#/}" sed -e "s#${config_vanilla}#${config_path}/${_APPNAME}#g" -i "${S}"/usr/sbin/start_pms || die
[gentoo-commits] repo/gentoo:master commit in: dev-util/wxglade/
commit: a0ab15db9e2cdff2865b7decb8efc0bfe13eb436 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 9 19:26:57 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 19:40:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ab15db dev-util/wxglade: Fix AbsoluteSymlink Signed-off-by: Michał Górny gentoo.org> dev-util/wxglade/wxglade-0.8.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild index 60ff7e014f0..98f28398bcb 100644 --- a/dev-util/wxglade/wxglade-0.8.2-r1.ebuild +++ b/dev-util/wxglade/wxglade-0.8.2-r1.ebuild @@ -47,7 +47,7 @@ src_install() { python_moduleinto /usr/lib/wxglade python_domodule . - dosym /usr/share/doc/${PF}/docs /usr/lib/wxglade/docs + dosym ../../share/doc/${PF}/docs /usr/lib/wxglade/docs fperms 775 /usr/lib/wxglade/wxglade.py dosym ../lib/wxglade/wxglade.py /usr/bin/wxglade
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/hgsvn/
commit: 5e85fc16f81d1d1c25c2d6321fcb6469bfff350b Author: Michał Górny gentoo org> AuthorDate: Sun Feb 9 19:27:37 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Feb 9 19:40:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e85fc16 dev-vcs/hgsvn: Add missing unzip dep Signed-off-by: Michał Górny gentoo.org> dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild b/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild index 0bb9f97c487..91a1d656c06 100644 --- a/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild +++ b/dev-vcs/hgsvn/hgsvn-0.2.3-r2.ebuild @@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~x86-macos" IUSE="" DEPEND=" + app-arch/unzip dev-vcs/mercurial " RDEPEND="${DEPEND}
[gentoo-commits] proj/kde:master commit in: Documentation/package.accept_keywords/, ...
commit: 034473f8756342d633b4d204395ab383df04ed6e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 19:37:18 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:37:18 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=034473f8 Documentation: Drop KDE Frameworks 5.66 Signed-off-by: Andreas Sturmlechner gentoo.org> Documentation/maintainers/regenerate-files | 2 +- .../.kde-frameworks-5.66/_HEADER_ | 2 - .../.kde-frameworks-5.66/kde-frameworks-5.66 | 1 - .../.kde-frameworks-5.66/more-deps | 1 - .../kde-frameworks-5.66.keywords | 87 -- Documentation/package.mask/kde-frameworks-5.66 | 86 - .../package.unmask/.kde-frameworks-5.66/_HEADER_ | 2 - .../.kde-frameworks-5.66/kde-frameworks-5.66 | 1 - Documentation/package.unmask/kde-frameworks-5.66 | 86 - 9 files changed, 1 insertion(+), 267 deletions(-) diff --git a/Documentation/maintainers/regenerate-files b/Documentation/maintainers/regenerate-files index 239955fcf7..7e15b284e0 100755 --- a/Documentation/maintainers/regenerate-files +++ b/Documentation/maintainers/regenerate-files @@ -9,7 +9,7 @@ cd "$(dirname $0)" SCRIPT=$(basename $0) HEADER="# Autogenerated by ${SCRIPT}, DO NOT EDIT." -KF_RELEASES="5.64 5.66 5.67" +KF_RELEASES="5.64 5.67" KF_RELEASE=${KF_RELEASE:-5.64} PLASMA_RELEASES="5.17 5.18" diff --git a/Documentation/package.accept_keywords/.kde-frameworks-5.66/_HEADER_ b/Documentation/package.accept_keywords/.kde-frameworks-5.66/_HEADER_ deleted file mode 100644 index d3831a0ca0..00 --- a/Documentation/package.accept_keywords/.kde-frameworks-5.66/_HEADER_ +++ /dev/null @@ -1,2 +0,0 @@ -# You can use this file to keyword/unkeyword the KDE Frameworks 5.66 release. -# Edit Documentation/package.accept_keywords/.kde-frameworks-5.66/ files instead. diff --git a/Documentation/package.accept_keywords/.kde-frameworks-5.66/kde-frameworks-5.66 b/Documentation/package.accept_keywords/.kde-frameworks-5.66/kde-frameworks-5.66 deleted file mode 12 index 1814f92335..00 --- a/Documentation/package.accept_keywords/.kde-frameworks-5.66/kde-frameworks-5.66 +++ /dev/null @@ -1 +0,0 @@ -../../../sets/kde-frameworks-5.66 \ No newline at end of file diff --git a/Documentation/package.accept_keywords/.kde-frameworks-5.66/more-deps b/Documentation/package.accept_keywords/.kde-frameworks-5.66/more-deps deleted file mode 100644 index 5b184b594b..00 --- a/Documentation/package.accept_keywords/.kde-frameworks-5.66/more-deps +++ /dev/null @@ -1 +0,0 @@ -~net-libs/accounts-qml-0.7 diff --git a/Documentation/package.accept_keywords/kde-frameworks-5.66.keywords b/Documentation/package.accept_keywords/kde-frameworks-5.66.keywords deleted file mode 100644 index 887715b9d5..00 --- a/Documentation/package.accept_keywords/kde-frameworks-5.66.keywords +++ /dev/null @@ -1,87 +0,0 @@ -# Autogenerated by regenerate-files, DO NOT EDIT. -# You can use this file to keyword/unkeyword the KDE Frameworks 5.66 release. -# Edit Documentation/package.accept_keywords/.kde-frameworks-5.66/ files instead. -
[gentoo-commits] proj/kde:master commit in: sets/
commit: fc4ded088fd989c655bd206c0b8452d9653682de Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 19:36:20 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:36:20 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fc4ded08 sets: Drop kde-frameworks-5.66 Signed-off-by: Andreas Sturmlechner gentoo.org> sets/kde-frameworks-5.66 | 83 1 file changed, 83 deletions(-) diff --git a/sets/kde-frameworks-5.66 b/sets/kde-frameworks-5.66 deleted file mode 100644 index 50f25e10dc..00 --- a/sets/kde-frameworks-5.66 +++ /dev/null @@ -1,83 +0,0 @@ -
[gentoo-commits] repo/gentoo:master commit in: media-libs/oyranos/
commit: 17c22822b76d61e4958bc379722fd0f29ddd8575 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 19:35:35 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:35:35 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c22822 media-libs/oyranos: Drop USE qt5, broken by Qt 5.14 Closes: https://bugs.gentoo.org/703528 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/oyranos/oyranos-0.9.6-r1.ebuild | 16 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild index 4eee55d10f7..26ac4c25916 100644 --- a/media-libs/oyranos/oyranos-0.9.6-r1.ebuild +++ b/media-libs/oyranos/oyranos-0.9.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,9 +19,9 @@ HOMEPAGE="https://www.oyranos.org/"; LICENSE="BSD" SLOT="0" -IUSE="cairo cups doc examples exif fltk jpeg qt5 raw scanner static-libs test tiff X" +IUSE="cairo cups doc examples exif fltk jpeg raw scanner static-libs test tiff X" -REQUIRED_USE="qt5? ( X ) test? ( static-libs )" +REQUIRED_USE="test? ( static-libs )" COMMON_DEPEND=" app-admin/elektra @@ -36,14 +36,6 @@ COMMON_DEPEND=" exif? ( media-gfx/exiv2:= ) fltk? ( x11-libs/fltk:1 ) jpeg? ( virtual/jpeg:0 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - ) raw? ( media-libs/libraw ) scanner? ( media-gfx/sane-backends ) tiff? ( media-libs/tiff:0 ) @@ -96,7 +88,7 @@ src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex !exif) -DCMAKE_DISABLE_FIND_PACKAGE_FLTK=$(usex !fltk) -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(usex !qt5) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex !raw) -DCMAKE_DISABLE_FIND_PACKAGE_Sane=$(usex !scanner) -DENABLE_STATIC_LIBS=$(usex static-libs)
[gentoo-commits] proj/qt:master commit in: dev-qt/qtcore/files/, dev-qt/qtcore/
commit: 91b38cc3ab9bb6c70c9e40ba6a5fbbe41b2da753 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 10:59:22 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:22:20 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=91b38cc3 dev-qt/qtcore: Fix cmake macro compat. for upgrade from https://bugs.gentoo.org/703306 Closes: https://bugs.gentoo.org/705198 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit fe1eb44a73d1a8e99aae1eeb2b7504b326df2cd1) ...qtcore-5.14.1-cmake-macro-backward-compat.patch | 50 ++ dev-qt/qtcore/qtcore-5.14..ebuild | 4 +- dev-qt/qtcore/qtcore-5.15..ebuild | 4 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch new file mode 100644 index ..30b5abc3 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch @@ -0,0 +1,50 @@ +From: Andreas Sturmlechner +Date: Sun, 9 Feb 2020 11:45:00 +0100 +Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 + +_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument +IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for +QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. +During upgrade from =Qt-5.14, as a consequence of slot upgrade rebuilds, some +reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their +cmake files regenerated, leading to cmake errors like: + +https://bugs.gentoo.org/703306 +https://bugs.gentoo.org/705198 + +From mkspecs/features/create_cmake.prf: + +# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties +# functions whether a Configuration specific generator expression needs to be added to the values +# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need +# configuration specific values. For singular builds (only release or only debug), we want the +# values to be applied regardless of the configuration. +# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to +# build a Debug configuration of an application, even if Qt was built in a Release configuration. + +qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease +optional and default to FALSE. + +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.0 +0100 b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 +@@ -538,8 +538,14 @@ + + file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") + +-macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION +- IsDebugAndRelease) ++macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) ++set(IsDebugAndRelease FALSE) ++set (list_var ${ARGN}) ++list(LENGTH list_var num_extra_arg) ++if (${num_extra_arg} GREATER 0) ++list(GET list_var 0 IsDebugAndRelease) ++endif() ++ + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtcore/qtcore-5.14..ebuild b/dev-qt/qtcore/qtcore-5.14..ebuild index e6a7a124..9b476abf 100644 --- a/dev-qt/qtcore/qtcore-5.14..ebuild +++ b/dev-qt/qtcore/qtcore-5.14..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( !:xml ) +PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306 + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die diff --git a/dev-qt/qtcore/qtcore-5.15..ebuild b/dev-qt/qtcore/qtcore-5.15..ebuild index e6a7a124..9b476abf 100644 --- a/dev-qt/qtcore/qtcore-5.15..ebuild +++ b/dev-qt/qtcore/qtcore-5.15..ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -42,6 +42,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( !:xml ) +PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306 + src_prepare() { # don't add -O3 to CXXFLAGS, bu
[gentoo-commits] proj/qt:master commit in: dev-qt/qtgui/files/, dev-qt/qtgui/
commit: bb3e4735560877bc5e06bb6f5cc36ce3869c7249 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 9 16:23:29 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 9 19:22:20 2020 + URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=bb3e4735 dev-qt/qtgui: Fix cmake macro compat. for upgrade from https://bugs.gentoo.org/703306 Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit 9f10d5690b0a924021f54c7b09b4ce152fd37e0b) .../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 ++ dev-qt/qtgui/qtgui-5.14..ebuild| 5 ++- dev-qt/qtgui/qtgui-5.15..ebuild| 5 ++- 3 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch new file mode 100644 index ..30b5abc3 --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch @@ -0,0 +1,50 @@ +From: Andreas Sturmlechner +Date: Sun, 9 Feb 2020 11:45:00 +0100 +Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 + +_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument +IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for +QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. +During upgrade from =Qt-5.14, as a consequence of slot upgrade rebuilds, some +reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their +cmake files regenerated, leading to cmake errors like: + +https://bugs.gentoo.org/703306 +https://bugs.gentoo.org/705198 + +From mkspecs/features/create_cmake.prf: + +# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties +# functions whether a Configuration specific generator expression needs to be added to the values +# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need +# configuration specific values. For singular builds (only release or only debug), we want the +# values to be applied regardless of the configuration. +# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to +# build a Debug configuration of an application, even if Qt was built in a Release configuration. + +qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease +optional and default to FALSE. + +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.0 +0100 b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 +@@ -538,8 +538,14 @@ + + file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") + +-macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION +- IsDebugAndRelease) ++macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) ++set(IsDebugAndRelease FALSE) ++set (list_var ${ARGN}) ++list(LENGTH list_var num_extra_arg) ++if (${num_extra_arg} GREATER 0) ++list(GET list_var 0 IsDebugAndRelease) ++endif() ++ + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtgui/qtgui-5.14..ebuild b/dev-qt/qtgui/qtgui-5.14..ebuild index f613f170..e077dd59 100644 --- a/dev-qt/qtgui/qtgui-5.14..ebuild +++ b/dev-qt/qtgui/qtgui-5.14..ebuild @@ -133,7 +133,10 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) -PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 +PATCHES=( + "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 + "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 +) src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 diff --git a/dev-qt/qtgui/qtgui-5.15..ebuild b/dev-qt/qtgui/qtgui-5.15..ebuild index 169389df..e1bbc622 100644 --- a/dev-qt/qtgui/qtgui-5.15..ebuild +++ b/dev-qt/qtgui/qtgui-5.15..ebuild @@ -133,7 +133,10 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) -PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 +PATCHES=( + "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 + "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 +) src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140