Adding metadata

6 files changed, 95 insertions, 34 deletions

diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index cc1b76c77570..2e5405a0486e 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1 +1,2 @@
+DIST sysdig-0.27.0.tar.gz 933094 BLAKE2B e412bd2a35a62b580344a49e2deee85764710f91327cd63b42913dc361ee96943ffe51b90ee745c420454f0a4be455606d486a91ab3e103d7e396f04dc3f1ff4 SHA512 102150cc641165a6c18ce71e3c6148dc10700f614fec7e1909c29172e3cce02dfa16af56aabdcd420499d0aa89f90fee8f26d92a250b0a521d1b9d416c6a678f
 DIST sysdig-0.27.1.tar.gz 936415 BLAKE2B f4c15e3a2d4b974c5eafc8374f927dd82f123c05cc1976d04b08e77e1a7c0ff53f37c4e2c0022b7073fcc936310daf76ca3c3611141799ae4f51991bc6f3a0a3 SHA512 690f012c7db0a75ec2eb78fae17aae0f422aa1db0d4c2b15c4a09153fd2f60bd3c00d62238976fdcff2a906d87b2e34b81d02c0c78ad2684a1d6016a9988eb08
diff --git a/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch b/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch
index 44ba5c27b094..eaf689a54d0d 100644
--- a/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch
+++ b/dev-util/sysdig/files/sysdig-0.27.1-grpc-absl-sync.patch
@@ -1,6 +1,7 @@
-diff -rup sysdig-0.27.1/CMakeLists.txt sysdig-0.27.1-grpc-1.41/CMakeLists.txt
---- sysdig-0.27.1/CMakeLists.txt	2020-09-30 16:21:52.000000000 +0200
-+++ sysdig-0.27.1-grpc-1.41/CMakeLists.txt	2021-10-13 10:34:36.747939272 +0200
+https://bugs.gentoo.org/817128
+https://github.com/hhoffstaette/portage/blob/master/dev-util/sysdig/files/0.27.1-grpc-absl-sync.patch
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -552,6 +552,7 @@ if(NOT WIN32 AND NOT APPLE)
  			else()
  				message(FATAL_ERROR "Couldn't find system grpc")
@@ -9,9 +10,8 @@ diff -rup sysdig-0.27.1/CMakeLists.txt sysdig-0.27.1-grpc-1.41/CMakeLists.txt
  			find_program(GRPC_CPP_PLUGIN grpc_cpp_plugin)
  			if(NOT GRPC_CPP_PLUGIN)
  				message(FATAL_ERROR "System grpc_cpp_plugin not found")
-diff -rup sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt
---- sysdig-0.27.1/userspace/libsinsp/CMakeLists.txt	2020-09-30 16:21:52.000000000 +0200
-+++ sysdig-0.27.1-grpc-1.41/userspace/libsinsp/CMakeLists.txt	2021-10-13 10:37:18.330827194 +0200
+--- a/userspace/libsinsp/CMakeLists.txt
++++ b/userspace/libsinsp/CMakeLists.txt
 @@ -214,6 +214,10 @@ if(NOT WIN32)
  				"${JQ_LIB}"
  				"${B64_LIB}")
diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index 1fd492870a3a..239e34036ba2 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/metadata.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>dev@liguros.net</email>
-  <name>Development</name>
- </maintainer>
- <maintainer type="person">
-  <email>mgorny@gentoo.org</email>
-  <name>Michał Górny</name>
- </maintainer>
  
  <use>
-  <flag name="modules">Build kernel modules needed for tracing local events. Disable this only if you intend to use sysdig purely to work with dumpfiles.</flag>
+  <flag name="modules">Build kernel modules needed for tracing local
+			events. Disable this only if you intend to use sysdig purely
+			to work with dumpfiles.</flag>
  </use>
- <origin>ports</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-util/sysdig/sysdig-0.27.1-r102.ebuild b/dev-util/sysdig/sysdig-0.27.0.ebuild
index cb1d891d8be2..f415c1f52770 100644
--- a/dev-util/sysdig/sysdig-0.27.1-r102.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.0.ebuild
@@ -1,13 +1,9 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=8
 
-LUA_COMPAT=( lua5-{1,3,4} luajit )
-# Documentation says this might be needed but since the unmigrated ebuilds
-# did not enforce it, nor does this one.
-#LUA_REQ_USE="-lua52compat"
+EAPI=7
 
-inherit bash-completion-r1 cmake lua-single
+inherit bash-completion-r1 cmake
 
 DESCRIPTION="A system exploration and troubleshooting tool"
 HOMEPAGE="https://sysdig.com/"
@@ -16,13 +12,13 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
+IUSE="+modules test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="${LUA_DEPS}
+RDEPEND="
 	app-misc/jq:0=
 	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
 	>=dev-libs/jsoncpp-0.6_pre:0=
 	dev-libs/libb64:0=
 	dev-libs/protobuf:0=
@@ -30,8 +26,7 @@ RDEPEND="${LUA_DEPS}
 	net-libs/grpc:0=
 	sys-libs/ncurses:0=
 	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	net-misc/curl:0="
 DEPEND="${RDEPEND}
 	virtual/os-headers
@@ -41,7 +36,6 @@ PDEPEND="
 
 src_prepare() {
 	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-	eapply ${FILESDIR}/0.27.1-grpc-absl-sync.patch
 
 	cmake_src_prepare
 }
diff --git a/dev-util/sysdig/sysdig-0.27.1-r101.ebuild b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
index b5d45e04529b..cac136c424e5 100644
--- a/dev-util/sysdig/sysdig-0.27.1-r101.ebuild
+++ b/dev-util/sysdig/sysdig-0.27.1-r100.ebuild
@@ -1,5 +1,6 @@
-# Copyright 2021 Liguros Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=7
 
 LUA_COMPAT=( lua5-{1,3,4} luajit )
@@ -16,7 +17,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules test"
+IUSE="+modules test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -27,11 +28,10 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/libb64:0=
 	dev-libs/protobuf:0=
 	net-dns/c-ares:0=
-	<net-libs/grpc-1.40.0:0=
+	net-libs/grpc:0=
 	sys-libs/ncurses:0=
 	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
+	dev-libs/openssl:0=
 	net-misc/curl:0="
 DEPEND="${RDEPEND}
 	virtual/os-headers
@@ -39,6 +39,10 @@ DEPEND="${RDEPEND}
 PDEPEND="
 	modules? ( >=dev-util/sysdig-kmod-${PV} )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.27.1-grpc-absl-sync.patch
+)
+
 src_prepare() {
 	sed -i -e 's:-ggdb::' CMakeLists.txt || die
 
diff --git a/dev-util/sysdig/sysdig-0.27.1.ebuild b/dev-util/sysdig/sysdig-0.27.1.ebuild
new file mode 100644
index 000000000000..f415c1f52770
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.27.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 cmake
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://sysdig.com/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+modules test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-cpp/tbb:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	dev-libs/protobuf:0=
+	net-dns/c-ares:0=
+	net-libs/grpc:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	dev-libs/openssl:0=
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	test? ( dev-cpp/gtest )"
+PDEPEND="
+	modules? ( >=dev-util/sysdig-kmod-${PV} )"
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCREATE_TEST_TARGETS=$(usex test)
+
+		# done in dev-util/sysdig-kmod
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# remove sources
+	rm -r "${ED}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED}"/usr/etc || die
+}