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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ADBBD158091 for ; Sat, 18 Jun 2022 07:42:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3F34E0895; Sat, 18 Jun 2022 07:42:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5EA53E0895 for ; Sat, 18 Jun 2022 07:42:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F2203415E7 for ; Sat, 18 Jun 2022 07:42:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81CE1471 for ; Sat, 18 Jun 2022 07:42:29 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1655538123.3cbd2df8742ab6563ec8c69932eeedd10023c4ab.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm3/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild x11-wm/fvwm3/fvwm3-9999.ebuild X-VCS-Directories: x11-wm/fvwm3/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3cbd2df8742ab6563ec8c69932eeedd10023c4ab X-VCS-Branch: master Date: Sat, 18 Jun 2022 07:42:29 +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: c55621ee-5465-467b-a079-f52d02aa3bfd X-Archives-Hash: daee2773ee609fa606ab064ca4a23eaf commit: 3cbd2df8742ab6563ec8c69932eeedd10023c4ab Author: David Seifert gentoo org> AuthorDate: Sat Jun 18 07:42:03 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jun 18 07:42:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cbd2df8 x11-wm/fvwm3: [QA] remove userland_GNU Signed-off-by: David Seifert gentoo.org> .../fvwm3/{fvwm3-1.0.4-r1.ebuild => fvwm3-1.0.4-r2.ebuild} | 14 +++----------- x11-wm/fvwm3/fvwm3-9999.ebuild | 14 +++----------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild similarity index 96% rename from x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild rename to x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild index c835d0b587c9..0a0e5ddfb57a 100644 --- a/x11-wm/fvwm3/fvwm3-1.0.4-r1.ebuild +++ b/x11-wm/fvwm3/fvwm3-1.0.4-r2.ebuild @@ -20,14 +20,8 @@ else fi LICENSE="GPL-2+ FVWM - go? ( - Apache-2.0 - BSD - MIT - )" - + go? ( Apache-2.0 BSD MIT )" SLOT="0" - IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock" REQUIRED_USE=" ${PYTHON_REQUIRED_USE}" @@ -54,6 +48,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/libevent:= media-libs/fontconfig media-libs/libpng:= + sys-apps/debianutils sys-libs/zlib x11-libs/libICE x11-libs/libSM @@ -86,8 +81,7 @@ RDEPEND="${PYTHON_DEPS} svg? ( gnome-base/librsvg:2 x11-libs/cairo - ) - userland_GNU? ( sys-apps/debianutils )" + )" DEPEND="${COMMON_DEPEND} x11-base/xorg-proto" @@ -124,7 +118,6 @@ src_configure() { done local myconf=( - --prefix=/usr --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs $(use_enable bidi) @@ -137,7 +130,6 @@ src_configure() { $(use_enable svg rsvg) --enable-png --enable-xft - --docdir=/usr/share/doc/${P} ) use readline && myconf+=( --without-termcap-library ) diff --git a/x11-wm/fvwm3/fvwm3-9999.ebuild b/x11-wm/fvwm3/fvwm3-9999.ebuild index 57341a49d6c0..224ee2abd20a 100644 --- a/x11-wm/fvwm3/fvwm3-9999.ebuild +++ b/x11-wm/fvwm3/fvwm3-9999.ebuild @@ -20,14 +20,8 @@ else fi LICENSE="GPL-2+ FVWM - go? ( - Apache-2.0 - BSD - MIT - )" - + go? ( Apache-2.0 BSD MIT )" SLOT="0" - IUSE="bidi debug doc go netpbm nls perl readline rplay stroke svg tk vanilla lock" REQUIRED_USE=" ${PYTHON_REQUIRED_USE}" @@ -54,6 +48,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/libevent:= media-libs/fontconfig media-libs/libpng:= + sys-apps/debianutils sys-libs/zlib x11-libs/libICE x11-libs/libSM @@ -87,8 +82,7 @@ RDEPEND="${PYTHON_DEPS} svg? ( gnome-base/librsvg:2 x11-libs/cairo - ) - userland_GNU? ( sys-apps/debianutils )" + )" DEPEND="${COMMON_DEPEND} x11-base/xorg-proto" @@ -125,7 +119,6 @@ src_configure() { done local myconf=( - --prefix=/usr --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs $(use_enable bidi) @@ -137,7 +130,6 @@ src_configure() { $(use_with readline readline-library) $(use_enable svg rsvg) --enable-png - --docdir=/usr/share/doc/${P} ) use readline && myconf+=( --without-termcap-library )