mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-07-10 15:45:15 -04:00
Merge updates from master
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
COMMIT="8f2f3d3a1652b87162f763a88a5070cf25c2e6d7"
|
||||
DESCRIPTION="Simplistic yet fancy CPU architecture fetching tool"
|
||||
HOMEPAGE="https://github.com/Dr-Noob/cpufetch"
|
||||
@@ -14,6 +16,11 @@ KEYWORDS="~amd64"
|
||||
PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
|
||||
S="${WORKDIR}/${PN}-${COMMIT}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
export CC=$(tc-getCC)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin "${PN}"
|
||||
doman "${PN}.8"
|
||||
|
||||
@@ -34,8 +34,7 @@ KEYWORDS="~amd64 ~x86"
|
||||
IUSE="static-libs test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="dev-util/FoBiS"
|
||||
BDEPEND="virtual/fortran"
|
||||
BDEPEND="dev-util/FoBiS"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/stringifor-1.1.1_fobos_soname.patch"
|
||||
@@ -48,7 +47,7 @@ set_build_mode() {
|
||||
BUILD_MODE_SHARED="-mode stringifor-shared-gnu"
|
||||
BUILD_MODE_STATIC="-mode stringifor-static-gnu"
|
||||
BUILD_MODE_TESTS="-mode tests-gnu" ;;
|
||||
ifort )
|
||||
*ifort* )
|
||||
BUILD_MODE_SHARED="-mode stringifor-shared-intel"
|
||||
BUILD_MODE_STATIC="-mode stringifor-static-intel"
|
||||
BUILD_MODE_TESTS="-mode tests-intel" ;;
|
||||
@@ -68,16 +67,17 @@ src_prepare() {
|
||||
mv -T "${WORKDIR}"/PENF-"${PENF_sha}" "${S}"/src/third_party/PENF
|
||||
default
|
||||
|
||||
sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' fobos || die
|
||||
sed -i -e 's:\$OPTIMIZE = -O2:\$OPTIMIZE = '"${FFLAGS}"':' \
|
||||
-e '/^\$LSHARED/s:$: '"${LDFLAGS}"':' fobos || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
FoBiS.py build -verbose ${BUILD_MODE_SHARED}
|
||||
use static-libs && FoBiS.py build -verbose ${BUILD_MODE_STATIC}
|
||||
FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_SHARED}
|
||||
use static-libs && FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC}
|
||||
}
|
||||
|
||||
src_test() {
|
||||
FoBiS.py build ${BUILD_MODE_TESTS}
|
||||
FoBiS.py build -compiler custom -fc $(tc-getFC) ${BUILD_MODE_TESTS}
|
||||
for e in $( find ./exe/ -type f -executable -print ); do
|
||||
if [ "$e" != "./exe/stringifor_test_parse_large_csv" ] ; then
|
||||
echo " run test $e :" && $e
|
||||
|
||||
1
dev-python/ewmh/Manifest
Normal file
1
dev-python/ewmh/Manifest
Normal file
@@ -0,0 +1 @@
|
||||
DIST ewmh-0.1.6.tar.gz 13065 BLAKE2B ba26d28f8976792b07e0bb200e1a2edcd7a04442bd17606a5d786ca41f01f4f3f96243134dde638fa228e49b79556d6ccbf25cf032c278e0b5233557746f34e9 SHA512 96c498cbd45bf03dca8b0c982cbb7e5644b00ce35b49df6abf119d36a18c08f907b635fc0ab12493d6351ba2c6645c75440d7c92d09d6feb06f6121bfd41391b
|
||||
19
dev-python/ewmh/ewmh-0.1.6.ebuild
Normal file
19
dev-python/ewmh/ewmh-0.1.6.ebuild
Normal file
@@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{8,9} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="An implementation of Extended Window Manager Hints, based on Xlib"
|
||||
HOMEPAGE="https://github.com/parkouss/pyewmh https://pypi.python.org/pypi/ewmh"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
SLOT="0"
|
||||
|
||||
RDEPEND="dev-python/python-xlib[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}"
|
||||
12
dev-python/ewmh/metadata.xml
Normal file
12
dev-python/ewmh/metadata.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>queereen@riseup.net</email>
|
||||
<name>Avis Drożniak</name>
|
||||
</maintainer>
|
||||
<longdescription>
|
||||
An implementation of EWMH (Extended Window Manager Hints) for python 2 and 3, based on Xlib.
|
||||
It allows EWMH-compliant window managers (most modern WMs) to be queried and controlled.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@@ -9,7 +9,7 @@ inherit distutils-r1
|
||||
|
||||
COMMIT="91c29b1ab6cd86d6d68fc983fd7ceba3a88ad544"
|
||||
|
||||
DESCRIPTION="Python Implementation of the TrueSkill, Glicko and Elo Ranking Algorithms"
|
||||
DESCRIPTION="Python Implementation of the TrueSkill Algorithm"
|
||||
HOMEPAGE="
|
||||
https://trueskill.org
|
||||
https://github.com/sublee/trueskill
|
||||
@@ -28,7 +28,7 @@ DEPEND="
|
||||
test? (
|
||||
>=dev-python/almost-0.1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/mpmath-0.17[${PYTHON_USEDEP}]
|
||||
dev-python/pip[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
S="${WORKDIR}/${PN}-${COMMIT}"
|
||||
|
||||
@@ -1 +1 @@
|
||||
DIST xdp-tools-1.1.0.tar.gz 157577 BLAKE2B 219219898cf83c72dd07ef64b3eda889ca2825ae9f21ab7714020fbc467ef37a4df978ee0c7eef45c1ebd43370ff71f43d1dab0d11507d80de3cbf39d45cab16 SHA512 31165f932dcdf8181c012500e2dc27118860d8733932ab253d02dd07a436c0ef1f5bc3253e6def716b10ff50b37854bb5e9679cc38adec27c3366823c8656232
|
||||
DIST xdp-tools-1.1.1.tar.gz 171627 BLAKE2B 5a2009f8b171d23a0f9b91b119e4376aecdddeb6d84c4323f05c03b382d4161c0d0364ef7a34b55771fe76c920b5bb18fe46c12d15c5356db6dc34174c5e5438 SHA512 580e87d7bfa7ee5b48caebceac4928386c3e3157ebb8d5cf1dd11a98187b9d17d027ef99f6598ce9b74eed7eb9b307195c4baa199675233d06c76bc8dc4861e5
|
||||
|
||||
@@ -1,38 +1,23 @@
|
||||
From 1de19829622cf394a6154834955379e7e45e0cb8 Mon Sep 17 00:00:00 2001
|
||||
From: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
Date: Fri, 10 Apr 2020 15:39:13 +0200
|
||||
Subject: [PATCH] lib: xdp: make: Fix library install
|
||||
Subject: [PATCH] lib: xdp: make: Don't install static libs
|
||||
|
||||
Two problems:
|
||||
|
||||
* install doesn't handle symlinks
|
||||
* static libs are installed
|
||||
|
||||
Fix it.
|
||||
Don't install static libs.
|
||||
|
||||
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
---
|
||||
lib/libxdp/Makefile | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
lib/libxdp/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/libxdp/Makefile b/lib/libxdp/Makefile
|
||||
index f45cc93c3076..2efe6bbea67a 100644
|
||||
--- a/lib/libxdp/Makefile
|
||||
+++ b/lib/libxdp/Makefile
|
||||
@@ -49,12 +49,11 @@ install: all
|
||||
@@ -49,7 +49,7 @@ install: all
|
||||
$(Q)install -d -m 0755 $(DESTDIR)$(BPF_OBJECT_DIR)
|
||||
$(Q)install -m 0644 $(LIB_HEADERS) $(DESTDIR)$(HDRDIR)/
|
||||
$(Q)install -m 0644 $(PC_FILE) $(DESTDIR)$(LIBDIR)/pkgconfig/
|
||||
- $(Q)install -m 0755 $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
|
||||
+ $(Q)cp -a $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
|
||||
- $(Q)cp -fpR $(SHARED_LIBS) $(STATIC_LIBS) $(DESTDIR)$(LIBDIR)
|
||||
+ $(Q)cp -fpR $(SHARED_LIBS) $(DESTDIR)$(LIBDIR)
|
||||
$(Q)install -m 0755 $(XDP_OBJS) $(DESTDIR)$(BPF_OBJECT_DIR)
|
||||
$(if $(MAN_FILES),$(Q)install -m 0755 -d $(DESTDIR)$(MANDIR)/man3)
|
||||
$(if $(MAN_FILES),$(Q)install -m 0644 $(MAN_FILES) $(DESTDIR)$(MANDIR)/man3)
|
||||
|
||||
-
|
||||
$(OBJDIR)/libxdp.a: $(STATIC_OBJS)
|
||||
$(QUIET_LINK)$(AR) rcs $@ $^
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
51
dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch
Normal file
51
dev-util/xdp-tools/files/xdp-tools-1.1.1-readelf.patch
Normal file
@@ -0,0 +1,51 @@
|
||||
From: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
Subject: lib: xdp: make: Fix hardcoded readelf
|
||||
|
||||
Don't hardcode readelf. Allow to reuse something else.
|
||||
|
||||
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
|
||||
---
|
||||
lib/libxdp/Makefile | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/lib/libxdp/Makefile
|
||||
+++ b/lib/libxdp/Makefile
|
||||
@@ -26,7 +26,7 @@ TEMPLATED_SOURCES := xdp-dispatcher.c
|
||||
|
||||
CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util
|
||||
BPF_CFLAGS += -I$(HEADER_DIR)
|
||||
-
|
||||
+READELF ?= readelf
|
||||
|
||||
ifndef BUILD_STATIC_ONLY
|
||||
SHARED_LIBS := $(OBJDIR)/libxdp.so \
|
||||
@@ -89,12 +89,12 @@ $(SHARED_OBJDIR)/%.o: %.c $(EXTRA_LIB_DE
|
||||
|
||||
XDP_IN_SHARED := $(SHARED_OBJDIR)/libxdp.o
|
||||
|
||||
-GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(XDP_IN_SHARED) | \
|
||||
+GLOBAL_SYM_COUNT = $(shell $(READELF) -s --wide $(XDP_IN_SHARED) | \
|
||||
cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
|
||||
sed 's/\[.*\]//' | \
|
||||
awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \
|
||||
sort -u | wc -l)
|
||||
-VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OBJDIR)/libxdp.so | \
|
||||
+VERSIONED_SYM_COUNT = $(shell $(READELF) --dyn-syms --wide $(OBJDIR)/libxdp.so | \
|
||||
grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | sort -u | wc -l)
|
||||
|
||||
check: check_abi
|
||||
@@ -106,12 +106,12 @@ check_abi: $(OBJDIR)/libxdp.so
|
||||
"versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
|
||||
"Please make sure all symbols are" \
|
||||
"versioned in $(VERSION_SCRIPT)." >&2; \
|
||||
- readelf -s --wide $(XDP_IN_SHARED) | \
|
||||
+ $(READELF) -s --wide $(XDP_IN_SHARED) | \
|
||||
cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \
|
||||
sed 's/\[.*\]//' | \
|
||||
awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \
|
||||
sort -u > $(OUTPUT)libxdp_global_syms.tmp; \
|
||||
- readelf --dyn-syms --wide $(OUTPUT)libxdp.so | \
|
||||
+ $(READELF) --dyn-syms --wide $(OUTPUT)libxdp.so | \
|
||||
grep -Eo '[^ ]+@LIBXDP_' | cut -d@ -f1 | \
|
||||
sort -u > $(OUTPUT)libxdp_versioned_syms.tmp; \
|
||||
diff -u $(OUTPUT)libxdp_global_syms.tmp \
|
||||
@@ -5,9 +5,12 @@ EAPI=7
|
||||
|
||||
inherit linux-info llvm multilib toolchain-funcs
|
||||
|
||||
# version v1.1.1 is not tagged, use commit
|
||||
MY_COMMIT="69827a07b395b78a2b577c3e1af6075f8c47fdd8"
|
||||
|
||||
DESCRIPTION="Utilities and example programs for use with XDP"
|
||||
HOMEPAGE="https://github.com/xdp-project/xdp-tools"
|
||||
SRC_URI="https://github.com/xdp-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI="https://github.com/xdp-project/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
@@ -40,7 +43,12 @@ DEPEND="${RDEPEND}
|
||||
sys-devel/llvm:10
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-install.patch" )
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-install.patch"
|
||||
"${FILESDIR}/${P}-readelf.patch"
|
||||
)
|
||||
|
||||
S="${WORKDIR}/xdp-tools-${MY_COMMIT}"
|
||||
|
||||
pkg_setup() {
|
||||
llvm_pkg_setup
|
||||
@@ -54,6 +62,7 @@ src_compile() {
|
||||
emake \
|
||||
CC="$(tc-getCC)" \
|
||||
AR="$(tc-getAR)" \
|
||||
READELF=$(tc-getREADELF) \
|
||||
PRODUCTION=1 \
|
||||
DYNAMIC_LIBXDP=1 \
|
||||
FORCE_SYSTEM_LIBBPF=1 \
|
||||
@@ -21,7 +21,7 @@ HOMEPAGE="https://taisei-project.org/"
|
||||
LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="doc +lto zip"
|
||||
IUSE="doc lto zip"
|
||||
|
||||
DEPEND="
|
||||
media-libs/freetype:2
|
||||
|
||||
@@ -21,7 +21,7 @@ HOMEPAGE="https://taisei-project.org/"
|
||||
LICENSE="MIT CC-BY-4.0 CC0-1.0 public-domain"
|
||||
SLOT="0"
|
||||
|
||||
IUSE="doc +lto zip"
|
||||
IUSE="doc lto zip"
|
||||
|
||||
DEPEND="
|
||||
media-libs/freetype:2
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
PYTHON_COMPAT=( python3_{7..9} )
|
||||
|
||||
inherit desktop python-single-r1 xdg
|
||||
inherit desktop python-single-r1 toolchain-funcs xdg
|
||||
|
||||
# Tarball from py3 port branch:
|
||||
# https://github.com/spirali/rmahjong/tree/py3
|
||||
@@ -48,6 +48,10 @@ src_prepare(){
|
||||
sed -i "/logging.info/d" "${S}/server/server.py" || die
|
||||
|
||||
echo $'#!/bin/sh\ncd '"$(python_get_sitedir)/${PN}"' && ./start.sh' > "${S}/rmahjong"
|
||||
|
||||
# pass compiler and CFLAGS to 'Bot' makefile
|
||||
sed -i -e 's:gcc:'"$(tc-getCC)"':g' bot/makefile \
|
||||
-e 's:CFLAGS=-Wall -O3 -march=native:CFLAGS='"${CFLAGS}"':'|| die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
@@ -62,9 +66,12 @@ src_test() {
|
||||
src_install() {
|
||||
python_moduleinto ${PN}
|
||||
python_domodule {client/,server/,start.sh}
|
||||
fperms 755 $(python_get_sitedir)/${PN}/start.sh
|
||||
fperms 755 $(python_get_sitedir)/${PN}/server/run_server.sh
|
||||
|
||||
python_moduleinto bot
|
||||
python_domodule "bot/bot"
|
||||
python_moduleinto ${PN}/bot
|
||||
python_domodule bot/bot
|
||||
fperms 755 $(python_get_sitedir)/${PN}/bot/bot
|
||||
|
||||
python_optimize "${D}/$(python_get_sitedir)/${PN}/"{client,server}/*.py
|
||||
|
||||
|
||||
@@ -3,18 +3,17 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
# _alpha -> -alpha
|
||||
MY_PV="${PV/_/-}"
|
||||
|
||||
inherit cmake xdg
|
||||
|
||||
DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
|
||||
HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"
|
||||
else
|
||||
# _alpha -> -alpha
|
||||
MY_PV="${PV/_/-}"
|
||||
SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/${PN}-v${MY_PV}"
|
||||
@@ -23,6 +22,9 @@ fi
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
BDEPEND="
|
||||
kde-frameworks/extra-cmake-modules:5
|
||||
"
|
||||
DEPEND="
|
||||
dev-libs/libdbusmenu-qt
|
||||
dev-libs/wayland
|
||||
|
||||
@@ -3,18 +3,17 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
# _alpha -> -alpha
|
||||
MY_PV="${PV/_/-}"
|
||||
|
||||
inherit cmake xdg
|
||||
|
||||
DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
|
||||
HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"
|
||||
else
|
||||
# _alpha -> -alpha
|
||||
MY_PV="${PV/_/-}"
|
||||
SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/${PN}-v${MY_PV}"
|
||||
@@ -23,6 +22,9 @@ fi
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
BDEPEND="
|
||||
kde-frameworks/extra-cmake-modules:5
|
||||
"
|
||||
DEPEND="
|
||||
dev-libs/libdbusmenu-qt
|
||||
dev-libs/wayland
|
||||
|
||||
@@ -3,18 +3,17 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
# _alpha -> -alpha
|
||||
MY_PV="${PV/_/-}"
|
||||
|
||||
inherit cmake xdg
|
||||
|
||||
DESCRIPTION="Simple, sleek QT based DE for wayland using wayfire"
|
||||
HOMEPAGE="https://gitlab.com/cubocore/paper/paperde"
|
||||
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://gitlab.com/cubocore/paper/${PN}.git"
|
||||
else
|
||||
# _alpha -> -alpha
|
||||
MY_PV="${PV/_/-}"
|
||||
SRC_URI="https://gitlab.com/cubocore/paper/${PN}/-/archive/v${MY_PV}/${PN}-v${MY_PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64"
|
||||
S="${WORKDIR}/${PN}-v${MY_PV}"
|
||||
@@ -23,6 +22,9 @@ fi
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
|
||||
BDEPEND="
|
||||
kde-frameworks/extra-cmake-modules:5
|
||||
"
|
||||
DEPEND="
|
||||
dev-libs/libdbusmenu-qt
|
||||
dev-libs/wayland
|
||||
|
||||
@@ -88,7 +88,7 @@ src_configure() {
|
||||
}
|
||||
passflags "${CFLAGS}" cflags_c
|
||||
passflags "${CXXFLAGS}" cflags_cc
|
||||
passflags "${CFLAGS}" ldflags
|
||||
passflags "${LDFLAGS}" ldflags
|
||||
|
||||
myconf_gn+=(
|
||||
ar=\"${AR}\"
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Filesystem to mount HTTP directory listings, with a permanent cache"
|
||||
HOMEPAGE="https://github.com/fangfufu/httpdirfs"
|
||||
|
||||
@@ -30,6 +32,10 @@ DEPEND="
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
emake prefix="${D}"/usr install
|
||||
src_compile () {
|
||||
emake CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake prefix="${D}/usr" install
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Filesystem to mount HTTP directory listings, with a permanent cache"
|
||||
HOMEPAGE="https://github.com/fangfufu/httpdirfs"
|
||||
|
||||
@@ -30,6 +32,10 @@ DEPEND="
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_install() {
|
||||
emake prefix="${D}"/usr install
|
||||
src_compile () {
|
||||
emake CC="$(tc-getCC)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake prefix="${D}/usr" install
|
||||
}
|
||||
|
||||
@@ -14,7 +14,10 @@ LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="boost doc dwarf elf fft heterogeneous inotify +instrument-dynamic-memory +instrument-io +instrument-syscall merge-in-trace nanos opencl openmp +parallel-merge pebs-sampling +posix-clock pthread sampling +single-mpi-lib smpss +xml"
|
||||
#aspectj and aspectj-weaver needs to be enabled both at the same time but the aspectj package in gentoo doesn't have weaver
|
||||
#aspectj and aspectj-weaver need to both be enabled at the same time
|
||||
#current dev-java/aspectj package only provides aspectj.jar
|
||||
#aspectj needs foo/lib/aspectj.jar and foo/bin/ajc
|
||||
#aspectj-weaver needs bar/aspectjweaver.jar
|
||||
#TODO: find out who is pulling in libpfm
|
||||
#TODO: find out which FFT library is used
|
||||
#TODO: remove some useflags (boost fft elf dwarf)
|
||||
@@ -42,6 +45,7 @@ CDEPEND="
|
||||
inotify? ( dev-libs/libevent )
|
||||
opencl? ( dev-util/opencl-headers )
|
||||
"
|
||||
# aspectj? ( >=dev-java/aspectj-1.9.6 )
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
java? ( virtual/jdk:1.8 )
|
||||
@@ -56,6 +60,7 @@ BDEPEND="
|
||||
"
|
||||
REQUIRED_USE="
|
||||
${PYTHON_REQUIRED_USE}
|
||||
java? ( pthread )
|
||||
"
|
||||
# cupti? ( cuda )
|
||||
# dyninst? ( boost dwarf elf )
|
||||
@@ -92,8 +97,6 @@ src_configure() {
|
||||
--without-cupti
|
||||
--without-memkind
|
||||
--without-clustering
|
||||
--without-java-aspectj
|
||||
--without-java-aspectj-weaver
|
||||
--without-synapse
|
||||
--without-spectral
|
||||
--without-openshmem
|
||||
@@ -121,6 +124,13 @@ src_configure() {
|
||||
# --without-sionlib
|
||||
#--with-pmpi-hook (Choose method to call PMPI (dlsym or pmpi))
|
||||
|
||||
# if use aspectj; then
|
||||
# myconf+=( "--with-java-aspectj=${EPREFIX}/usr/share/aspectj/lib" )
|
||||
# myconf+=( "--with-java-aspectj-weaver=${EPREFIX}/usr" )
|
||||
# else
|
||||
myconf+=( "--without-java-aspectj-weaver" )
|
||||
myconf+=( "--without-java-aspectj" )
|
||||
# fi
|
||||
if use boost; then
|
||||
myconf+=( "--with-boost=${EPREFIX}/usr" )
|
||||
else
|
||||
|
||||
@@ -16,6 +16,7 @@ process). Extrae generates trace files that can be later visualized with <pkg>sy
|
||||
<remote-id type="github">bsc-performance-tools/extrae</remote-id>
|
||||
</upstream>
|
||||
<use>
|
||||
<!--<flag name="aspectj">Enable support for tracing Java through <pkg>dev-java/aspectj</pkg> (experimental)</flag>-->
|
||||
<flag name="boost">Search for boost</flag>
|
||||
<flag name="doc">Generates the documentation of this instrumentation package</flag>
|
||||
<!--<flag name="cuda">Enable support for tracing CUDA calls on nVidia hardware and needs to point to the CUDA SDK installation path. This instrumentation is only valid in binaries that use the shared version of the CUDA library.</flag>-->
|
||||
|
||||
@@ -1,2 +1 @@
|
||||
DIST gtk-fortran-19.04.tar.gz 4164311 BLAKE2B 728d55890344894df534de1530135933e488ea197dc2d9b8f28571ce56a236e7fe2be23ebc4708e1ae5ffeb10e4ee584db366945e3d262225c4e9f7db4fa611d SHA512 58154df7c531ebfabcc687f8f38d3c7db7f7adb6cc015e1ce9c44455ab2506a4dfe6b073a88100131ac3712fee68844e4544f2f77d954285e3fbc86e1b3d9394
|
||||
DIST gtk-fortran-20.04.tar.gz 4066185 BLAKE2B 45a84dfd27b5f0495da55526262e3ba888f1d7eaa685336aaafae726dab63d047d71901a07eafc08c2f51d1e24a087e85f7b2a172323a8f1608c5ff64193f31c SHA512 b8ebf9e129c95c7aa2cf67d41f16915a18f05bd4cce4001ed56148b6d4e4ae3fe2b2e2080f35a1db4be8256bc3d5992061bf0c0e55e332f9a75a4a03e52cded5
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -73,17 +73,16 @@
|
||||
endif()
|
||||
|
||||
#======================================================
|
||||
-# Defining the static and shared gtk-fortran libraries:
|
||||
+# Defining the shared gtk-fortran libraries:
|
||||
#======================================================
|
||||
add_library(gtk-fortran_object OBJECT ${sources})
|
||||
# To build position independent shared libraries:
|
||||
set_property(TARGET gtk-fortran_object PROPERTY POSITION_INDEPENDENT_CODE TRUE)
|
||||
|
||||
-add_library(gtk-fortran_static STATIC $<TARGET_OBJECTS:gtk-fortran_object>)
|
||||
add_library(gtk-fortran_shared SHARED $<TARGET_OBJECTS:gtk-fortran_object>)
|
||||
target_link_libraries(gtk-fortran_shared ${GTK_LIBRARIES})
|
||||
|
||||
-set_target_properties(gtk-fortran_static gtk-fortran_shared PROPERTIES
|
||||
+set_target_properties(gtk-fortran_shared PROPERTIES
|
||||
OUTPUT_NAME ${gtk_V_fortran}
|
||||
VERSION "0.1"
|
||||
SOVERSION "0.1")
|
||||
@@ -131,7 +130,7 @@
|
||||
#==================
|
||||
# Files to install:
|
||||
#==================
|
||||
-install(TARGETS gtk-fortran_static gtk-fortran_shared
|
||||
+install(TARGETS gtk-fortran_shared
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
@@ -1,96 +0,0 @@
|
||||
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt 2019-04-24 10:53:11.000000000 +0300
|
||||
+++ b/CMakeLists.txt 2020-04-13 07:05:14.000000000 +0300
|
||||
@@ -194,7 +194,7 @@
|
||||
# As a temporary (?) workaround, we are now using pkg-config.
|
||||
# If a CMake error occurs, add -D EXCLUDE_PLPLOT=true to your CMake command.
|
||||
#===============================================================================
|
||||
-if (NOT EXCLUDE_PLPLOT)
|
||||
+if (NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
|
||||
pkg_check_modules(PLPLOT-FORTRAN REQUIRED plplot-fortran)
|
||||
@@ -211,9 +211,9 @@
|
||||
include_directories(${PLPLOT_INCLUDE_DIRS})
|
||||
set(CMAKE_REQUIRED_LIBRARIES "${PLPLOT_LIBRARIES}")
|
||||
set(CMAKE_REQUIRED_INCLUDES "${PLPLOT-FORTRAN_INCLUDE_DIRS}")
|
||||
-else(NOT EXCLUDE_PLPLOT)
|
||||
+else(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
|
||||
message(STATUS "PLPLOT Excluded as command option")
|
||||
-endif(NOT EXCLUDE_PLPLOT)
|
||||
+endif(NOT EXCLUDE_PLPLOT AND NOT NO_BUILD_HL)
|
||||
|
||||
|
||||
#===============================================================================
|
||||
@@ -223,10 +223,10 @@
|
||||
add_subdirectory(test)
|
||||
add_subdirectory(examples)
|
||||
|
||||
-if(${GTKv} GREATER 2)
|
||||
- add_subdirectory(sketcher)
|
||||
-endif()
|
||||
-
|
||||
-if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
- add_subdirectory(plplot)
|
||||
-endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
+if(NOT NO_BUILD_HL)
|
||||
+ if(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
+ add_subdirectory(plplot)
|
||||
+ endif(PLPLOT_FOUND AND NOT EXCLUDE_PLPLOT)
|
||||
+else(NOT NO_BUILD_HL)
|
||||
+ message(STATUS "High Level API Excluded as command option")
|
||||
+endif(NOT NO_BUILD_HL)
|
||||
diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
--- a/src/CMakeLists.txt 2019-04-24 10:53:11.000000000 +0300
|
||||
+++ b/src/CMakeLists.txt 2020-04-13 11:28:22.000000000 +0300
|
||||
@@ -33,28 +33,33 @@
|
||||
"gdk-pixbuf-auto.f90"
|
||||
"glib-auto.f90"
|
||||
"gtk.f90"
|
||||
- "gtk-hl.f90"
|
||||
- "gtk-hl-container.f90"
|
||||
- "gtk-hl-button.f90"
|
||||
- "gtk-hl-entry.f90"
|
||||
- "gtk-hl-tree.f90"
|
||||
- "gtk-hl-menu.f90"
|
||||
- "gtk-hl-combobox.f90"
|
||||
- "gtk-hl-spin-slider.f90"
|
||||
- "gtk-hl-chooser.f90"
|
||||
- "gtk-hl-dialog.f90"
|
||||
- "gtk-hl-progress.f90"
|
||||
- "gtk-hl-accelerator.f90"
|
||||
- "gtk-hl-infobar.f90"
|
||||
- "gtk-hl-assistant.f90"
|
||||
- "gtk-hl-misc.f90"
|
||||
- "gtk-draw-hl.f90"
|
||||
"gtk-sup.f90"
|
||||
- "gdk-pixbuf-hl.f90"
|
||||
"pango-auto.f90"
|
||||
"gdkevents-auto${GTKv}.f90"
|
||||
)
|
||||
|
||||
+if(NOT NO_BUILD_HL)
|
||||
+ set(sources ${sources}
|
||||
+ "gtk-hl.f90"
|
||||
+ "gtk-hl-container.f90"
|
||||
+ "gtk-hl-button.f90"
|
||||
+ "gtk-hl-entry.f90"
|
||||
+ "gtk-hl-tree.f90"
|
||||
+ "gtk-hl-menu.f90"
|
||||
+ "gtk-hl-combobox.f90"
|
||||
+ "gtk-hl-spin-slider.f90"
|
||||
+ "gtk-hl-chooser.f90"
|
||||
+ "gtk-hl-dialog.f90"
|
||||
+ "gtk-hl-progress.f90"
|
||||
+ "gtk-hl-accelerator.f90"
|
||||
+ "gtk-hl-infobar.f90"
|
||||
+ "gtk-hl-assistant.f90"
|
||||
+ "gtk-hl-misc.f90"
|
||||
+ "gtk-draw-hl.f90"
|
||||
+ "gdk-pixbuf-hl.f90"
|
||||
+ )
|
||||
+endif(NOT NO_BUILD_HL)
|
||||
+
|
||||
if (CMAKE_HOST_WIN32)
|
||||
set(sources
|
||||
${sources}
|
||||
@@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR="emake"
|
||||
FORTRAN_STANDARD=2003
|
||||
|
||||
inherit cmake fortran-2
|
||||
|
||||
DESCRIPTION="A GTK+ binding to build Graphical User Interfaces in Fortran"
|
||||
HOMEPAGE="https://github.com/vmagnin/gtk-fortran"
|
||||
SRC_URI="https://github.com/vmagnin/${PN}/archive/v${PV}.gtk3.24.8.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
S="${WORKDIR}/${P}.gtk3.24.8"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="doc examples high-level plplot"
|
||||
REQUIRED_USE="plplot? ( high-level )"
|
||||
|
||||
RDEPEND="
|
||||
x11-libs/gtk+:3
|
||||
plplot? ( >=sci-libs/plplot-5.13.0[cairo,fortran] )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
doc? ( app-doc/doxygen[dot] )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
virtual/fortran
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
DOCS=( "README.md" "README-high-level" "CHANGELOG.md" )
|
||||
|
||||
pkg_setup() {
|
||||
fortran-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# Patching here because of failed via PATCHES due to different line endings in files.
|
||||
# Patch is disable building of 'gtkf-sketcher' - it isn't installed and has now documentation;
|
||||
# add upstream 'NO_BUILD_HL' cmake option to disable build of high-level interface to gtk-fortran
|
||||
# that is used by plplot interface (and gtkf-sketcher) and currently causes the TEXTREL QA warnings.
|
||||
eapply "${FILESDIR}"/gtk-fortran-NO_BUILD_HL-option.patch
|
||||
# Fix library installation path
|
||||
sed -i "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" CMakeLists.txt || die
|
||||
# Fix "Some or all of the gtk libraries were not found. (missing: GTK3_GDKCONFIG_INCLUDE_DIR)",
|
||||
# ref: https://github.com/vmagnin/gtk-fortran/commit/d3c1682
|
||||
sed -i "s:GTK3_GDKCONFIG gdkconfig.h:GTK3_GDKCONFIG gdk/gdkconfig.h:" cmake/FindGTK3.cmake || die
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
mycmakeargs+=(
|
||||
-DEXCLUDE_PLPLOT=$(usex plplot false true)
|
||||
-DNO_BUILD_HL=$(usex high-level false true)
|
||||
-DINSTALL_EXAMPLES=$(usex examples)
|
||||
-DNO_BUILD_EXAMPLES=true
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake_src_compile
|
||||
use doc && cmake_src_compile doxygen
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
use doc && dodoc -r "${BUILD_DIR}"/html && rm "${D}/usr/share/doc/${P}"/html/{*.map,*.md5}
|
||||
}
|
||||
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="examples high-level plplot"
|
||||
IUSE="examples high-level plplot static-libs"
|
||||
REQUIRED_USE="plplot? ( high-level )"
|
||||
|
||||
RDEPEND="
|
||||
@@ -43,6 +43,8 @@ src_prepare() {
|
||||
sed -i -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):" \
|
||||
-e "s: add_subdirectory(sketcher)::" CMakeLists.txt || die
|
||||
|
||||
use !static-libs && eapply "${FILESDIR}/${P}_skip-static-build.patch"
|
||||
|
||||
cmake_src_prepare
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
a cross-platform library to build Graphical User Interfaces.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="doc">Build doxygen documentation</flag>
|
||||
<flag name="examples">Install examples source code files</flag>
|
||||
<flag name="high-level">Build high-level interface to the gtk-fortran package</flag>
|
||||
<flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> support</flag>
|
||||
|
||||
Reference in New Issue
Block a user