commit: ad7db643993fab0a96686549bdee2d54c8019000 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Thu Dec 25 18:25:58 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Thu Dec 25 18:25:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ad7db643
Revert "Fix CMake install rules and packaging issues" This reverts commit d8632370378c2980486125fa818b501a02d2a80b. Signed-off-by: David Roman <davidroman96 <AT> gmail.com> app-misc/gentoo-update/Manifest | 3 +- app-misc/gentoo-update/gentoo-update-0.1.ebuild | 68 ++++++++++++++++++++++++ app-misc/gentoo-update/gentoo-update-0.2.ebuild | 36 ++++++++++--- app-misc/gentoo-update/gentoo-update-9999.ebuild | 29 ---------- metadata/layout.conf | 13 ++++- 5 files changed, 111 insertions(+), 38 deletions(-) diff --git a/app-misc/gentoo-update/Manifest b/app-misc/gentoo-update/Manifest index 8cbb948d10..6e6ddf6aa5 100644 --- a/app-misc/gentoo-update/Manifest +++ b/app-misc/gentoo-update/Manifest @@ -1 +1,2 @@ -DIST gentoo-update-0.2.tar.gz 27700 BLAKE2B 6dc5afd8a50c5192cb411972e4276a71f8b69add7ef7153b819b5c4610dd5a90aebc0a7480e3fbce8a9d1a1c8c74dd6d72a7f9c4e22d5ebb43c29dcbe591f0c7 SHA512 8f52e1dbe264e9496abfdd5a3916426343144eaa0ebbdc329b7c622d0cf5ee079d59d68ddae306032461538c6dd891a54c364e56faf34fa19d09dc3ab07ce342 +DIST gentoo-update-0.1.tar.gz 27762 BLAKE2B 6a4422aeec4f6e8fb20f1bc3ef050a20b652d04211f5d2df95f9c04a024ad821db980ba5e6fb39360bdf266ae74da8dbd86c30b8e3e79fea43fcc1cacea9fbf9 SHA512 b903e53582f90a9ae3010b12b85e94407e988ef1cc1ce1863290c0f0ecaf3fd2167c85858147be69d88bd03f7b25ad8aaf63e2e33cf0be685bd9261d5db561c9 +DIST gentoo-update-0.2.tar.gz 27663 BLAKE2B 6a18bdd46a5019f81642d256a9bdf77ee6de8c612b82ed046f0872800d4529a840a7a030348243f7dafd18ed7d873057e58ba4250382e41bc0979912d2fcb6a1 SHA512 561fa2abb085989a1360adfc9ceb014eed24c57c0cf5dbc126e14c98c71f4c83c26885c2a60b85e609762c6583a33d0e818065e91d66d4da3e21e9d8f27c751e diff --git a/app-misc/gentoo-update/gentoo-update-0.1.ebuild b/app-misc/gentoo-update/gentoo-update-0.1.ebuild new file mode 100644 index 0000000000..21d4e207b3 --- /dev/null +++ b/app-misc/gentoo-update/gentoo-update-0.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake systemd + +DESCRIPTION="Update notifier and applier for Gentoo Linux" +HOMEPAGE="https://github.com/Techoraye/gentoo-update"; +SRC_URI="https://github.com/Techoraye/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="gui" + +RDEPEND=" + app-portage/gentoolkit + sys-apps/portage + gui? ( + dev-python/PyQt6[gui] + x11-libs/libnotify + ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + insinto /etc/${PN} + newins res/config/${PN}.conf.example ${PN}.conf + + newbashcomp res/completions/${PN}.bash ${PN} + + insinto /usr/share/zsh/site-functions + newins res/completions/${PN}.zsh _${PN} + + insinto /usr/share/fish/vendor_completions.d + doins res/completions/${PN}.fish + + if use gui; then + domenu res/desktop/${PN}.desktop + domenu res/desktop/${PN}-tray.desktop + fi + + systemd_dounit res/systemd/${PN}.service + systemd_dounit res/systemd/${PN}.timer + use gui && systemd_dounit res/systemd/${PN}-tray.service + + newinitd res/openrc/${PN} ${PN} +} + +pkg_postinst() { + elog "Configuration file: /etc/${PN}/${PN}.conf" + elog "See 'man ${PN}' or ${PN} --help for usage information" + + if use gui; then + elog "" + elog "GUI support is enabled. Run '${PN} --tray' for the system tray applet." + fi +} \ No newline at end of file diff --git a/app-misc/gentoo-update/gentoo-update-0.2.ebuild b/app-misc/gentoo-update/gentoo-update-0.2.ebuild index de8d3f3521..6ceaf47de4 100644 --- a/app-misc/gentoo-update/gentoo-update-0.2.ebuild +++ b/app-misc/gentoo-update/gentoo-update-0.2.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Update notifier and applier for Gentoo Linux" HOMEPAGE="https://github.com/Techoraye/gentoo-update"; SRC_URI="https://github.com/Techoraye/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3-or-later" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" IUSE="gui" @@ -18,14 +18,16 @@ RDEPEND=" app-portage/gentoolkit sys-apps/portage gui? ( - dev-python/PyQt6 + dev-python/PyQt6[gui,network] x11-libs/libnotify ) " DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_configure() { local mycmakeargs=( + -DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var" -DENABLE_GUI=$(usex gui) ) cmake_src_configure @@ -33,15 +35,35 @@ src_configure() { src_install() { cmake_src_install + + insinto /etc/${PN} + newins res/config/${PN}.conf.example ${PN}.conf + + newbashcomp res/completions/${PN}.bash ${PN} + + insinto /usr/share/zsh/site-functions + newins res/completions/${PN}.zsh _${PN} + + insinto /usr/share/fish/vendor_completions.d + doins res/completions/${PN}.fish + + if use gui; then + domenu res/desktop/${PN}.desktop + domenu res/desktop/${PN}-tray.desktop + fi + + systemd_dounit res/systemd/${PN}.service + systemd_dounit res/systemd/${PN}.timer + use gui && systemd_dounit res/systemd/${PN}-tray.service + + newinitd res/openrc/${PN} ${PN} } pkg_postinst() { - elog "Configuration example:" - elog " /usr/share/${PN}/config/${PN}.conf.example" - elog "Copy it to /etc/${PN}/${PN}.conf and adjust as needed." + elog "Configuration: /etc/${PN}/${PN}.conf" if use gui; then - elog "Run '${PN} --tray' to start the system tray applet." + elog "Run '${PN} --tray' for the system tray applet" fi if systemd_is_booted; then @@ -51,4 +73,4 @@ pkg_postinst() { elog "Enable automatic updates:" elog " rc-update add ${PN} default" fi -} +} \ No newline at end of file diff --git a/app-misc/gentoo-update/gentoo-update-9999.ebuild b/app-misc/gentoo-update/gentoo-update-9999.ebuild deleted file mode 100644 index 817cf4f96a..0000000000 --- a/app-misc/gentoo-update/gentoo-update-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -EAPI=8 - -inherit git-r3 cmake systemd - -DESCRIPTION="Update notifier and applier for Gentoo Linux" -HOMEPAGE="https://github.com/Techoraye/gentoo-update"; -EGIT_REPO_URI="https://github.com/Techoraye/gentoo-update.git"; - -LICENSE="GPL-3-or-later" -SLOT="0" -KEYWORDS="" -IUSE="gui" - -RDEPEND=" - app-portage/gentoolkit - sys-apps/portage - gui? ( - dev-python/PyQt6 - x11-libs/libnotify - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - -DENABLE_GUI=$(usex gui) - ) - cmake_src_configure -} diff --git a/metadata/layout.conf b/metadata/layout.conf index 9c5c658d95..f272180b21 100644 --- a/metadata/layout.conf +++ b/metadata/layout.conf @@ -1,2 +1,13 @@ masters = gentoo -auto-sync = no + +# Please keep this reasonably in sync with ::gentoo +manifest-hashes = BLAKE2B SHA512 +manifest-required-hashes = BLAKE2B +update-changelog = false +cache-formats = md5-dict +thin-manifests = true +sign-commits = true +sign-manifests = false + +# Let's start with new EAPIs if possible +eapis-banned = 0 1 2 3 4 5 6
