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 04FD91584AD for ; Thu, 01 May 2025 22:36:43 +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 BFD0D342FA7 for ; Thu, 01 May 2025 22:36:42 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 237A011036F; Thu, 01 May 2025 22:36:38 +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 1ACFC11036F for ; Thu, 01 May 2025 22:36:38 +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 BF56B341256 for ; Thu, 01 May 2025 22:36:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57CBF2668 for ; Thu, 01 May 2025 22:36:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1746138982.ea219064aafc1f3cd796221e259777e533990f8a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/pgmodeler/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/pgmodeler/pgmodeler-1.1.6.ebuild X-VCS-Directories: dev-db/pgmodeler/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ea219064aafc1f3cd796221e259777e533990f8a X-VCS-Branch: master Date: Thu, 01 May 2025 22:36:36 +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: 7e02d9b9-b34b-4093-8bd2-f55f5f63bb52 X-Archives-Hash: 2f801c2e1c7282e551edaad7371063b2 commit: ea219064aafc1f3cd796221e259777e533990f8a Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 1 22:30:22 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 1 22:36:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea219064 dev-db/pgmodeler: Drop install of LICENSE, use myqmakeargs array See also: https://github.com/gentoo/gentoo/pull/41377 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/pgmodeler/pgmodeler-1.1.6.ebuild | 34 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild b/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild index b34e95ae8974..8cde27304163 100644 --- a/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild +++ b/dev-db/pgmodeler/pgmodeler-1.1.6.ebuild @@ -21,18 +21,30 @@ DEPEND="${POSTGRES_DEP} " RDEPEND="${DEPEND}" +src_prepare() { + default + sed -e "/^doc.files/s/LICENSE //" -i pgmodeler.pro || die +} + src_configure() { - eqmake6 \ - DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ - PREFIX="${EPREFIX}/usr" \ - PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \ - PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \ - PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ - NO_UPDATE_CHECK="true" \ - -r ${PN}.pro + local myqmakeargs=( + DOCDIR="${EPREFIX}/usr/share/doc/${PF}" + PREFIX="${EPREFIX}/usr" + PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" + PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" + PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" + NO_UPDATE_CHECK="true" + ) + eqmake6 "${myqmakeargs[@]}" -r ${PN}.pro } src_test() { + local myqmakeargs=( + BINDIR="${T}" + SAMPLESDIR="${S}/assets/samples" + SCHEMASDIR="${S}/assets" + ) + pushd "${S}/tests" || die # skip tests with graphical interaction sed -e '/^src\/fileselectortest/d' \ @@ -50,11 +62,7 @@ src_test() { -e '/^src\/xmlparsertest/d' \ -i tests.pro || die - eqmake6 \ - BINDIR="${T}" \ - SAMPLESDIR="${S}/assets/samples" \ - SCHEMASDIR="${S}/assets" \ - tests.pro + eqmake6 "${myqmakeargs[@]}" tests.pro emake # append all shared-libs to LD_LIBRARY_PATH