From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 635B6138262 for ; Mon, 23 May 2016 19:29:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05657141E3; Mon, 23 May 2016 19:29:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C39B141E3 for ; Mon, 23 May 2016 19:29:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EED4340AA7 for ; Mon, 23 May 2016 19:29:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D95D336 for ; Mon, 23 May 2016 19:29:28 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1464031681.07b9fe5ed37d431386dee086cd292b6b149ebbb5.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/ntfs3g/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/ntfs3g/metadata.xml sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild X-VCS-Directories: sys-fs/ntfs3g/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 07b9fe5ed37d431386dee086cd292b6b149ebbb5 X-VCS-Branch: master Date: Mon, 23 May 2016 19:29:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 96188200-c75d-4a92-a007-cb0f9649702b X-Archives-Hash: 1c50cea16d946fe8a8acb8ca77b42a07 commit: 07b9fe5ed37d431386dee086cd292b6b149ebbb5 Author: Mike Frysinger gentoo org> AuthorDate: Mon May 23 19:28:01 2016 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon May 23 19:28:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b9fe5e sys-fs/ntfs3g: move symlinks back to /usr #578336 sys-fs/ntfs3g/metadata.xml | 2 ++ .../{ntfs3g-2016.2.22.ebuild => ntfs3g-2016.2.22-r1.ebuild} | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml index 51450c0..1b94ddb 100644 --- a/sys-fs/ntfs3g/metadata.xml +++ b/sys-fs/ntfs3g/metadata.xml @@ -27,6 +27,8 @@ file ownership, access right. Include internal version of ntfsprogs. + http://tuxera.com/forum/ cpe:/a:ntfs-3g:ntfs-3g + ntfs-3g diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild similarity index 88% rename from sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild rename to sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild index 4222ccd..9a0aca8 100644 --- a/sys-fs/ntfs3g/ntfs3g-2016.2.22.ebuild +++ b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r1.ebuild @@ -1,6 +1,5 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ EAPI=5 inherit eutils linux-info udev toolchain-funcs libtool @@ -13,7 +12,8 @@ HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/" SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz" LICENSE="GPL-2" -SLOT="0/86" +# The subslot matches the SONAME major #. +SLOT="0/87" KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr" @@ -50,6 +50,11 @@ pkg_setup() { src_prepare() { epatch "${PATCHES[@]}" + # Keep the symlinks in the same place we put the main binaries. + # Having them in / when all the progs are in /usr is pointless. + sed -i \ + -e 's:/sbin:$(sbindir):g' \ + {ntfsprogs,src}/Makefile.in || die #578336 # Note: patches apply to Makefile.in, so don't run autotools here. elibtoolize } @@ -60,7 +65,6 @@ src_configure() { --prefix="${EPREFIX}"/usr \ --exec-prefix="${EPREFIX}"/usr \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - --exec-prefix="${EPREFIX}"/usr \ $(use_enable debug) \ --enable-ldscript \ --disable-ldconfig \