mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
Merge updates from master
This commit is contained in:
@@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
JAVA_PKG_IUSE="doc source test"
|
||||
|
||||
inherit java-pkg-2 java-ant-2 verify-sig
|
||||
|
||||
DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
|
||||
HOMEPAGE="https://lucene.apache.org"
|
||||
SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
|
||||
verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="2.4"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
|
||||
|
||||
# Restricting to jdk:1.8 since it fails to build with openjdk-17
|
||||
# BUILD FAILED
|
||||
# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \
|
||||
# rmic does not exist under Java 15 and higher,
|
||||
# use rmic of an older JDK and explicitly set the executable attribute
|
||||
DEPEND="
|
||||
dev-java/javacc:0
|
||||
virtual/jdk:1.8
|
||||
test? (
|
||||
>=dev-java/ant-1.10.14-r3:0[junit]
|
||||
dev-java/junit:0
|
||||
)"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.8:*"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/lucene-2.4.1-skipFailingTest.patch"
|
||||
"${FILESDIR}/lucene-2.4.1-javacc.home.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default #780585
|
||||
java-pkg-2_src_prepare
|
||||
java-pkg_clean
|
||||
|
||||
cat > build.properties <<-EOF || die
|
||||
junit-location.jar=$(java-pkg_getjars --build-only junit)
|
||||
javacc.home=${EPREFIX}/usr/share/javacc/lib/
|
||||
EOF
|
||||
# stop scrambling the build.xml
|
||||
touch "${T}/java-ant-2_src_configure-run"
|
||||
|
||||
rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length
|
||||
rm docs/images/instruction_arrow.png || die #: broken IDAT window length
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant javacc
|
||||
|
||||
eant \
|
||||
-Dversion=${PV} \
|
||||
jar-core \
|
||||
jar-demo \
|
||||
$(use_doc javadocs-core javadocs-demo)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
eant test-core
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einstalldocs
|
||||
java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar"
|
||||
java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar"
|
||||
|
||||
if use doc; then
|
||||
dodoc -r docs
|
||||
java-pkg_dohtml -r build/docs/api
|
||||
fi
|
||||
use source && java-pkg_dosrc src/java/org
|
||||
}
|
||||
@@ -65,6 +65,8 @@ src_compile() {
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# we found that running tests with eant creates completely different output than
|
||||
# runnning with ant. no idea what exactly is causing that difference,
|
||||
ant test-core
|
||||
}
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
DIST bcc-0.28.0.tar.gz 6148954 BLAKE2B cfd3c8d63128e050512462449ff7d467f8f809c239ac01ae8e75365e89116ec351641a68682d23472aa3b4e265547bb20ca5572084c532a40ccd3131edf255a2 SHA512 792ce93dba64b1f87390b2602dcaeba04ac8b2863652b06eb9a907b93bc6137a944b856cc6fa9c7a38671c89814740967561ca4f3b29c267babca7dc5e78aa02
|
||||
DIST bcc-0.29.1.tar.gz 6778304 BLAKE2B 23df483df59ef7d66117b15628299a32155136aa5254edbf76f7507a972f3ebcba1d4b2aa83c41e8f061eeeb96812f522c34fed27e9a37e5f4ad3478c7cde88f SHA512 9e60130ea602e19e6c6f88a8c17023cea5daf4c5bcc7af8816e9f5c662341136eb449a3fdf870ffad215495ac3bf895115c0d968d92ce79ebe2899b3e2464d24
|
||||
DIST bcc-0.30.0.tar.gz 6797246 BLAKE2B 517f4fcce8bcaf4c8c17075f9a906b452ee14a0c46fa500c301521fe46d854fcf4f632e741b34168dfeb819d9b0d64b967e716fa6222ba7dcaeddb03570985e6 SHA512 70478ca8c18e7f106c462513ca9af46f49b4ebcca6380a9393208fca88f83895a7396f918bf5d01dce1bc4a876bccb9b95aa56d426e55d384cf11c9baaa6a89b
|
||||
DIST bcc-0.31.0.tar.gz 6807504 BLAKE2B 75739914a18a7952bbefbed6f55b88d3be4f0483d2fd74bf7d6f7a6491d659ab893e7bd6b5e74c7b2239d6a2a9db04522487e3b36e7ddf65b1cc2d8712f786a8 SHA512 a1fe855c316d0508814dc02382b13897ff565bee52de0fc9d7521eabd304227e41bf7d322b10ab29fd5b13aeac85cc75ee76ac348cf1f4bb6499b8853bac10ab
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
LUA_COMPAT=( luajit )
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
LLVM_MAX_SLOT=17
|
||||
DISTUTILS_OPTIONAL=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{10..13} )
|
||||
LLVM_COMPAT=( {15..18} )
|
||||
|
||||
inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs
|
||||
inherit cmake linux-info llvm-r1 lua-single distutils-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
|
||||
HOMEPAGE="https://iovisor.github.io/bcc/"
|
||||
@@ -16,11 +18,11 @@ SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
|
||||
IUSE="+lua test"
|
||||
IUSE="+lua +python static-libs test"
|
||||
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
lua? ( ${LUA_REQUIRED_USE} )
|
||||
lua? ( python ${LUA_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
# tests need root access
|
||||
@@ -28,11 +30,13 @@ RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/elfutils-0.166:=
|
||||
>=dev-libs/libbpf-1.2.0:=[static-libs(-)]
|
||||
>=dev-libs/libbpf-1.2.0:=
|
||||
sys-kernel/linux-headers
|
||||
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
|
||||
<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
|
||||
${PYTHON_DEPS}
|
||||
$(llvm_gen_dep '
|
||||
sys-devel/clang:${LLVM_SLOT}=
|
||||
sys-devel/llvm:${LLVM_SLOT}=
|
||||
')
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
lua? ( ${LUA_DEPS} )
|
||||
"
|
||||
DEPEND="
|
||||
@@ -49,6 +53,7 @@ DEPEND="
|
||||
BDEPEND="
|
||||
app-arch/zip
|
||||
virtual/pkgconfig
|
||||
python? ( ${DISTUTILS_DEPS} )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
@@ -66,8 +71,22 @@ pkg_pretend() {
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
llvm_pkg_setup
|
||||
python_setup
|
||||
llvm-r1_pkg_setup
|
||||
use python && python_setup
|
||||
}
|
||||
|
||||
bcc_distutils_phase() {
|
||||
if use python; then
|
||||
local python_phase_func="distutils-r1_${EBUILD_PHASE_FUNC}"
|
||||
|
||||
if declare -f "${python_phase_func}" > /dev/null; then
|
||||
pushd "${S}/src/python" > /dev/null || die
|
||||
MY_S="${S}" S="${S}/src/python" "${python_phase_func}"
|
||||
popd > /dev/null || die
|
||||
else
|
||||
die "Called ${FUNCNAME[0]} called in ${EBUILD_PHASE_FUNC}, but ${python_phase_func} doesn't exist"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
@@ -80,28 +99,32 @@ src_prepare() {
|
||||
# bug 811288
|
||||
local script scriptname
|
||||
for script in $(find tools/old -type f -name "*.py" || die); do
|
||||
scriptname=$(basename ${script} || die)
|
||||
mv ${script} tools/old/old-${scriptname} || die
|
||||
mv "${script}" "tools/old/old-${script##*/}" || die
|
||||
done
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
use static-libs || PATCHES+=( "${FILESDIR}/bcc-0.31.0-dont-install-static-libs.patch" )
|
||||
|
||||
python_add_impl() {
|
||||
bcc_python_impls+="${EPYTHON};"
|
||||
# use distutils-r1 eclass funcs rather than letting upstream handle python
|
||||
printf '\n' > src/python/CMakeLists.txt || die
|
||||
|
||||
if use python; then
|
||||
for python_file in $(find "${S}/src/python" -name '*.py.in' || die); do
|
||||
sed "s:@REVISION@:${PV%%_*}:" "${python_file}" > "${python_file%.in}" || die
|
||||
done
|
||||
fi
|
||||
|
||||
cmake_src_prepare
|
||||
bcc_distutils_phase
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local bcc_python_impls
|
||||
python_foreach_impl python_add_impl
|
||||
|
||||
local mycmakeargs=(
|
||||
-DREVISION=${PV%%_*}
|
||||
-DENABLE_LLVM_SHARED=ON
|
||||
-DENABLE_NO_PIE=OFF
|
||||
-DCMAKE_USE_LIBBPF_PACKAGE=ON
|
||||
-DLIBBPF_INCLUDE_DIRS="$($(tc-getPKG_CONFIG) --cflags-only-I libbpf | sed 's:-I::g')"
|
||||
-DKERNEL_INCLUDE_DIRS="${KERNEL_DIR}"
|
||||
-DPYTHON_CMD="${bcc_python_impls%;}"
|
||||
-Wno-dev
|
||||
)
|
||||
if use lua && use lua_single_target_luajit; then
|
||||
@@ -109,13 +132,27 @@ src_configure() {
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
bcc_distutils_phase
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
bcc_distutils_phase
|
||||
}
|
||||
|
||||
python_install() {
|
||||
distutils-r1_python_install
|
||||
|
||||
local tool
|
||||
for tool in $(grep -Elr '#!/usr/bin/(env |)python' "${MY_S}/tools"); do
|
||||
local tool_name="${tool##*/}"
|
||||
python_newscript "${tool}" "${tool_name%.py}"
|
||||
done
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
python_replicate_script $(grep -Flr '#!/usr/bin/python' "${ED}/usr/share/bcc/tools")
|
||||
python_foreach_impl python_optimize
|
||||
bcc_distutils_phase
|
||||
|
||||
newenvd "${FILESDIR}"/60bcc.env 60bcc.env
|
||||
local -A rename_tools=(
|
||||
13
dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch
Normal file
13
dev-util/bcc/files/bcc-0.31.0-dont-install-static-libs.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
|
||||
index 104eff0e..e34b911a 100644
|
||||
--- a/src/cc/CMakeLists.txt
|
||||
+++ b/src/cc/CMakeLists.txt
|
||||
@@ -179,7 +179,7 @@ target_link_libraries(bcc-shared ${bcc_common_libs_for_s})
|
||||
target_link_libraries(bcc-static ${bcc_common_libs_for_a} bcc-loader-static)
|
||||
set(bcc-lua-static ${bcc-lua-static} ${bcc_common_libs_for_lua})
|
||||
|
||||
-install(TARGETS bcc-shared bcc-static bcc-loader-static bpf-static LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
+install(TARGETS bcc-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||
install(FILES ${bcc_table_headers} DESTINATION include/bcc)
|
||||
install(FILES ${bcc_api_headers} DESTINATION include/bcc)
|
||||
install(DIRECTORY ${libbpf_uapi} DESTINATION include/bcc/compat/linux FILES_MATCHING PATTERN "*.h")
|
||||
@@ -2254,30 +2254,6 @@ java-pkg_force-compiler() {
|
||||
JAVA_PKG_FORCE_COMPILER="$@"
|
||||
}
|
||||
|
||||
# @FUNCTION: use_doc
|
||||
# @DEPRECATED: none
|
||||
# @DESCRIPTION:
|
||||
#
|
||||
# Helper function for getting ant to build javadocs. If the user has USE=doc,
|
||||
# then 'javadoc' or the argument are returned. Otherwise, there is no return.
|
||||
#
|
||||
# The output of this should be passed to ant.
|
||||
# @CODE
|
||||
# Parameters:
|
||||
# $@ - Option value to return. Defaults to 'javadoc'
|
||||
#
|
||||
# Examples:
|
||||
# build javadocs by calling 'javadoc' target
|
||||
# eant $(use_doc)
|
||||
#
|
||||
# build javadocs by calling 'apidoc' target
|
||||
# eant $(use_doc apidoc)
|
||||
# @CODE
|
||||
# @RETURN string - Name of the target to create javadocs
|
||||
use_doc() {
|
||||
use doc && echo ${@:-javadoc}
|
||||
}
|
||||
|
||||
|
||||
# @FUNCTION: java-pkg_init
|
||||
# @INTERNAL
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
From 31e125cc80497b0dc9f16abc808859ce97fd5fd1 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Sun, 26 Mar 2023 19:25:40 +0200
|
||||
Subject: [PATCH] Add CMake option to build WITHOUT_X11
|
||||
|
||||
We want to be able to build without X11 support even if some of the used
|
||||
libraries may not work w/o X11 themselves yet or need to be built with X11
|
||||
support for other reverse dependencies.
|
||||
|
||||
X11_FOUND is set automagically so far, and using
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
|
||||
as required in their cmake config.
|
||||
|
||||
Introducing this option means there is no behavior change by default,
|
||||
cmake will just skip finding X11 if the option is enabled.
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 18 +++++++++++-------
|
||||
1 file changed, 11 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 9c08b03..d491926 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -47,13 +47,17 @@ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPON
|
||||
Widgets
|
||||
)
|
||||
|
||||
-find_package(X11)
|
||||
-set_package_properties(X11 PROPERTIES
|
||||
- TYPE OPTIONAL
|
||||
- PURPOSE "For colord integration on X11"
|
||||
-)
|
||||
+option(WITHOUT_X11 "Build without colord-kded for X11 integration (skips finding X11)" OFF)
|
||||
+if(NOT WITHOUT_X11)
|
||||
+ find_package(X11)
|
||||
+ set_package_properties(X11 PROPERTIES
|
||||
+ TYPE OPTIONAL
|
||||
+ PURPOSE "For colord integration on X11"
|
||||
+ )
|
||||
+ set(HAVE_X11 ${X11_FOUND})
|
||||
+endif()
|
||||
|
||||
-if (X11_FOUND)
|
||||
+if (HAVE_X11)
|
||||
find_package(XCB REQUIRED COMPONENTS XCB RANDR)
|
||||
if (QT_MAJOR_VERSION STREQUAL "5")
|
||||
find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
|
||||
@@ -80,7 +84,7 @@ ecm_set_disabled_deprecation_versions(
|
||||
KF 5.100.0)
|
||||
|
||||
|
||||
-if (X11_FOUND)
|
||||
+if (HAVE_X11)
|
||||
add_subdirectory(colord-kded)
|
||||
endif()
|
||||
add_subdirectory(colord-kcm)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
From eab3dd5f39b7633a3bc074713da69c53f123345d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Fri, 16 Jul 2021 23:15:26 +0200
|
||||
Subject: [PATCH] Revert "Disable kpeople qml module finding"
|
||||
|
||||
This reverts commit 89f52af4389e9e98f7428db670355d144b6045a2.
|
||||
|
||||
We don't have to do that, because we already apply downstream magic
|
||||
and set -DECM_DISABLE_QMLPLUGINDUMP=ON globally.
|
||||
|
||||
See also: https://phabricator.kde.org/D25812
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 44af637f..b2027e92 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -84,7 +84,7 @@ else()
|
||||
|
||||
add_definitions(-DHAVE_KIO)
|
||||
|
||||
- #ecm_find_qmlmodule(org.kde.people 1.0) FIXME This results in KPeople code being called which triggers DBus calls which breaks the Windows CI
|
||||
+ ecm_find_qmlmodule(org.kde.people 1.0)
|
||||
ecm_find_qmlmodule(QtQuick.Particles 2.0)
|
||||
|
||||
endif()
|
||||
--
|
||||
2.32.0
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
DIST libproxy-0.5.3.tar.gz 60069 BLAKE2B adfa982344470251667b113f12f77722f6793ceeec902ccf82e32e80e15836384fbe1ccbec8865fc877fa04b25e6985847eef75b4ce437dbf0410d16e2bd5f36 SHA512 0fa4c677372afa76a9f143abb1472af1df85e1190425ec4168b98e575a9b9c9fe3dcc56062609da8ef266d56dfb153e7f7a1c15aed2d385003d9f3f421d08590
|
||||
DIST libproxy-0.5.4.tar.gz 60605 BLAKE2B b603781d454ae9d177522d85027f763275e6f243579e8dd808fc5f740438105ac9f782bd35c39cb0007f42279d8d4f724a81dd06fc79709af227064a477cd70e SHA512 4372570322682369f65317cbeb4e9b9dbcff3d8e5089a3bb3b8efa6cd461468a313793435fd5815fe18360984c44e6895c3c2a62e5e0b07eb0c3bf3532dbb1b2
|
||||
DIST libproxy-0.5.5.tar.gz 60880 BLAKE2B fedf06db2e39ca1cacf489542597ab002a8c943234fda2f9e5482d43d3b3b0a5af2c4d270eb678e24bb3c4c9ac8e37e65d609af84d02be9541555e953be6a0f5 SHA512 101139fe6972c9b8b46a8bc5f5cea807649ad21e201a9cd7d532d2145c34eadc861d8039fc8a2bf129f364ddc99ffb1324ab8f19bb0b4b9e52eb0f6bd703c8a8
|
||||
|
||||
@@ -1,71 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson-multilib vala
|
||||
|
||||
DESCRIPTION="Library for automatic proxy configuration management"
|
||||
HOMEPAGE="https://github.com/libproxy/libproxy"
|
||||
SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="duktape gnome gtk-doc +introspection kde test vala"
|
||||
REQUIRED_USE="
|
||||
gtk-doc? ( introspection )
|
||||
vala? ( introspection )
|
||||
"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
|
||||
gnome? ( gnome-base/gsettings-desktop-schemas )
|
||||
duktape? (
|
||||
dev-lang/duktape:=
|
||||
net-misc/curl
|
||||
)
|
||||
introspection? ( dev-libs/gobject-introspection )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
kde? ( kde-frameworks/kconfig:5 )
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
gtk-doc? ( dev-util/gi-docgen )
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
use vala && vala_setup
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
$(meson_native_use_bool gtk-doc docs)
|
||||
$(meson_use test tests)
|
||||
-Dconfig-env=true
|
||||
$(meson_use gnome config-gnome)
|
||||
-Dconfig-windows=false
|
||||
-Dconfig-sysconfig=true
|
||||
-Dconfig-osx=false
|
||||
$(meson_use kde config-kde)
|
||||
$(meson_native_use_bool duktape pacrunner-duktape)
|
||||
$(meson_native_use_bool vala vapi)
|
||||
$(meson_use duktape curl)
|
||||
$(meson_native_use_bool introspection)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if use gtk-doc; then
|
||||
mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
|
||||
mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
|
||||
fi
|
||||
}
|
||||
@@ -1,68 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson-multilib vala
|
||||
|
||||
DESCRIPTION="Library for automatic proxy configuration management"
|
||||
HOMEPAGE="https://github.com/libproxy/libproxy"
|
||||
SRC_URI="https://github.com/libproxy/libproxy/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="duktape gnome gtk-doc +introspection test vala"
|
||||
REQUIRED_USE="
|
||||
gtk-doc? ( introspection )
|
||||
vala? ( introspection )
|
||||
"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="
|
||||
>=dev-libs/glib-2.71.3:2[${MULTILIB_USEDEP}]
|
||||
gnome? ( gnome-base/gsettings-desktop-schemas )
|
||||
duktape? (
|
||||
dev-lang/duktape:=
|
||||
net-misc/curl
|
||||
)
|
||||
introspection? ( dev-libs/gobject-introspection )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
gtk-doc? ( dev-util/gi-docgen )
|
||||
vala? ( $(vala_depend) )
|
||||
"
|
||||
|
||||
src_prepare() {
|
||||
use vala && vala_setup
|
||||
default
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local emesonargs=(
|
||||
$(meson_native_use_bool gtk-doc docs)
|
||||
$(meson_use test tests)
|
||||
-Dconfig-env=true
|
||||
$(meson_use gnome config-gnome)
|
||||
-Dconfig-windows=false
|
||||
-Dconfig-sysconfig=true
|
||||
-Dconfig-osx=false
|
||||
-Dconfig-kde=true
|
||||
$(meson_native_use_bool duktape pacrunner-duktape)
|
||||
$(meson_native_use_bool vala vapi)
|
||||
$(meson_use duktape curl)
|
||||
$(meson_native_use_bool introspection)
|
||||
)
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
einstalldocs
|
||||
|
||||
if use gtk-doc; then
|
||||
mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
|
||||
mv "${ED}"/usr/share/doc/${PN}-1.0 "${ED}"/usr/share/gtk-doc/html/ || die
|
||||
fi
|
||||
}
|
||||
@@ -7,7 +7,6 @@
|
||||
<use>
|
||||
<flag name="duktape">Use <pkg>dev-lang/duktape</pkg> for PAC parsing</flag>
|
||||
<flag name="gnome">Enable support for reading proxy settings from GNOME</flag>
|
||||
<flag name="kde">Enable support for reading proxy settings from KDE</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">libproxy/libproxy</remote-id>
|
||||
|
||||
@@ -101,7 +101,6 @@ sci-mathematics/z3 java
|
||||
# Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
|
||||
# Needs kde-frameworks/{kwallet,ki18n,kconfig} stable
|
||||
dev-vcs/subversion kwallet
|
||||
net-libs/libproxy kde
|
||||
|
||||
# Andreas Sturmlechner <asturm@gentoo.org> (2019-02-10)
|
||||
# Needs kde-plasma/{polkit-kde-agent,plasma-workspace} stable
|
||||
|
||||
@@ -295,7 +295,6 @@ dev-db/percona-server -numa
|
||||
# Requires unkeyworded dependencies
|
||||
dev-vcs/subversion kwallet
|
||||
net-irc/quassel kde
|
||||
net-libs/libproxy kde
|
||||
sys-auth/polkit kde
|
||||
sys-block/gparted kde
|
||||
virtual/notification-daemon kde
|
||||
|
||||
@@ -4,3 +4,4 @@ move dev-qt/kdsingleapplication dev-libs/kdsingleapplication
|
||||
slotmove dev-util/kdevelop-pg-qt 5 0
|
||||
move dev-python/parse_type dev-python/parse-type
|
||||
slotmove app-admin/calamares 5 0
|
||||
slotmove x11-misc/kronometer 5 0
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
DIST kronometer-2.3.0.tar.xz 136140 BLAKE2B b5ae57711b06ff53d3d096b6ce004620951132f4ab451aeaf67ac679e5154a4942d3cb910ed1d64ac32473b7fde59da0fd3b143171bb6f81ff29b81b29eceb2d SHA512 23321db24a0850be744765dc5eb17b3848d82b20e0bcc0520b5ee9bce6537650405aafeb435248459fd924fcfcd8acc113d8ca440edadd1d7c8f86dc282dd2e2
|
||||
DIST kronometer-2.3.70_pre20240906-e87e16c8.tar.gz 203320 BLAKE2B 572da633cdd5ce7609e1ddb59c8677603b87951a4b766d64a56b31644bb25b957e15328cf96afc13c6032fca117b86726d523292c961a058cda706f6ae1939e5 SHA512 040ba702a4b4086f90b526922abcb54f3f00f68b130241b8ae7eb057e5f774a21c32df34d267502f904c1e6947fd6dada48de96806b1f0d357004a6b4c27db92
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
|
||||
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="5"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64"
|
||||
|
||||
DEPEND="
|
||||
|
||||
32
x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild
Normal file
32
x11-misc/kronometer/kronometer-2.3.70_pre20240906.ebuild
Normal file
@@ -0,0 +1,32 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
KDE_ORG_COMMIT=e87e16c8e623a8f5646f5286ac02ac9298dbb235
|
||||
ECM_HANDBOOK="forceoptional"
|
||||
ECM_TEST="forceoptional"
|
||||
KFMIN=6.5.0
|
||||
QTMIN=6.7.2
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Stopwatch application"
|
||||
HOMEPAGE="https://apps.kde.org/kronometer https://userbase.kde.org/Kronometer"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets]
|
||||
>=kde-frameworks/kcolorscheme-${KFMIN}:6
|
||||
>=kde-frameworks/kconfig-${KFMIN}:6
|
||||
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kcrash-${KFMIN}:6
|
||||
>=kde-frameworks/ki18n-${KFMIN}:6
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:6
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
@@ -6,6 +6,7 @@
|
||||
<name>Gentoo KDE Project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://bugs.kde.org/</bugs-to>
|
||||
<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kronometer</bugs-to>
|
||||
<remote-id type="kde-invent">kde/kronometer</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Reference in New Issue
Block a user