public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dnf5/, sys-apps/dnf5/files/
@ 2024-07-28 12:22 Takuya Wakazono
  0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2024-07-28 12:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1e2360d46cbb8839d8382753f9d665f3aa6dbf36
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 28 12:19:42 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sun Jul 28 12:21:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1e2360d4

sys-apps/dnf5: new package, add 5.2.5.0

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 sys-apps/dnf5/Manifest                             |  1 +
 sys-apps/dnf5/dnf5-5.2.5.0.ebuild                  | 75 ++++++++++++++++++++++
 .../dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch | 10 +++
 .../dnf5/files/dnf5-5.2.5.0-sandbox-test.patch     | 18 ++++++
 sys-apps/dnf5/metadata.xml                         | 11 ++++
 5 files changed, 115 insertions(+)

diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest
new file mode 100644
index 000000000..626508bd3
--- /dev/null
+++ b/sys-apps/dnf5/Manifest
@@ -0,0 +1 @@
+DIST dnf5-5.2.5.0.tar.gz 1303914 BLAKE2B c9fd30aaa74e7e063b1ffbce645a839ba1b82aad92bae70299254a6a62e087246d006af58205f46720f57c1f1eb193eaabe323b6b8d67b31b4ce763b98e573f5 SHA512 9339bdb39a2b55006941909bd9c5e2ebba01258a15952952c346d88bb270cf51b2db91d1938b2bb8ace3c20c58dab3ec11b25454394d270de76580ea6ee49980

diff --git a/sys-apps/dnf5/dnf5-5.2.5.0.ebuild b/sys-apps/dnf5/dnf5-5.2.5.0.ebuild
new file mode 100644
index 000000000..3274237e9
--- /dev/null
+++ b/sys-apps/dnf5/dnf5-5.2.5.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Command-line package manager"
+HOMEPAGE="https://github.com/rpm-software-management/dnf5"
+SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="nls systemd test"
+PROPERTIES="test_network"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-arch/rpm-4.17.0
+	dev-cpp/sdbus-c++:=
+	dev-cpp/toml11
+	>=dev-db/sqlite-3.35.0:3
+	>=dev-libs/glib-2.46.0:2
+	dev-libs/json-c:=
+	dev-libs/libfmt:=
+	>=dev-libs/librepo-1.17.1
+	>=dev-libs/libsolv-0.7.25
+	dev-libs/libxml2
+	sys-apps/util-linux
+	>=sys-libs/libmodulemd-2.11.2
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/breathe
+	dev-python/sphinx
+	virtual/pkgconfig
+	test? (
+		app-arch/createrepo_c
+		dev-util/cppunit
+	)
+"
+
+PATCHES=(
+	# Prevent empty cache directory from being created.
+	"${FILESDIR}/${P}-remove-empty-dir.patch"
+	# Prevent test suite from writing to system files.
+	"${FILESDIR}/${P}-sandbox-test.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# Replace hardcoded TMPDIR.
+	# sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_HTML=OFF
+		-DWITH_PERL5=OFF
+		-DWITH_PYTHON3=OFF
+		-DWITH_RUBY=OFF
+		-DWITH_ZCHUNK=OFF
+		-DWITH_SYSTEMD=$(usex systemd)
+		-DWITH_TESTS=$(usex test)
+		-DWITH_TRANSLATIONS=$(usex nls)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	cmake_src_compile doc-man
+}

diff --git a/sys-apps/dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch b/sys-apps/dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch
new file mode 100644
index 000000000..e82fdb6fa
--- /dev/null
+++ b/sys-apps/dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch
@@ -0,0 +1,10 @@
+--- a/libdnf5/CMakeLists.txt
++++ b/libdnf5/CMakeLists.txt
+@@ -136,7 +136,6 @@ configure_file("libdnf5.pc.in" ${CMAKE_CURRENT_BINARY_DIR}/libdnf5.pc @ONLY)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdnf5.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
+ 
+ # Makes an empty directory for libdnf5 cache
+-install(DIRECTORY DESTINATION "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/cache/libdnf5")
+ 
+ # Makes an empty directory for libdnf5 distribution drop-in configuration files
+ install(DIRECTORY DESTINATION "${CMAKE_INSTALL_PREFIX}/share/dnf5/libdnf.conf.d")

diff --git a/sys-apps/dnf5/files/dnf5-5.2.5.0-sandbox-test.patch b/sys-apps/dnf5/files/dnf5-5.2.5.0-sandbox-test.patch
new file mode 100644
index 000000000..2f5fe26da
--- /dev/null
+++ b/sys-apps/dnf5/files/dnf5-5.2.5.0-sandbox-test.patch
@@ -0,0 +1,18 @@
+Prevent test suite from writing to system files.
+--- a/test/data/build-rpms-and-repos.sh
++++ b/test/data/build-rpms-and-repos.sh
+@@ -32,12 +32,14 @@ function build_rpms() {
+ 
+     # Note: _build_name_fmt requires escaped %% for use in headerSprintf()
+     rpmbuild -ba \
++        --dbpath "${RPMBUILD_TOPDIR}" \
+         --define="_topdir ${RPMBUILD_TOPDIR}" \
+         --define="_srcrpmdir ${TARGET_DIR}" \
+         --define="_rpmdir ${TARGET_DIR}" \
+         --define="_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
+         --define="_source_payload w1.gzdio" \
+         --define="_binary_payload w1.gzdio" \
++        --nodeps \
+         "${SPEC}"
+ 
+     rm -rf "${RPMBUILD_TOPDIR}"

diff --git a/sys-apps/dnf5/metadata.xml b/sys-apps/dnf5/metadata.xml
new file mode 100644
index 000000000..2db61dc2c
--- /dev/null
+++ b/sys-apps/dnf5/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pastalian46@gmail.com</email>
+    <name>Takuya Wakazono</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rpm-software-management/dnf5</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dnf5/, sys-apps/dnf5/files/
@ 2024-12-09 12:21 Takuya Wakazono
  0 siblings, 0 replies; 2+ messages in thread
From: Takuya Wakazono @ 2024-12-09 12:21 UTC (permalink / raw
  To: gentoo-commits

commit:     677de1af8099db8225176b9119fd16e953475474
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Mon Dec  9 12:04:35 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Mon Dec  9 12:20:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=677de1af

sys-apps/dnf5: drop 5.2.6.0-r1

Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 sys-apps/dnf5/Manifest                             |  1 -
 sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild               | 80 ----------------------
 .../dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch | 10 ---
 3 files changed, 91 deletions(-)

diff --git a/sys-apps/dnf5/Manifest b/sys-apps/dnf5/Manifest
index f5ef0c36b..d54ae3200 100644
--- a/sys-apps/dnf5/Manifest
+++ b/sys-apps/dnf5/Manifest
@@ -1,3 +1,2 @@
-DIST dnf5-5.2.6.0.tar.gz 1345711 BLAKE2B 5f5eb39379ec8f50c5a2ba5a92eaf4adeb2eefd1ad4cfa1a73bd1a1dd0e91f2882967864524f520c512f03eb7d04f58515e5356513a3cb490d06e733051ca2d7 SHA512 4c1ccf77e0f34415df2cd1530672053d9acb53c10ca0880c1f7c4ad0fcbebf13ffa31a075d0ccd740969b48f0634b80d8c014ecd0eaa36bbce40d49f420a3216
 DIST dnf5-5.2.7.0.tar.gz 1571567 BLAKE2B 92dec0c3a89b6d6d15ff7c5cf683d906d72b8a52fac0d2473410dd3422c50970e97e621c07424aa9d8323ca623bf771b54edc991aa5d825bc141267bf9fe3c05 SHA512 f3ade5df924efc9b07e7e7f7e80cd940dd61b4bdcc48a5c093e87190e9e207083e0f19a2218958f9d36b390f2984deff3d2f5b5bc6953e62173bc567e5e060d7
 DIST dnf5-5.2.8.1.tar.gz 1628391 BLAKE2B 6a78cfcd9e139cf70af12fd8c206724e3a60b08574691cc86a96ae016ade28459a2fa8e594f071dd18b9605ecb2c0c24a7d3cff0745c0cbdca8edf8ba2ef705c SHA512 8a683aa47114b3bef240ade6b92ae25de197196a4c1d5ca802fa26672684e519dabb7c52cc3f9ad4c5f7ea09d05d026f5e930441b81a0ae71563f146ec9b3bd4

diff --git a/sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild b/sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild
deleted file mode 100644
index 53c63f2c5..000000000
--- a/sys-apps/dnf5/dnf5-5.2.6.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Command-line package manager"
-HOMEPAGE="https://github.com/rpm-software-management/dnf5"
-SRC_URI="https://github.com/rpm-software-management/dnf5/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="nls systemd test"
-PROPERTIES="test_network"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-arch/rpm-4.17.0
-	dev-cpp/sdbus-c++:0/1
-	dev-cpp/toml11
-	>=dev-db/sqlite-3.35.0:3
-	>=dev-libs/glib-2.46.0:2
-	dev-libs/json-c:=
-	dev-libs/libfmt:=
-	>=dev-libs/librepo-1.17.1
-	>=dev-libs/libsolv-0.7.25
-	dev-libs/libxml2
-	sys-apps/util-linux
-	>=sys-libs/libmodulemd-2.11.2
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/breathe
-	dev-python/sphinx
-	virtual/pkgconfig
-	test? (
-		app-arch/rpm
-		app-arch/createrepo_c
-		dev-util/cppunit
-	)
-"
-
-PATCHES=(
-	# Prevent empty cache directory from being created.
-	"${FILESDIR}/${PN}-5.2.5.0-remove-empty-dir.patch"
-	# Prevent test suite from writing to system files.
-	"${FILESDIR}/${PN}-5.2.5.0-sandbox-test.patch"
-	# bug #939518
-	"${FILESDIR}/${P}-remove-buggy-tests.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-	# Replace hardcoded TMPDIR.
-	sed -i "s|/tmp/|${T}/|" test/libdnf5/utils/test_fs.cpp || die
-	# remove -Werror{,=unused-result}; bug 936870
-	sed 's/-Werror[^[:space:])]*//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_HTML=OFF
-		-DWITH_PERL5=OFF
-		-DWITH_PYTHON3=OFF
-		-DWITH_RUBY=OFF
-		-DWITH_ZCHUNK=OFF
-		-DWITH_SYSTEMD=$(usex systemd)
-		-DWITH_TESTS=$(usex test)
-		-DWITH_TRANSLATIONS=$(usex nls)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	cmake_src_compile doc-man
-}

diff --git a/sys-apps/dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch b/sys-apps/dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch
deleted file mode 100644
index e82fdb6fa..000000000
--- a/sys-apps/dnf5/files/dnf5-5.2.5.0-remove-empty-dir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libdnf5/CMakeLists.txt
-+++ b/libdnf5/CMakeLists.txt
-@@ -136,7 +136,6 @@ configure_file("libdnf5.pc.in" ${CMAKE_CURRENT_BINARY_DIR}/libdnf5.pc @ONLY)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libdnf5.pc DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig)
- 
- # Makes an empty directory for libdnf5 cache
--install(DIRECTORY DESTINATION "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/cache/libdnf5")
- 
- # Makes an empty directory for libdnf5 distribution drop-in configuration files
- install(DIRECTORY DESTINATION "${CMAKE_INSTALL_PREFIX}/share/dnf5/libdnf.conf.d")


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-12-09 12:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-28 12:22 [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/dnf5/, sys-apps/dnf5/files/ Takuya Wakazono
  -- strict thread matches above, loose matches on Subject: below --
2024-12-09 12:21 Takuya Wakazono

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox