From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B2DC158086 for ; Sun, 24 Oct 2021 03:21:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85D4FE0827; Sun, 24 Oct 2021 03:21:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 51945E0827 for ; Sun, 24 Oct 2021 03:21:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C50DF3409EB for ; Sun, 24 Oct 2021 03:21:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B9F779 for ; Sun, 24 Oct 2021 03:21:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1635045701.784d85246bab32bfd9491dd8e281f7f9c6100395.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/wcd/files/, app-misc/wcd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/wcd/files/wcd-6.0.3-doc-path.patch app-misc/wcd/wcd-6.0.3-r2.ebuild X-VCS-Directories: app-misc/wcd/files/ app-misc/wcd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 784d85246bab32bfd9491dd8e281f7f9c6100395 X-VCS-Branch: master Date: Sun, 24 Oct 2021 03:21:52 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ffdffbd-98ee-42b3-a151-a8c82d9ee68a X-Archives-Hash: 93c7bc2c399005b908b65b6836ced439 commit: 784d85246bab32bfd9491dd8e281f7f9c6100395 Author: Matthew White inventati org> AuthorDate: Sat Oct 23 17:29:44 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Oct 24 03:21:41 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=784d8524 app-misc/wcd: fix docs installed into unexpected path Install docs into /usr/share/doc/wcd-${PVR}. Closes: https://bugs.gentoo.org/802696 Package-Manager: Portage-3.0.20-r6, Repoman-3.0.3-r1 Signed-off-by: Matteo Bianco inventati.org> Closes: https://github.com/gentoo/gentoo/pull/22685 Signed-off-by: Sam James gentoo.org> app-misc/wcd/files/wcd-6.0.3-doc-path.patch | 14 +++++++++ app-misc/wcd/wcd-6.0.3-r2.ebuild | 47 +++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/app-misc/wcd/files/wcd-6.0.3-doc-path.patch b/app-misc/wcd/files/wcd-6.0.3-doc-path.patch new file mode 100644 index 00000000000..16e850a8baa --- /dev/null +++ b/app-misc/wcd/files/wcd-6.0.3-doc-path.patch @@ -0,0 +1,14 @@ +Install docs into /usr/share/doc/wcd-${PVR}. + +diff -Nuar a/src/Makefile b/src/Makefile +--- a/src/Makefile 2019-08-14 10:07:15.000000000 +0000 ++++ b/src/Makefile 2021-10-23 17:10:17.000000000 +0000 +@@ -61,7 +61,7 @@ + datarootdir = $(prefix)/share + datadir = $(datarootdir) + +-docsubdir = $(PACKAGE)-$(VERSION) ++docsubdir = $(PACKAGE)-$(PVR) + docdir = $(datarootdir)/doc/$(docsubdir) + localedir = $(datarootdir)/locale + sysconfdir = /etc diff --git a/app-misc/wcd/wcd-6.0.3-r2.ebuild b/app-misc/wcd/wcd-6.0.3-r2.ebuild new file mode 100644 index 00000000000..7c052415034 --- /dev/null +++ b/app-misc/wcd/wcd-6.0.3-r2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Wherever Change Directory" +HOMEPAGE="http://waterlan.home.xs4all.nl/#WCD_ANCHOR" +SRC_URI="http://waterlan.home.xs4all.nl/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="nls unicode" + +CDEPEND=" + sys-libs/ncurses:=[unicode(+)?] + unicode? ( dev-libs/libunistring:= )" +DEPEND="${CDEPEND}" +BDEPEND=" + app-text/ghostscript-gpl + virtual/pkgconfig +" +RDEPEND="${CDEPEND}" + +S="${WORKDIR}/${P}/src" + +src_prepare() { + eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch + eapply -p2 "${FILESDIR}"/${P}-doc-path.patch + eapply_user + tc-export CC PKG_CONFIG +} + +src_compile() { + local mycompile="LFS=1" + use nls || mycompile+=" ENABLE_NLS=" + use unicode && mycompile+=" UCS=1 UNINORM=1" + emake ${mycompile} +} + +src_install() { + local DOCS=( ../README.txt ) + default + emake DESTDIR="${D}" DOTWCD=1 install-profile sysconfdir="/etc" +}