From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-848469-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 4926E1384B4
for <garchives@archives.gentoo.org>; Tue, 24 Nov 2015 19:08:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 98CC021C0B2;
Tue, 24 Nov 2015 19:08:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2BB8B21C0B2
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Nov 2015 19:08:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id E8BD434076D
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Nov 2015 19:08:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D0036A3F
for <gentoo-commits@lists.gentoo.org>; Tue, 24 Nov 2015 19:08:00 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <1448392021.e7649a8af18c210b6141558dfb4840da04e90715.eva@gentoo>
Subject: [gentoo-commits] repo/gentoo:gnome-xdg-eclasses commit in: eclass/
X-VCS-Repository: repo/gentoo
X-VCS-Files: eclass/xdg.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: e7649a8af18c210b6141558dfb4840da04e90715
X-VCS-Branch: gnome-xdg-eclasses
Date: Tue, 24 Nov 2015 19:08:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b1240284-c0ca-4f3b-b8bf-fddad4271552
X-Archives-Hash: d6af4dcd8e6c1ecbda954b046a929d6b
commit: e7649a8af18c210b6141558dfb4840da04e90715
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 18:45:59 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 19:07:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7649a8a
xdg.eclass: drop unneeded old EAPI support
Should not have been there to start with since it is a new eclass.
eclass/xdg.eclass | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/eclass/xdg.eclass b/eclass/xdg.eclass
index e804d18..2ad0ada 100644
--- a/eclass/xdg.eclass
+++ b/eclass/xdg.eclass
@@ -15,7 +15,7 @@
inherit xdg-utils
case "${EAPI:-0}" in
- 0|1|2|3|4|5|6)
+ 4|5|6)
EXPORT_FUNCTIONS src_prepare pkg_preinst pkg_postinst pkg_postrm
;;
*) die "EAPI=${EAPI} is not supported" ;;
@@ -41,22 +41,19 @@ xdg_src_prepare() {
# Locations are stored in XDG_ECLASS_DESKTOPFILES and XDG_ECLASS_MIMEINFOFILES
# respectively.
xdg_pkg_preinst() {
- has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
- pushd "${ED}" > /dev/null || die
-
local f
+
XDG_ECLASS_DESKTOPFILES=()
while IFS= read -r -d '' f; do
XDG_ECLASS_DESKTOPFILES+=( ${f} )
- done < <(find 'usr/share/applications' -type f -print0 2>/dev/null)
+ done < <(cd "${D}" && find 'usr/share/applications' -type f -print0 2>/dev/null)
XDG_ECLASS_MIMEINFOFILES=()
while IFS= read -r -d '' f; do
XDG_ECLASS_MIMEINFOFILES+=( ${f} )
- done < <(find 'usr/share/mime' -type f -print0 2>/dev/null)
+ done < <(cd "${D}" && find 'usr/share/mime' -type f -print0 2>/dev/null)
export XDG_ECLASS_DESKTOPFILES XDG_ECLASS_MIMEINFOFILES
- popd > /dev/null || die
}
# @FUNCTION: xdg_pkg_postinst