From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CAFA15800F for ; Fri, 3 Feb 2023 16:53:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3D442E0636; Fri, 3 Feb 2023 16:53:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21FB7E0636 for ; Fri, 3 Feb 2023 16:53:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 23548335D91 for ; Fri, 3 Feb 2023 16:53:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A94D899 for ; Fri, 3 Feb 2023 16:53:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1675443098.fb830dbeedff348fc6d80661a6c01efb2ab90cb5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nDPI/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nDPI/Manifest net-libs/nDPI/nDPI-4.6.ebuild net-libs/nDPI/nDPI-9999.ebuild X-VCS-Directories: net-libs/nDPI/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fb830dbeedff348fc6d80661a6c01efb2ab90cb5 X-VCS-Branch: master Date: Fri, 3 Feb 2023 16:53:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f73894dd-8490-4c75-8dd5-9fda5043a7ff X-Archives-Hash: e6f9e32b9267a684bd2e6fb66f45fef6 commit: fb830dbeedff348fc6d80661a6c01efb2ab90cb5 Author: Sam James gentoo org> AuthorDate: Fri Feb 3 16:48:01 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 3 16:51:38 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb830dbe net-libs/nDPI: add 4.6 Signed-off-by: Sam James gentoo.org> net-libs/nDPI/Manifest | 1 + net-libs/nDPI/{nDPI-9999.ebuild => nDPI-4.6.ebuild} | 11 ++++++----- net-libs/nDPI/nDPI-9999.ebuild | 11 ++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/net-libs/nDPI/Manifest b/net-libs/nDPI/Manifest index eaf6229a8f6a..cc2200b5f302 100644 --- a/net-libs/nDPI/Manifest +++ b/net-libs/nDPI/Manifest @@ -1,2 +1,3 @@ DIST nDPI-4.2.tar.gz 126559327 BLAKE2B 079267939083e788ce8b13e89b194504031e4c3e628df335ece7aab72cc80b8d8538badd45dac9fdaeeed8cd5dd19a81fece9c1157cba9a91dfa130abef61473 SHA512 c58b228b7de2b5fa111234bb065f9be259cd0282d0058f5985180aab6567c9a18e3453ce9062bd3c057a096ec3dfdc21b7c9680e0148e34af10f707530d853b8 DIST nDPI-4.4.tar.gz 151062073 BLAKE2B fca968c0d0abcf18a6895dc6066b754925a2aa3cb3f395383f9add25066adf14bb95444a30950e13f7f22223ff203b16e7373c875841f33d8c885be83ed0bb6d SHA512 c5e3d38f7b6533bd4b9f96520c1d965bf0a8e3ec7e2d514bc42683bdb73d8331e28ed695f5d3972ace9e35f1af23359f5a25c0f5a20f7a8cc7a6b5446d592468 +DIST nDPI-4.6.tar.gz 29705235 BLAKE2B 65efdfee7af83093b08897fb726a07cf804a3ff901e7373cdc4b3d4564bbfba6ce9b498ab90172f437568c8275685dc51617e991216e38d515b3b5341760b964 SHA512 12dd50eeaae0aa5c2e3c89cb53cdb9989036759bd900312d3875eaba296646c2e42be31dc2b003cbc2401ccef8fbf8d2e460b9a604d7bece360f17f937d60cad diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-4.6.ebuild similarity index 75% copy from net-libs/nDPI/nDPI-9999.ebuild copy to net-libs/nDPI/nDPI-4.6.ebuild index e2efa26265f9..704e7b7703e2 100644 --- a/net-libs/nDPI/nDPI-9999.ebuild +++ b/net-libs/nDPI/nDPI-4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,10 +27,6 @@ RDEPEND="${DEPEND}" src_prepare() { default - sed -i \ - -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ - src/lib/Makefile.in || die - eautoreconf } @@ -52,5 +48,10 @@ src_test() { src_install() { default + # Makefile logic is broken in 4.6, let's wait a bit given history and + # go with hack for now. + mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die + mv "${ED}"/usr/usr/* "${ED}"/usr || die rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die + rm -rf "${ED}"/usr/usr || die } diff --git a/net-libs/nDPI/nDPI-9999.ebuild b/net-libs/nDPI/nDPI-9999.ebuild index e2efa26265f9..704e7b7703e2 100644 --- a/net-libs/nDPI/nDPI-9999.ebuild +++ b/net-libs/nDPI/nDPI-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -27,10 +27,6 @@ RDEPEND="${DEPEND}" src_prepare() { default - sed -i \ - -e "s%^libdir\s*=\s*\${prefix}/lib\s*$%libdir = \${prefix}/$(get_libdir)%" \ - src/lib/Makefile.in || die - eautoreconf } @@ -52,5 +48,10 @@ src_test() { src_install() { default + # Makefile logic is broken in 4.6, let's wait a bit given history and + # go with hack for now. + mv "${ED}"/usr/$(get_libdir)/pkgconfig "${ED}"/usr/usr/$(get_libdir)/pkgconfig || die + mv "${ED}"/usr/usr/* "${ED}"/usr || die rm "${ED}/usr/$(get_libdir)"/lib${PN,,}.a || die + rm -rf "${ED}"/usr/usr || die }