[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2023-03-12 Thread Anna Vyalkova 
commit: e528d70ef74edfcf9310300eabed81d87413ece9
Author: Anna (cybertailor) Vyalkova  sysrq  in>
AuthorDate: Sun Mar 12 14:00:06 2023 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Sun Mar 12 14:00:06 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e528d70e

sys-apps/intel-cmt-cat: drop 4.3.0

Signed-off-by: Anna (cybertailor) Vyalkova  sysrq.in>

 sys-apps/intel-cmt-cat/Manifest   |   1 -
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild | 140 --
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild |   2 +-
 3 files changed, 1 insertion(+), 142 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/Manifest b/sys-apps/intel-cmt-cat/Manifest
index 453e3f0f4..1f68d52f1 100644
--- a/sys-apps/intel-cmt-cat/Manifest
+++ b/sys-apps/intel-cmt-cat/Manifest
@@ -1,2 +1 @@
-DIST intel-cmt-cat-4.3.0.tar.gz 478547 BLAKE2B 
09dc746f9861dd1db5bdf7a46c469b57dbcf5215a9b418207581d4fe5abcdc4157169ace781f34f17228a5b4ad130af3a01f760d2c679be4c7d4efd3fc8208e4
 SHA512 
8229af3e931d7f32f1723c38cea9d3197554c076d64030256b05d44c2f1e6c3271501352ed4a8a8f4027a7c196f0a1fcf45fff48cb6f0f14c1d1ef45f7784fcd
 DIST intel-cmt-cat-4.4.0.tar.gz 494818 BLAKE2B 
827b5b001612ce0241088aabe2cfb87f460148e5321f92ff9f0a1b9d58ac1afe25e32afc3c842736f33f338e80a8ba64d983271504d8dc2cc89fcc95ff903b9a
 SHA512 
3882304976f5a27bb7085a764ac481114c403281648e288f75db3dba325c46572b88d5d47841711cf1bdc77f4706fb28026036f871bbfb763a66bcc226e1728d

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
deleted file mode 100644
index 04b4cef8e..0
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} ) #pypy3 has warnings
-
-inherit distutils-r1 perl-module
-
-DESCRIPTION="User space software for Intel(R) Resource Director Technology"
-HOMEPAGE="
-   
https://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
-   https://github.com/intel/intel-cmt-cat
-"
-SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="appqos perl"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   appqos? (
-   dev-python/flask[${PYTHON_USEDEP}]
-   dev-python/flask-restful[${PYTHON_USEDEP}]
-   dev-python/gevent[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   dev-python/psutil[${PYTHON_USEDEP}]
-   sys-apps/CommsPowerManagement[${PYTHON_USEDEP}]
-   )
-   perl? ( dev-lang/perl:= )
-"
-DEPEND="
-   ${RDEPEND}
-   test? (
-   appqos? ( dev-python/mock[${PYTHON_USEDEP}] )
-   )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES=(
-   "${FILESDIR}/${PN}-perl-makefile.patch"
-   "${FILESDIR}/${P}-no-strip.patch"
-   "${FILESDIR}/${P}-respect-flags.patch"
-)
-
-distutils_enable_tests unittest
-distutils_enable_tests pytest
-
-src_prepare() {
-   mkdir -p "${T}/prefix" || die
-
-   distutils-r1_python_prepare_all
-}
-
-src_compile() {
-   emake all PREFIX="${T}/prefix"
-
-   pushd "lib/python" || die
-   python_foreach_impl distutils-r1_python_compile
-   popd || die
-
-   if use perl; then
-   pushd "lib/perl" || die
-   perl-module_src_configure
-   perl-module_src_compile
-   popd || die
-   fi
-}
-
-src_install() {
-   emake install PREFIX="${T}/prefix"
-
-   dobin "${T}"/prefix/bin/*
-   doheader "${T}"/prefix/include/*
-   doman "${T}"/prefix/man/man*/*
-   dolib.so "${T}"/prefix/lib/*
-
-   dobin tools/membw/membw
-   dobin snmp/rdt-agentx.pl
-
-   dodoc ChangeLog README.md
-   docinto membw
-   dodoc tools/membw/README
-   docinto pqos
-   dodoc -r pqos/README pqos/configs
-   docinto lib
-   dodoc lib/README
-   docinto lib/python
-   dodoc lib/python/README.md
-   docinto snmp
-   dodoc snmp/README
-   docinto rdtset
-   dodoc rdtset/README
-
-   if use appqos; then
-   docinto appqos
-   dodoc appqos/README.md
-   fi
-
-   unset DOCS
-   python_foreach_impl python_install
-
-   if use perl; then
-   pushd "lib/perl" || die
-   unset DOCS
-   myinst=( DESTDIR="${D}" )
-   perl-module_src_install
-   popd || die
-   docinto lib/perl
-   dodoc lib/perl/README
-   fi
-}
-
-src_test() {
-   LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" python_foreach_impl 
python_test
-}
-
-python_install() {
-   pushd "lib/python" || die
-   distutils-r1_python_install
-   popd ||

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/, profiles/

2023-03-12 Thread Anna Vyalkova 
commit: 960749776844b03fedc0a546c1faf5d2bac8c83c
Author: Anna (cybertailor) Vyalkova  sysrq  in>
AuthorDate: Sun Mar 12 13:06:07 2023 +
Commit: Anna Vyalkova  sysrq  in>
CommitDate: Sun Mar 12 13:06:07 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=96074977

sys-apps/intel-cmt-cat: disable appqos

Signed-off-by: Anna (cybertailor) Vyalkova  sysrq.in>

 profiles/package.use.mask |  4 ---
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild | 41 ++-
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index 443a42e1a..dedfc0aff 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -7,10 +7,6 @@
 # Masked due to infinite run of tests with USE="openmp"
 ~sci-physics/SU2-7.2.0 openmp
 
-# Anna Vyalkova  (2022-11-18)
-# Depends on masked dev-python/gevent
-sys-apps/intel-cmt-cat appqos
-
 # Alessandro Barbieri  (2022-06-26)
 # depend on masked dev-python/python-binary-memcached
 dev-python/oslo-cache test

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
index 399505811..6f31809b6 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
@@ -16,29 +16,10 @@ 
SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="appqos perl"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   appqos? (
-   dev-python/flask[${PYTHON_USEDEP}]
-   dev-python/flask-restful[${PYTHON_USEDEP}]
-   dev-python/gevent[${PYTHON_USEDEP}]
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-   dev-python/pexpect[${PYTHON_USEDEP}]
-   dev-python/psutil[${PYTHON_USEDEP}]
-   sys-apps/CommsPowerManagement[${PYTHON_USEDEP}]
-   )
-   perl? ( dev-lang/perl:= )
-"
-DEPEND="
-   ${RDEPEND}
-   test? (
-   appqos? ( dev-python/mock[${PYTHON_USEDEP}] )
-   )
-"
+IUSE="perl"
+
+RDEPEND="perl? ( dev-lang/perl:= )"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
"${FILESDIR}/${P}-perl-makefile.patch"
"${FILESDIR}/${P}-no-strip.patch"
@@ -46,7 +27,6 @@ PATCHES=(
 )
 
 distutils_enable_tests unittest
-distutils_enable_tests pytest
 
 src_prepare() {
mkdir -p "${T}/prefix" || die
@@ -94,11 +74,6 @@ src_install() {
docinto rdtset
dodoc rdtset/README
 
-   if use appqos; then
-   docinto appqos
-   dodoc appqos/README.md
-   fi
-
unset DOCS
python_foreach_impl python_install
 
@@ -121,20 +96,10 @@ python_install() {
pushd "lib/python" || die
distutils-r1_python_install
popd || die
-
-   if use appqos; then
-   python_domodule appqos
-   fi
 }
 
 python_test() {
pushd "lib/python" || die
eunittest
popd || die
-
-   if use appqos; then
-   pushd "appqos" || die
-   epytest -vv tests
-   popd || die
-   fi
 }

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2022-12-21 Thread Julien Roy 
commit: 082a18b0e53c4f35001d133881895ebd194fbdb2
Author: Julien Roy  jroy  ca>
AuthorDate: Wed Dec 21 22:23:31 2022 +
Commit: Julien Roy  jroy  ca>
CommitDate: Wed Dec 21 22:24:32 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=082a18b0

sys-apps/intel-cmt-cat: unkeyword 4.*.0
DEPEND dev-python/gevent was dropped from ::gentoo

Signed-off-by: Julien Roy  jroy.ca>

 sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild | 1 -
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
index 61345cd83..8fc860fcb 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
@@ -16,7 +16,6 @@ 
SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="appqos perl"
 
 RDEPEND="

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
index a883db783..13fbf2eb3 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.4.0.ebuild
@@ -16,7 +16,6 @@ 
SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
 IUSE="appqos perl"
 
 RDEPEND="

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/files/, sys-apps/intel-cmt-cat/

2022-04-26 Thread Alessandro Barbieri 
commit: a9e8e245a9f098381631ae9f40c1e8a66253c074
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Tue Apr 26 10:56:45 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Tue Apr 26 10:56:45 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a9e8e245

sys-apps/intel-cmt-cat: add 4.4.0, drop 4.2.0-r2

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/Manifest|   2 +-
 .../files/intel-cmt-cat-4.4.0-no-strip.patch   |  15 ++
 .../files/intel-cmt-cat-4.4.0-perl-makefile.patch  |  22 +++
 .../files/intel-cmt-cat-do-not-strip.patch |  32 
 .../files/intel-cmt-cat-respect-flags.patch| 212 -
 ...-4.2.0-r2.ebuild => intel-cmt-cat-4.4.0.ebuild} |  20 +-
 6 files changed, 49 insertions(+), 254 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/Manifest b/sys-apps/intel-cmt-cat/Manifest
index 8820d1e5a..453e3f0f4 100644
--- a/sys-apps/intel-cmt-cat/Manifest
+++ b/sys-apps/intel-cmt-cat/Manifest
@@ -1,2 +1,2 @@
-DIST intel-cmt-cat-4.2.0.tar.gz 470596 BLAKE2B 
781e69a7019a27e87b6b6c8d2c914305a837d019cadf8d1b6221942c631e0e46531a292379d7979ae88e7a590b155bc4e5a62777bdd9ebfb2881471ef64bfa32
 SHA512 
ccfae2e3fa5bb8b7dfe5ed39ab20a8526eb759378aeb14fb7ed79f4f94820cd69e497c9e7d411f1d9ec40c07ca4c7c4f2db6ff1e034a8517c01c06bd8a70d4b6
 DIST intel-cmt-cat-4.3.0.tar.gz 478547 BLAKE2B 
09dc746f9861dd1db5bdf7a46c469b57dbcf5215a9b418207581d4fe5abcdc4157169ace781f34f17228a5b4ad130af3a01f760d2c679be4c7d4efd3fc8208e4
 SHA512 
8229af3e931d7f32f1723c38cea9d3197554c076d64030256b05d44c2f1e6c3271501352ed4a8a8f4027a7c196f0a1fcf45fff48cb6f0f14c1d1ef45f7784fcd
+DIST intel-cmt-cat-4.4.0.tar.gz 494818 BLAKE2B 
827b5b001612ce0241088aabe2cfb87f460148e5321f92ff9f0a1b9d58ac1afe25e32afc3c842736f33f338e80a8ba64d983271504d8dc2cc89fcc95ff903b9a
 SHA512 
3882304976f5a27bb7085a764ac481114c403281648e288f75db3dba325c46572b88d5d47841711cf1bdc77f4706fb28026036f871bbfb763a66bcc226e1728d

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch
new file mode 100644
index 0..99d261cd0
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-no-strip.patch
@@ -0,0 +1,15 @@
+--- a/tools/membw/Makefile
 b/tools/membw/Makefile
+@@ -94,10 +94,10 @@
+ ifeq ($(shell uname), FreeBSD)
+   install -d $(BIN_DIR)
+   install -d $(MAN_DIR)
+-  install -s $(APP) $(BIN_DIR)
++  install $(APP) $(BIN_DIR)
+   install -m 0444 $(MAN) $(MAN_DIR)
+ else
+-  install -D -s $(APP) $(BIN_DIR)/$(APP)
++  install -D $(APP) $(BIN_DIR)/$(APP)
+   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
+ endif
+ 

diff --git 
a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch
new file mode 100644
index 0..4355779d7
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.4.0-perl-makefile.patch
@@ -0,0 +1,22 @@
+--- a/lib/perl/Makefile.PL
 b/lib/perl/Makefile.PL
+@@ -42,8 +42,8 @@
+ WriteMakefile(
+   'NAME'=> 'pqos',
+   'VERSION' => "0.1",
+-  'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value 
-Wno-misleading-indentation",
+-  'LIBS'=> ['-lpqos', '-L/usr/local/lib -lpqos'],
++  'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value 
-Wno-misleading-indentation -I..",
++  'LIBS'=> ['-lpqos', '-L.. -lpqos'],
+   'OBJECT'  => 'pqos_wrap.o',
+   'clean'   => {FILES => "pqos_wrap.c"},
+ );
+@@ -56,7 +56,7 @@
+ 
+   my $swig_target = <<"SWIG_MAKEFILE";
+ pqos_wrap.c:
+-  $swig -perl -outdir \$(INST_LIB) -I/usr/local/include 
\$(EXTRA_SWIGFLAGS) pqos.i
++  $swig -perl -outdir \$(INST_LIB) -I.. \$(EXTRA_SWIGFLAGS) pqos.i
+ SWIG_MAKEFILE
+ 
+   my $perltidy_targets = <<'PERLTIDY_MAKEFILE';

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
deleted file mode 100644
index 44ea45617..0
--- a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
+++ /dev/null
@@ -1,32 +0,0 @@
 a/pqos/Makefile
-+++ b/pqos/Makefile
-@@ -108,12 +108,12 @@
- ifeq ($(shell uname), FreeBSD)
-   install -d $(BIN_DIR)
-   install -d $(MAN_DIR)
--  install -s $(APP) $(BIN_DIR)
-+  install $(APP) $(BIN_DIR)
-   install $(APP)-msr $(BIN_DIR)
-   install -m 0444 $(MAN) $(MAN_DIR)
-   ln -f -s $(MAN) $(MAN_DIR)/$(APP)-msr.8
- else
--  install -D -s $(APP) $(BIN_DIR)/$(APP)
-+  install -D $(APP) $(BIN_DIR)/$(APP)
-   install -D $(APP)-msr $(BIN_DIR)/$(APP)-msr
-   install -D $(APP)-os $(BIN_DIR)/$(APP)-os
-   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
 a/rdtset/Makefile
-+++ b/rdtset/Makefile
-@@ -115,10 +115,10 @@
- ifeq ($(shell uname), FreeBSD)
-   install -d $(BIN_DIR)
-   install -d $(MAN_DIR)

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2022-03-19 Thread Alessandro Barbieri 
commit: 1b2736966b6579742b9e89b53c3e591bc891198c
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar 20 01:29:24 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar 20 01:30:57 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1b273696

sys-apps/intel-cmt-cat: try to fix library load path for tests

Bug: https://bugs.gentoo.org/834906
Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
index 2c84f7f4c..61345cd83 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
@@ -34,7 +34,9 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   test? ( appqos? ( dev-python/mock[${PYTHON_USEDEP}] ) )
+   test? (
+   appqos? ( dev-python/mock[${PYTHON_USEDEP}] )
+   )
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -101,7 +103,7 @@ src_install() {
unset DOCS
python_foreach_impl python_install
 
-   if use perl ; then
+   if use perl; then
pushd "lib/perl" || die
unset DOCS
myinst=( DESTDIR="${D}" )
@@ -113,7 +115,7 @@ src_install() {
 }
 
 src_test() {
-   python_foreach_impl python_test
+   LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${S}/lib" python_foreach_impl 
python_test
 }
 
 python_install() {

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/files/

2022-03-12 Thread Alessandro Barbieri 
commit: d182666e6807ecc3c18748e3ebe13363c95cfca6
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sat Mar 12 16:25:04 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sat Mar 12 16:31:21 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d182666e

sys-apps/intel-cmt-cat: fix strip again

Closes: https://bugs.gentoo.org/834993
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch
index 5558fdb35..3f4b8db04 100644
--- a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch
@@ -32,7 +32,7 @@
  
 --- a/tools/membw/Makefile
 +++ b/tools/membw/Makefile
-@@ -94,7 +94,7 @@
+@@ -94,10 +94,10 @@
  ifeq ($(shell uname), FreeBSD)
install -d $(BIN_DIR)
install -d $(MAN_DIR)
@@ -40,4 +40,8 @@
 +  install $(APP) $(BIN_DIR)
install -m 0444 $(MAN) $(MAN_DIR)
  else
-   install -D -s $(APP) $(BIN_DIR)/$(APP)
+-  install -D -s $(APP) $(BIN_DIR)/$(APP)
++  install -D $(APP) $(BIN_DIR)/$(APP)
+   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
+ endif
+

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/, sys-apps/intel-cmt-cat/files/

2022-03-10 Thread Alessandro Barbieri 
commit: 0e6a30ba54a153a2641dd43afc1f64a756b11de3
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Mar 10 17:42:36 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Mar 10 18:23:29 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e6a30ba

sys-apps/intel-cmt-cat: do not strip membw

Closes: https://bugs.gentoo.org/834907
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 .../files/intel-cmt-cat-4.3.0-no-strip.patch   | 43 ++
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild  |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch
new file mode 100644
index 0..5558fdb35
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-no-strip.patch
@@ -0,0 +1,43 @@
+--- a/pqos/Makefile
 b/pqos/Makefile
+@@ -110,12 +110,12 @@
+ ifeq ($(shell uname), FreeBSD)
+   install -d $(BIN_DIR)
+   install -d $(MAN_DIR)
+-  install -s $(APP) $(BIN_DIR)
++  install $(APP) $(BIN_DIR)
+   install $(APP)-msr $(BIN_DIR)
+   install -m 0444 $(MAN) $(MAN_DIR)
+   ln -f -s $(MAN) $(MAN_DIR)/$(APP)-msr.8
+ else
+-  install -D -s $(APP) $(BIN_DIR)/$(APP)
++  install -D $(APP) $(BIN_DIR)/$(APP)
+   install -D $(APP)-msr $(BIN_DIR)/$(APP)-msr
+   install -D $(APP)-os $(BIN_DIR)/$(APP)-os
+   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
+--- a/rdtset/Makefile
 b/rdtset/Makefile
+@@ -117,10 +117,10 @@
+ ifeq ($(shell uname), FreeBSD)
+   install -d $(BIN_DIR)
+   install -d $(MAN_DIR)
+-  install -s $(APP) $(BIN_DIR)
++  install $(APP) $(BIN_DIR)
+   install -m 0444 $(MAN) $(MAN_DIR)
+ else
+-  install -D -s $(APP) $(BIN_DIR)/$(APP)
++  install -D $(APP) $(BIN_DIR)/$(APP)
+   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
+ endif
+ 
+--- a/tools/membw/Makefile
 b/tools/membw/Makefile
+@@ -94,7 +94,7 @@
+ ifeq ($(shell uname), FreeBSD)
+   install -d $(BIN_DIR)
+   install -d $(MAN_DIR)
+-  install -s $(APP) $(BIN_DIR)
++  install $(APP) $(BIN_DIR)
+   install -m 0444 $(MAN) $(MAN_DIR)
+ else
+   install -D -s $(APP) $(BIN_DIR)/$(APP)

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
index 008f2408b..2c84f7f4c 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
@@ -40,7 +40,7 @@ DEPEND="
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=(
"${FILESDIR}/${PN}-perl-makefile.patch"
-   "${FILESDIR}/${PN}-do-not-strip.patch"
+   "${FILESDIR}/${P}-no-strip.patch"
"${FILESDIR}/${P}-respect-flags.patch"
 )

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/, sys-apps/intel-cmt-cat/files/

2022-03-08 Thread Alessandro Barbieri 
commit: 3cdf921a8ac5e26395e3dcedcbfd11cc42587097
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Mar  9 00:09:10 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Wed Mar  9 00:09:10 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3cdf921a

sys-apps/intel-cmt-cat: fix patch

Closes: https://bugs.gentoo.org/834747
Signed-off-by: Alessandro Barbieri  gmail.com>

 .../files/intel-cmt-cat-4.3.0-respect-flags.patch  | 282 +
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild  |   6 +-
 2 files changed, 285 insertions(+), 3 deletions(-)

diff --git 
a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-respect-flags.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-respect-flags.patch
new file mode 100644
index 0..f45332b10
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-4.3.0-respect-flags.patch
@@ -0,0 +1,282 @@
+--- a/examples/c/CAT_MBA/Makefile
 b/examples/c/CAT_MBA/Makefile
+@@ -35,17 +35,16 @@
+ 
###
+ 
+ LIBDIR ?= ../../../lib
+-CFLAGS =-I$(LIBDIR) \
++CFLAGS += -I$(LIBDIR) \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings  \
+-  -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
+-  -Wunreachable-code -Wsign-compare -Wno-endif-labels \
+-  -g -O2
++  -Wformat -Wformat-security -fPIE \
++  -Wunreachable-code -Wsign-compare -Wno-endif-labels
+ ifneq ($(EXTRA_CFLAGS),)
+ CFLAGS += $(EXTRA_CFLAGS)
+ endif
+-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
++LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+ LDLIBS=-lpqos -lpthread
+ 
+ # ICC and GCC options
+--- a/examples/c/CMT_MBM/Makefile
 b/examples/c/CMT_MBM/Makefile
+@@ -35,17 +35,16 @@
+ 
###
+ 
+ LIBDIR ?= ../../../lib
+-CFLAGS =-I$(LIBDIR) -pthread \
++CFLAGS += -I$(LIBDIR) -pthread \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings \
+-  -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
+-  -Wunreachable-code -Wsign-compare -Wno-endif-labels \
+-  -g -O2
++  -Wformat -Wformat-security -fPIE \
++  -Wunreachable-code -Wsign-compare -Wno-endif-labels
+ ifneq ($(EXTRA_CFLAGS),)
+ CFLAGS += $(EXTRA_CFLAGS)
+ endif
+-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
++LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+ LDLIBS=-lpqos -lpthread
+ 
+ # ICC and GCC options
+--- a/examples/c/PSEUDO_LOCK/Makefile
 b/examples/c/PSEUDO_LOCK/Makefile
+@@ -35,15 +35,14 @@
+ 
###
+ 
+ LIBDIR ?= ../../../lib
+-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
++LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+ LDLIBS = -lpqos -lrt -lpthread
+-CFLAGS = -I$(LIBDIR) \
++CFLAGS += -I$(LIBDIR) \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings  \
+-  -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
+-  -Wunreachable-code -Wsign-compare -Wno-endif-labels \
+-  -g -O2
++  -Wformat -Wformat-security -fPIE \
++  -Wunreachable-code -Wsign-compare -Wno-endif-labels
+ ifneq ($(EXTRA_CFLAGS),)
+ CFLAGS += $(EXTRA_CFLAGS)
+ endif
+--- a/lib/Makefile
 b/lib/Makefile
+@@ -37,12 +37,12 @@
+ VERSION = 4.3.0
+ SO_VERSION = 4
+ SHARED ?= y
+-LDFLAGS = -L. -lpthread -z noexecstack -z relro -z now
+-CFLAGS = -pthread -I./ -D_GNU_SOURCE \
++LDFLAGS += -L. -lpthread -z noexecstack -z relro -z now
++CFLAGS += -pthread -I./ -D_GNU_SOURCE \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings \
+-  -Wformat -Wformat-security -fstack-protector \
++  -Wformat -Wformat-security \
+   -Wunreachable-code -Wsign-compare -Wno-endif-labels
+ ifneq ($(EXTRA_CFLAGS),)
+ CFLAGS += $(EXTRA_CFLAGS)
+@@ -83,9 +83,7 @@
+ 
+ # DEBUG build
+ ifeq ($(DEBUG),y)
+-CFLAGS += -g -ggdb -Og -DDEBUG
+-else
+-CFLAGS += -g -O2 -D_FORTIFY_SOURCE=2
++CFLAGS += -DDEBUG
+ endif
+ 
+ # RMID CUSTOM
+@@ -114,7 +112,7 @@
+ endif
+ 
+ HDR = pqos.h
+-PREFIX ?= /usr/local
++PREFIX ?= /usr
+ LIB_INSTALL_DIR ?= $(PREFIX)/lib
+ HDR_DIR ?= $(PREFIX)/include
+ DEPFILE = $(LIB).dep
+--- a/pqos/Makefile
 b/pqos/Makefile
+@@ -35,13 +35,13 @@
+ 
###
+ 
+ LIBDIR ?= ../lib
+-LDFLAGS = -L$(LIBDIR)

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2022-03-05 Thread Alessandro Barbieri 
commit: f8fdc08321a1a00a89e65a2ceb24f2fdd259a824
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Mar  6 01:42:50 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Mar  6 02:22:42 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f8fdc083

sys-apps/intel-cmt-cat: add 4.3.0

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/Manifest   |   1 +
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild | 139 ++
 2 files changed, 140 insertions(+)

diff --git a/sys-apps/intel-cmt-cat/Manifest b/sys-apps/intel-cmt-cat/Manifest
index 59cfff0d6..8820d1e5a 100644
--- a/sys-apps/intel-cmt-cat/Manifest
+++ b/sys-apps/intel-cmt-cat/Manifest
@@ -1 +1,2 @@
 DIST intel-cmt-cat-4.2.0.tar.gz 470596 BLAKE2B 
781e69a7019a27e87b6b6c8d2c914305a837d019cadf8d1b6221942c631e0e46531a292379d7979ae88e7a590b155bc4e5a62777bdd9ebfb2881471ef64bfa32
 SHA512 
ccfae2e3fa5bb8b7dfe5ed39ab20a8526eb759378aeb14fb7ed79f4f94820cd69e497c9e7d411f1d9ec40c07ca4c7c4f2db6ff1e034a8517c01c06bd8a70d4b6
+DIST intel-cmt-cat-4.3.0.tar.gz 478547 BLAKE2B 
09dc746f9861dd1db5bdf7a46c469b57dbcf5215a9b418207581d4fe5abcdc4157169ace781f34f17228a5b4ad130af3a01f760d2c679be4c7d4efd3fc8208e4
 SHA512 
8229af3e931d7f32f1723c38cea9d3197554c076d64030256b05d44c2f1e6c3271501352ed4a8a8f4027a7c196f0a1fcf45fff48cb6f0f14c1d1ef45f7784fcd

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
new file mode 100644
index 0..7e8662eb6
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.3.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} ) #pypy3 has warnings
+
+inherit distutils-r1 perl-module
+
+DESCRIPTION="User space software for Intel(R) Resource Director Technology"
+HOMEPAGE="
+   
https://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
+   https://github.com/intel/intel-cmt-cat
+"
+SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="appqos perl"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   appqos? (
+   dev-python/flask[${PYTHON_USEDEP}]
+   dev-python/flask-restful[${PYTHON_USEDEP}]
+   dev-python/gevent[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   sys-apps/CommsPowerManagement[${PYTHON_USEDEP}]
+   )
+   perl? ( dev-lang/perl:= )
+"
+DEPEND="
+   ${RDEPEND}
+   test? ( appqos? ( dev-python/mock[${PYTHON_USEDEP}] ) )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=(
+   "${FILESDIR}/${PN}-perl-makefile.patch"
+   "${FILESDIR}/${PN}-do-not-strip.patch"
+   "${FILESDIR}/${PN}-respect-flags.patch"
+)
+
+distutils_enable_tests unittest
+distutils_enable_tests pytest
+
+src_prepare() {
+   mkdir -p "${T}/prefix" || die
+
+   distutils-r1_python_prepare_all
+}
+
+src_compile() {
+   emake all PREFIX="${T}/prefix"
+
+   pushd "lib/python" || die
+   python_foreach_impl distutils-r1_python_compile
+   popd || die
+
+   if use perl; then
+   pushd "lib/perl" || die
+   perl-module_src_configure
+   perl-module_src_compile
+   popd || die
+   fi
+}
+
+src_install() {
+   emake install PREFIX="${T}/prefix"
+
+   dobin "${T}"/prefix/bin/*
+   doheader "${T}"/prefix/include/*
+   doman "${T}"/prefix/man/man*/*
+   dolib.so "${T}"/prefix/lib/*
+
+   dobin tools/membw/membw
+   dobin snmp/rdt-agentx.pl
+
+   dodoc ChangeLog README
+   docinto membw
+   dodoc tools/membw/README
+   docinto pqos
+   dodoc -r pqos/README pqos/configs
+   docinto lib
+   dodoc lib/README
+   docinto lib/python
+   dodoc lib/python/README.txt
+   docinto snmp
+   dodoc snmp/README
+   docinto rdtset
+   dodoc rdtset/README
+
+   if use appqos; then
+   docinto appqos
+   dodoc appqos/README.md
+   fi
+
+   unset DOCS
+   python_foreach_impl python_install
+
+   if use perl ; then
+   pushd "lib/perl" || die
+   unset DOCS
+   myinst=( DESTDIR="${D}" )
+   perl-module_src_install
+   popd || die
+   docinto lib/perl
+   dodoc lib/perl/README
+   fi
+}
+
+src_test() {
+   python_foreach_impl python_test
+}
+
+python_install() {
+   pushd "lib/python" || die
+   distutils-r1_python_install
+   popd || die
+
+   if use appqos; then
+   python_domodule appqos
+   fi
+}
+
+python_test() {
+   pushd "lib/python" ||

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2021-10-04 Thread Alessandro Barbieri 
commit: e4b2a97e4b743e4b4580a2241342534050b92969
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Mon Oct  4 23:08:50 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Mon Oct  4 23:08:50 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e4b2a97e

sys-apps/intel-cmt-cat: use https

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
index aee2b7962..09341e17b 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 perl-module
 
 DESCRIPTION="User space software for Intel(R) Resource Director Technology"
 HOMEPAGE="
-   
http://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
+   
https://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
https://github.com/intel/intel-cmt-cat
 "
 
SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/, sys-apps/intel-cmt-cat/files/

2021-09-03 Thread Alessandro Barbieri 
commit: b69c9598000651b6a87b8e15e5765725f4001a2f
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Fri Sep  3 23:04:38 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Fri Sep  3 23:05:07 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b69c9598

sys-apps/intel-cmt-cat: respect flags, don't strip

Closes: https://bugs.gentoo.org/810736
Closes: https://bugs.gentoo.org/810733
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri  gmail.com>

 .../files/intel-cmt-cat-do-not-strip.patch |  32 
 .../files/intel-cmt-cat-respect-flags.patch| 212 +
 ...2.0-r1.ebuild => intel-cmt-cat-4.2.0-r2.ebuild} |   6 +-
 3 files changed, 249 insertions(+), 1 deletion(-)

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
new file mode 100644
index 0..44ea45617
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-do-not-strip.patch
@@ -0,0 +1,32 @@
+--- a/pqos/Makefile
 b/pqos/Makefile
+@@ -108,12 +108,12 @@
+ ifeq ($(shell uname), FreeBSD)
+   install -d $(BIN_DIR)
+   install -d $(MAN_DIR)
+-  install -s $(APP) $(BIN_DIR)
++  install $(APP) $(BIN_DIR)
+   install $(APP)-msr $(BIN_DIR)
+   install -m 0444 $(MAN) $(MAN_DIR)
+   ln -f -s $(MAN) $(MAN_DIR)/$(APP)-msr.8
+ else
+-  install -D -s $(APP) $(BIN_DIR)/$(APP)
++  install -D $(APP) $(BIN_DIR)/$(APP)
+   install -D $(APP)-msr $(BIN_DIR)/$(APP)-msr
+   install -D $(APP)-os $(BIN_DIR)/$(APP)-os
+   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
+--- a/rdtset/Makefile
 b/rdtset/Makefile
+@@ -115,10 +115,10 @@
+ ifeq ($(shell uname), FreeBSD)
+   install -d $(BIN_DIR)
+   install -d $(MAN_DIR)
+-  install -s $(APP) $(BIN_DIR)
++  install $(APP) $(BIN_DIR)
+   install -m 0444 $(MAN) $(MAN_DIR)
+ else
+-  install -D -s $(APP) $(BIN_DIR)/$(APP)
++  install -D $(APP) $(BIN_DIR)/$(APP)
+   install -m 0444 $(MAN) -D $(MAN_DIR)/$(MAN)
+ endif
+ 

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch
new file mode 100644
index 0..81b591060
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-respect-flags.patch
@@ -0,0 +1,212 @@
+--- a/examples/c/CAT_MBA/Makefile
 b/examples/c/CAT_MBA/Makefile
+@@ -35,17 +35,17 @@
+ 
###
+ 
+ LIBDIR ?= ../../../lib
+-CFLAGS =-I$(LIBDIR) \
++CFLAGS += -I$(LIBDIR) \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings  \
+-  -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
+-  -Wunreachable-code -Wsign-compare -Wno-endif-labels \
+-  -g -O2
++  -Wformat -Wformat-security -fPIE \
++  -Wunreachable-code -Wsign-compare -Wno-endif-labels
++
+ ifneq ($(EXTRA_CFLAGS),)
+ CFLAGS += $(EXTRA_CFLAGS)
+ endif
+-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
++LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+ LDLIBS=-lpqos -lpthread
+ 
+ # ICC and GCC options
+--- a/examples/c/CMT_MBM/Makefile
 b/examples/c/CMT_MBM/Makefile
+@@ -35,17 +35,17 @@
+ 
###
+ 
+ LIBDIR ?= ../../../lib
+-CFLAGS =-I$(LIBDIR) -pthread \
++CFLAGS += -I$(LIBDIR) -pthread \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings \
+-  -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
+-  -Wunreachable-code -Wsign-compare -Wno-endif-labels \
+-  -g -O2
++  -Wformat -Wformat-security -fPIE \
++  -Wunreachable-code -Wsign-compare -Wno-endif-labels
++
+ ifneq ($(EXTRA_CFLAGS),)
+ CFLAGS += $(EXTRA_CFLAGS)
+ endif
+-LDFLAGS=-L$(LIBDIR) -pie -z noexecstack -z relro -z now
++LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+ LDLIBS=-lpqos -lpthread
+ 
+ # ICC and GCC options
+--- a/examples/c/PSEUDO_LOCK/Makefile
 b/examples/c/PSEUDO_LOCK/Makefile
+@@ -35,15 +35,15 @@
+ 
###
+ 
+ LIBDIR ?= ../../../lib
+-LDFLAGS = -L$(LIBDIR) -pie -z noexecstack -z relro -z now
++LDFLAGS += -L$(LIBDIR) -pie -z noexecstack -z relro -z now
+ LDLIBS = -lpqos -lrt -lpthread
+-CFLAGS = -I$(LIBDIR) \
++CFLAGS += -I$(LIBDIR) \
+   -W -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \
+   -Wmissing-declarations -Wold-style-definition -Wpointer-arith \
+   -Wcast-qual -Wundef -Wwrite-strings  \
+-  -Wformat -Wformat-security -fstack-protector -fPIE -D_FORTIFY_SOURCE=2 \
+-

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2021-08-25 Thread Alessandro Barbieri 
commit: 63cc2ef5e4bd14274c142ca5a129cdd78dc00a72
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Thu Aug 26 02:35:38 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Thu Aug 26 02:36:45 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=63cc2ef5

sys-apps/intel-cmt-cat: add appqos

Signed-off-by: Alessandro Barbieri  gmail.com>

 ...-4.2.0.ebuild => intel-cmt-cat-4.2.0-r1.ebuild} | 45 ++
 sys-apps/intel-cmt-cat/metadata.xml|  3 ++
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r1.ebuild
similarity index 76%
rename from sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
rename to sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r1.ebuild
index 0efe73894..f4c6de5e7 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..10} ) #pypy3 has warnings
 
 inherit distutils-r1 perl-module
 
@@ -17,17 +17,24 @@ 
SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="perl"
+IUSE="appqos perl"
 
 RDEPEND="
${PYTHON_DEPS}
-   dev-python/jsonschema[${PYTHON_USEDEP}]
-
+   appqos? (
+   dev-python/flask[${PYTHON_USEDEP}]
+   dev-python/flask-restful[${PYTHON_USEDEP}]
+   dev-python/gevent[${PYTHON_USEDEP}]
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+   dev-python/pexpect[${PYTHON_USEDEP}]
+   dev-python/psutil[${PYTHON_USEDEP}]
+   sys-apps/CommsPowerManagement[${PYTHON_USEDEP}]
+   )
perl? ( dev-lang/perl:= )
 "
 DEPEND="
${RDEPEND}
-   test? ( dev-python/mock[${PYTHON_USEDEP}] )
+   test? ( appqos? ( dev-python/mock[${PYTHON_USEDEP}] ) )
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -36,8 +43,6 @@ PATCHES=( "${FILESDIR}/${PN}-perl-makefile.patch" )
 distutils_enable_tests unittest
 distutils_enable_tests pytest
 
-#TODO: install appqos
-
 src_prepare() {
mkdir -p "${T}/prefix" || die
 
@@ -47,15 +52,16 @@ src_prepare() {
 src_compile() {
emake all PREFIX="${T}/prefix"
 
+   pushd "lib/python" || die
+   python_foreach_impl distutils-r1_python_compile
+   popd || die
+
if use perl; then
pushd "lib/perl" || die
perl-module_src_configure
perl-module_src_compile
popd || die
fi
-   pushd "lib/python" || die
-   python_foreach_impl distutils-r1_python_compile
-   popd || die
 }
 
 src_install() {
@@ -82,8 +88,11 @@ src_install() {
dodoc snmp/README
docinto rdtset
dodoc rdtset/README
-   docinto appqos
-   dodoc appqos/README.md
+
+   if use appqos; then
+   docinto appqos
+   dodoc appqos/README.md
+   fi
 
unset DOCS
python_foreach_impl python_install
@@ -108,7 +117,9 @@ python_install() {
distutils-r1_python_install
popd || die
 
-#  python_domodule appqos
+   if use appqos; then
+   python_domodule appqos
+   fi
 }
 
 python_test() {
@@ -116,7 +127,9 @@ python_test() {
eunittest
popd || die
 
-#  pushd "appqos" || die
-#  epytest -vv tests
-#  popd || die
+   if use appqos; then
+   pushd "appqos" || die
+   epytest -vv tests
+   popd || die
+   fi
 }

diff --git a/sys-apps/intel-cmt-cat/metadata.xml 
b/sys-apps/intel-cmt-cat/metadata.xml
index fd18b3532..a0be758e8 100644
--- a/sys-apps/intel-cmt-cat/metadata.xml
+++ b/sys-apps/intel-cmt-cat/metadata.xml
@@ -48,4 +48,7 @@ PID API compile time option has been removed and the APIs are 
always available.
 Note that proper operation of these APIs depends on availability and
 selection of OS interface.

+   
+   Install App QoS, a software created to 
demonstrate the use of Intel(R) RDT technologies (CAT, MBA) to improve QoS for 
applications via partitioning system resources.
+

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/

2021-08-25 Thread Alessandro Barbieri 
commit: b886b5f8bd874281028e16ecd1a5cdcd76c859b2
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Aug 25 07:57:43 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Wed Aug 25 08:00:17 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b886b5f8

sys-apps/intel-cmt-cat: disable pypy3

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild | 40 +++
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
index e65818eef..0efe73894 100644
--- a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 perl-module
 
@@ -21,14 +21,22 @@ IUSE="perl"
 
 RDEPEND="
${PYTHON_DEPS}
+   dev-python/jsonschema[${PYTHON_USEDEP}]
+
perl? ( dev-lang/perl:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+   ${RDEPEND}
+   test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 PATCHES=( "${FILESDIR}/${PN}-perl-makefile.patch" )
 
 distutils_enable_tests unittest
+distutils_enable_tests pytest
+
+#TODO: install appqos
 
 src_prepare() {
mkdir -p "${T}/prefix" || die
@@ -48,9 +56,6 @@ src_compile() {
pushd "lib/python" || die
python_foreach_impl distutils-r1_python_compile
popd || die
-#  pushd "appqos" || die
-#  python_foreach_impl distutils-r1_python_compile
-#  popd || die
 }
 
 src_install() {
@@ -80,6 +85,9 @@ src_install() {
docinto appqos
dodoc appqos/README.md
 
+   unset DOCS
+   python_foreach_impl python_install
+
if use perl ; then
pushd "lib/perl" || die
unset DOCS
@@ -89,20 +97,26 @@ src_install() {
docinto lib/perl
dodoc lib/perl/README
fi
-   unset DOCS
+}
+
+src_test() {
+   python_foreach_impl python_test
+}
+
+python_install() {
pushd "lib/python" || die
-   python_foreach_impl distutils-r1_python_install
+   distutils-r1_python_install
popd || die
-#  pushd "appqos" || die
-#  python_foreach_impl distutils-r1_python_install
-#  popd || die
+
+#  python_domodule appqos
 }
 
-src_test() {
+python_test() {
pushd "lib/python" || die
-   python_foreach_impl python_test
+   eunittest
popd || die
+
 #  pushd "appqos" || die
-#  python_foreach_impl python_test
+#  epytest -vv tests
 #  popd || die
 }

[gentoo-commits] repo/proj/guru:dev commit in: sys-apps/intel-cmt-cat/, sys-apps/intel-cmt-cat/files/

2021-08-24 Thread Alessandro Barbieri 
commit: 48688d49de7264603504f4c3807d40ee09e5428a
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Aug 25 01:38:54 2021 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Wed Aug 25 01:51:18 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=48688d49

sys-apps/intel-cmt-cat: initial import

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-apps/intel-cmt-cat/Manifest|   1 +
 .../files/intel-cmt-cat-perl-makefile.patch|  22 +
 sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild  | 108 +
 sys-apps/intel-cmt-cat/metadata.xml|  51 ++
 4 files changed, 182 insertions(+)

diff --git a/sys-apps/intel-cmt-cat/Manifest b/sys-apps/intel-cmt-cat/Manifest
new file mode 100644
index 0..59cfff0d6
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/Manifest
@@ -0,0 +1 @@
+DIST intel-cmt-cat-4.2.0.tar.gz 470596 BLAKE2B 
781e69a7019a27e87b6b6c8d2c914305a837d019cadf8d1b6221942c631e0e46531a292379d7979ae88e7a590b155bc4e5a62777bdd9ebfb2881471ef64bfa32
 SHA512 
ccfae2e3fa5bb8b7dfe5ed39ab20a8526eb759378aeb14fb7ed79f4f94820cd69e497c9e7d411f1d9ec40c07ca4c7c4f2db6ff1e034a8517c01c06bd8a70d4b6

diff --git a/sys-apps/intel-cmt-cat/files/intel-cmt-cat-perl-makefile.patch 
b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-perl-makefile.patch
new file mode 100644
index 0..39b9a553e
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/files/intel-cmt-cat-perl-makefile.patch
@@ -0,0 +1,22 @@
+--- a/lib/perl/Makefile.PL
 b/lib/perl/Makefile.PL
+@@ -42,8 +42,8 @@
+ WriteMakefile(
+   'NAME'=> 'pqos',
+   'VERSION' => "0.1",
+-  'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value",
+-  'LIBS'=> ['-lpqos', '-L/usr/local/lib -lpqos'],
++  'CCFLAGS' => "$Config{ccflags} -Wno-unused-variable -Wno-unused-value 
-I..",
++  'LIBS'=> ['-lpqos', '-L.. -lpqos'],
+   'OBJECT'  => 'pqos_wrap.o',
+   'clean'   => {FILES => "pqos_wrap.c"},
+ );
+@@ -56,7 +56,7 @@
+ 
+   my $swig_target = <<"SWIG_MAKEFILE";
+ pqos_wrap.c:
+-  $swig -perl -outdir \$(INST_LIB) -I/usr/local/include 
\$(EXTRA_SWIGFLAGS) pqos.i
++  $swig -perl -outdir \$(INST_LIB) -I.. \$(EXTRA_SWIGFLAGS) pqos.i
+ SWIG_MAKEFILE
+ 
+   my $perltidy_targets = <<'PERLTIDY_MAKEFILE';

diff --git a/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild 
b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
new file mode 100644
index 0..e65818eef
--- /dev/null
+++ b/sys-apps/intel-cmt-cat/intel-cmt-cat-4.2.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1 perl-module
+
+DESCRIPTION="User space software for Intel(R) Resource Director Technology"
+HOMEPAGE="
+   
http://www.intel.com/content/www/us/en/architecture-and-technology/resource-director-technology.html
+   https://github.com/intel/intel-cmt-cat
+"
+SRC_URI="https://github.com/intel/intel-cmt-cat/archive/refs/tags/v${PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="perl"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   perl? ( dev-lang/perl:= )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}/${PN}-perl-makefile.patch" )
+
+distutils_enable_tests unittest
+
+src_prepare() {
+   mkdir -p "${T}/prefix" || die
+
+   distutils-r1_python_prepare_all
+}
+
+src_compile() {
+   emake all PREFIX="${T}/prefix"
+
+   if use perl; then
+   pushd "lib/perl" || die
+   perl-module_src_configure
+   perl-module_src_compile
+   popd || die
+   fi
+   pushd "lib/python" || die
+   python_foreach_impl distutils-r1_python_compile
+   popd || die
+#  pushd "appqos" || die
+#  python_foreach_impl distutils-r1_python_compile
+#  popd || die
+}
+
+src_install() {
+   emake install PREFIX="${T}/prefix"
+
+   dobin "${T}"/prefix/bin/*
+   doheader "${T}"/prefix/include/*
+   doman "${T}"/prefix/man/man*/*
+   dolib.so "${T}"/prefix/lib/*
+
+   dobin tools/membw/membw
+   dobin snmp/rdt-agentx.pl
+
+   dodoc ChangeLog README
+   docinto membw
+   dodoc tools/membw/README
+   docinto pqos
+   dodoc -r pqos/README pqos/configs
+   docinto lib
+   dodoc lib/README
+   docinto lib/python
+   dodoc lib/python/README.txt
+   docinto snmp
+   dodoc snmp/README
+   docinto rdtset
+   dodoc rdtset/README
+   docinto appqos
+   dodoc appqos/README.md
+
+   if use perl ; then
+   pushd "lib/perl" || die
+   unset DOCS
+   myinst=( DESTDIR="${D}" )
+   perl-module_src_install
+   popd || die
+   docinto lib/perl
+   dodoc lib/perl/README
+   fi
+   unset DOCS
+   pushd