From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/
Date: Mon, 21 Oct 2019 20:28:10 +0000 (UTC) [thread overview]
Message-ID: <1571689663.ddfe3525c46f04a9c3b12a1a04ca42adfc529c98.pacho@gentoo> (raw)
commit: ddfe3525c46f04a9c3b12a1a04ca42adfc529c98
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 21 20:27:43 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Oct 21 20:27:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddfe3525
x11-misc/xdg-utils: Drop old
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
x11-misc/xdg-utils/Manifest | 1 -
.../files/xdg-utils-1.1.1-ktraderclient5.patch | 43 -------------
x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild | 71 ----------------------
3 files changed, 115 deletions(-)
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index c480c1765e7..d1b2a495141 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,2 +1 @@
-DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
deleted file mode 100644
index eee4684c17c..00000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-Date: Fri, 15 Apr 2016 11:17:37 +0200
-Subject: xdg-mime: support for KDE Frameworks 5.6
-
-
-diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index 129850f..63b8a82 100644
---- a/scripts/xdg-mime.in
-+++ b/scripts/xdg-mime.in
-@@ -428,13 +428,9 @@ defapp_kde()
- case "${KDE_SESSION_VERSION}" in
- 4)
- KTRADER=`which ktraderclient 2> /dev/null`
-- MIMETYPE="--mimetype"
-- SERVICETYPE="--servicetype"
- ;;
- 5)
- KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
-- MIMETYPE="--mimetype"
-- SERVICETYPE="--servicetype"
- ;;
- esac
- else
-@@ -442,8 +438,8 @@ defapp_kde()
- fi
- if [ -n "$KTRADER" ] ; then
- DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype"
-- trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \
-- | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2`
-+ trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \
-+ | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"`
- if [ -n "$trader_result" ] ; then
- basename "$trader_result"
- exit_success
-@@ -954,4 +950,3 @@ esac
- update_mime_database $xdg_base_dir
-
- exit_success
--
---
-cgit v0.10.2
-
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
deleted file mode 100644
index ddf9215344f..00000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
-# https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
-SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc +perl"
-
-RDEPEND="dev-util/desktop-file-utils
- x11-misc/shared-mime-info
- x11-apps/xprop
- x11-apps/xset
- perl? ( dev-perl/File-MimeInfo )"
-DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
-
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
-
-PATCHES=( "${FILESDIR}/${P}-ktraderclient5.patch" )
-
-RESTRICT="test" # Disabled because of sandbox violation(s)
-
-#S=${WORKDIR}/${MY_P}
-
-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
- if [[ -d ${WORKDIR}/patch ]]; then
- EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
- fi
- eautoreconf
- pushd scripts && make scripts-clean && popd
-}
-
-src_configure() {
- export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
- default
-}
-
-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."
-}
next reply other threads:[~2019-10-21 20:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 20:28 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-04 14:50 [gentoo-commits] repo/gentoo:master commit in: x11-misc/xdg-utils/, x11-misc/xdg-utils/files/ Pacho Ramos
2024-02-06 2:27 Sam James
2024-06-01 3:31 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1571689663.ddfe3525c46f04a9c3b12a1a04ca42adfc529c98.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox