commit: 4fc6a95fc53f4164f0f4f9b97409de9ea0bc3be7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 29 16:50:07 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Aug 29 19:02:34 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc6a95f
x11-misc/xdg-utils: drop 1.1.3_p20210805-r2, 1.2.1-r1, 1.2.1-r2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/xdg-utils/Manifest | 2 - x11-misc/xdg-utils/files/xdg-utils-egrep.patch | 25 ------ .../xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild | 89 --------------------- x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild | 92 ---------------------- 4 files changed, 208 deletions(-) diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest index fcc0588cf220..671b77fc7043 100644 --- a/x11-misc/xdg-utils/Manifest +++ b/x11-misc/xdg-utils/Manifest @@ -1,3 +1 @@ -DIST xdg-utils-1.1.3_p20200220-no-which.patch.xz 5576 BLAKE2B cf8c3111689c355add2a0c16a887fd463dc2d00c267cac0561d4598430f043d19fea376859aa4ff521273ff788b4e8afdea5ef6e7b0ba51ffded23be2ad61335 SHA512 c30e512e8caae3f4d2282592722bc24e08cb33f5ec01d5504d2e49833c1598fe27807c095dc2226efca57dcbef4d2883fd9bfa46fb8eeee93c53f9880c050b51 -DIST xdg-utils-1.1.3_p20210805.tar.bz2 287544 BLAKE2B ec3755e5e6f596c5787324ab254ba14938f35dda6df5a4ef88fb582c5df7704e706dee2f4362cc0597164cf2aeab5cf8f5f6db1b9d374355723e3d738e101264 SHA512 ec51e98e4c73ad7cb3c77051617a939c7956c7da6bcbbcda4e54121af247ce6978c8638c80bc644a49cfca14b18f06cb25747719bc20c97f7e60b9b4f3597a71 DIST xdg-utils-v1.2.1.tar.bz2 293386 BLAKE2B 9d6ce4be8c27ad5b8d0ae55ad0d8b4457b59cb1bd260884ca5bfd2cb8ed7ed68a2f5a8db6d660ceabab59cbb9880fd4f1a26cb71a8f759ec40c2f9f95bbc8a05 SHA512 d5436449fec2f4db952239ee910bfda203955c8df8cb92379f182dc36f9c82b6ceb092ccbebfd02ed00eb7ef5f6895ef745baca67906ae7490e425db27b1dbfc diff --git a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch b/x11-misc/xdg-utils/files/xdg-utils-egrep.patch deleted file mode 100644 index 71608552a08b..000000000000 --- a/x11-misc/xdg-utils/files/xdg-utils-egrep.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7538458c6c8999296a272c40bd4ec24132a51877 Mon Sep 17 00:00:00 2001 -From: E5ten <[email protected]> -Date: Thu, 16 Jan 2020 02:06:09 +0000 -Subject: [PATCH] switch from non-standard "egrep" to POSIX "grep -E" - ---- - scripts/xdg-open.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in -index 202f3e3..35b0522 100644 ---- a/scripts/xdg-open.in -+++ b/scripts/xdg-open.in -@@ -72,7 +72,7 @@ get_key() - is_file_url_or_path() - { - if echo "$1" | grep -q '^file://' \ -- || ! echo "$1" | egrep -q '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then -+ || ! echo "$1" | grep -Eq '^[[:alpha:]][[:alpha:][:digit:]+\.\-]*:'; then - return 0 - else - return 1 --- -GitLab - diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild deleted file mode 100644 index 852bfc0c9eea..000000000000 --- a/x11-misc/xdg-utils/xdg-utils-1.1.3_p20210805-r2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -MY_COMMIT="1a58bc28f6844898532daf9ee1bf6da7764955a9" -DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"; -SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"; -# https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/24 -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.3_p20200220-no-which.patch.xz"; -S="${WORKDIR}"/xdg-utils-${MY_COMMIT} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc gnome X" -REQUIRED_USE="gnome? ( dbus )" - -RDEPEND=" - dev-util/desktop-file-utils - dev-perl/File-MimeInfo - dbus? ( - sys-apps/dbus - gnome? ( - dev-perl/Net-DBus - dev-perl/X11-Protocol - ) - ) - x11-misc/shared-mime-info - X? ( - x11-apps/xprop - x11-apps/xset - ) -" -BDEPEND=" - >=app-text/xmlto-0.0.28-r3[text(+)] - app-alternatives/awk -" - -DOCS=( ChangeLog README RELEASE_NOTES TODO ) - -# Tests run random system programs, including interactive programs -# that block forever -RESTRICT="test" - -PATCHES=( - "${WORKDIR}"/${PN}-1.1.3_p20200220-no-which.patch - # https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/21 - "${FILESDIR}"/${PN}-egrep.patch -) - -src_prepare() { - default - - # If you choose to do git snapshot instead of patchset, you need to remember - # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh - # all the files - eautoreconf -} - -src_configure() { - export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 - default - emake -C scripts scripts-clean -} - -src_install() { - default - - newdoc scripts/xsl/README README.xsl - use doc && dodoc -r scripts/html - - # Install default XDG_DATA_DIRS, bug #264647 - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local - echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local - doenvd 30xdg-data-local - - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base - echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base - doenvd 90xdg-data-base -} - -pkg_postinst() { - [[ -x $(type -P gtk-update-icon-cache) ]] \ - || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." -} diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild deleted file mode 100644 index 3f66355e2cb9..000000000000 --- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r2.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"; -if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="d4f00e1d803038af4f245949d8c747a384117852" - SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/${MY_COMMIT}/${P}.tar.bz2"; - S="${WORKDIR}"/xdg-utils-${MY_COMMIT} -else - SRC_URI="https://gitlab.freedesktop.org/xdg/xdg-utils/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"; - S="${WORKDIR}"/${PN}-v${PV} -fi - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc gnome X" -REQUIRED_USE="gnome? ( dbus )" - -RDEPEND=" - dev-util/desktop-file-utils - dev-perl/File-MimeInfo - dbus? ( - sys-apps/dbus - gnome? ( - dev-perl/Net-DBus - dev-perl/X11-Protocol - ) - ) - x11-misc/shared-mime-info - X? ( - x11-apps/xprop - x11-apps/xset - ) -" -BDEPEND=" - >=app-text/xmlto-0.0.28-r3[text(+)] - app-alternatives/awk -" - -# Tests run random system programs, including interactive programs -# that block forever -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${P}-xdg-mime-default.patch -) - -src_prepare() { - default - - if [[ ${PV} == *_p* ]] ; then - # If you choose to do git snapshot instead of patchset, you need to remember - # to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh - # all the files - eautoreconf - fi -} - -src_configure() { - export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166 - default - emake -C scripts scripts-clean -} - -src_install() { - default - - dodoc RELEASE_NOTES - - newdoc scripts/xsl/README README.xsl - use doc && dodoc -r scripts/html - - # Install default XDG_DATA_DIRS, bug #264647 - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local || die - echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local || die - doenvd 30xdg-data-local - - echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base || die - echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base || die - doenvd 90xdg-data-base -} - -pkg_postinst() { - [[ -x $(type -P gtk-update-icon-cache) ]] \ - || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command." -}
