From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0C2B51582EF for ; Sun, 23 Feb 2025 01:46:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id EC52334314B for ; Sun, 23 Feb 2025 01:46:26 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id F178D110481; Sun, 23 Feb 2025 01:45:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E3063110481 for ; Sun, 23 Feb 2025 01:45:55 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 878F9343177 for ; Sun, 23 Feb 2025 01:45:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2C8427CB for ; Sun, 23 Feb 2025 01:45:51 +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: <1740274466.e2e8c30aa11643fced0b5dd64003fe317f795d82.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cppunit/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild dev-util/cppunit/cppunit-9999.ebuild X-VCS-Directories: dev-util/cppunit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e2e8c30aa11643fced0b5dd64003fe317f795d82 X-VCS-Branch: master Date: Sun, 23 Feb 2025 01:45:51 +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: 7cf8d141-ef88-4022-bb76-c93c6451e524 X-Archives-Hash: 2b3b1ff99335b606a568e019c72d8fc4 commit: e2e8c30aa11643fced0b5dd64003fe317f795d82 Author: Sam James gentoo org> AuthorDate: Sun Feb 23 01:31:06 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sun Feb 23 01:34:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e8c30a dev-util/cppunit: add (restore) live ebuild This reverts commit b5e080853cf530fc860a28d1130e3a221779eefd. I suspect this was dropped for bug #811345 because it was stuck on EAPI 7, but see b1e013b0b2c6d9e9226bd5b575b64db5ab9e00c2. It's useful to have a live ebuild to quickly play with changes committed for LO's benefit. Bug: https://bugs.gentoo.org/811345 Signed-off-by: Sam James gentoo.org> dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild | 19 ++++++++++++------ ...1.15.1_p20240106.ebuild => cppunit-9999.ebuild} | 23 ++++++++++++---------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild b/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild index d3eb816ccc1a..3be3e5bdd5a2 100644 --- a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild +++ b/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild @@ -7,15 +7,22 @@ inherit autotools flag-o-matic multilib-minimal DESCRIPTION="C++ port of the famous JUnit framework for unit testing" HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit" -SRC_URI=" - https://dev-www.libreoffice.org/src/${P%%_p*}.tar.gz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P%%_p*}-patches.tar.xz -" -S="${WORKDIR}"/${P%%_p*} + +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git" +else + SRC_URI=" + https://dev-www.libreoffice.org/src/${P%%_p*}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P%%_p*}-patches.tar.xz + " + S="${WORKDIR}"/${P%%_p*} + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi LICENSE="LGPL-2.1" SLOT="0/1.15" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc examples" BDEPEND=" diff --git a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild b/dev-util/cppunit/cppunit-9999.ebuild similarity index 72% copy from dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild copy to dev-util/cppunit/cppunit-9999.ebuild index d3eb816ccc1a..675991b4bcd6 100644 --- a/dev-util/cppunit/cppunit-1.15.1_p20240106.ebuild +++ b/dev-util/cppunit/cppunit-9999.ebuild @@ -7,15 +7,22 @@ inherit autotools flag-o-matic multilib-minimal DESCRIPTION="C++ port of the famous JUnit framework for unit testing" HOMEPAGE="https://www.freedesktop.org/wiki/Software/cppunit" -SRC_URI=" - https://dev-www.libreoffice.org/src/${P%%_p*}.tar.gz - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P%%_p*}-patches.tar.xz -" -S="${WORKDIR}"/${P%%_p*} + +if [[ ${PV} == *9999 ]] ; then + inherit autotools git-r3 + EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git" +else + SRC_URI=" + https://dev-www.libreoffice.org/src/${P%%_p*}.tar.gz + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P%%_p*}-patches.tar.xz + " + S="${WORKDIR}"/${P%%_p*} + + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi LICENSE="LGPL-2.1" SLOT="0/1.15" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc examples" BDEPEND=" @@ -27,10 +34,6 @@ BDEPEND=" DOCS=( AUTHORS BUGS NEWS README THANKS TODO ChangeLog doc/FAQ ) -PATCHES=( - "${WORKDIR}"/${P%%_p*}-patches -) - src_prepare() { default