Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/fvwm/
Date: Sat, 28 Nov 2020 18:37:30
Message-Id: 1606588638.238cb71eca29bf405e4360fdafdb19e2fcec44b4.bman@gentoo
1 commit: 238cb71eca29bf405e4360fdafdb19e2fcec44b4
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 28 18:24:38 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 28 18:37:18 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238cb71e
7
8 x11-wm/fvwm: drop old
9
10 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
11
12 x11-wm/fvwm/Manifest | 1 -
13 x11-wm/fvwm/fvwm-2.6.5-r3.ebuild | 169 ---------------------------------------
14 2 files changed, 170 deletions(-)
15
16 diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
17 index c6d54f1c46a..d8a1292f91f 100644
18 --- a/x11-wm/fvwm/Manifest
19 +++ b/x11-wm/fvwm/Manifest
20 @@ -1,3 +1,2 @@
21 -DIST fvwm-2.6.5.tar.bz2 2582655 BLAKE2B 02c6f3124c0bb2ffe5dd25c218e4137977030ee6e96c7d20517e10dc93b85b295d941c700786f53231045b1b76e6d069b0387942ccf55b8543b0efe9ae303520 SHA512 a1b8cf5a5124b939441834a2fb44c885c579939e4099cf2c8178ea2c4261258df4e565068593699f9446e363135a2666c9288c1bce551a6cf5c6c79287104698
22 DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
23 DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
24
25 diff --git a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
26 deleted file mode 100644
27 index 62f0374f99b..00000000000
28 --- a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild
29 +++ /dev/null
30 @@ -1,169 +0,0 @@
31 -# Copyright 1999-2019 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=5
35 -inherit autotools eutils flag-o-matic
36 -
37 -DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
38 -HOMEPAGE="http://www.fvwm.org/"
39 -SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
40 -
41 -LICENSE="GPL-2 FVWM"
42 -SLOT="0"
43 -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86"
44 -IUSE="bidi debug doc gtk2-perl netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
45 -
46 -COMMON_DEPEND="
47 - sys-libs/zlib
48 - x11-libs/libICE
49 - x11-libs/libSM
50 - x11-libs/libX11
51 - x11-libs/libXau
52 - x11-libs/libxcb
53 - x11-libs/libXcursor
54 - x11-libs/libXdmcp
55 - x11-libs/libXext
56 - x11-libs/libXfixes
57 - x11-libs/libXpm
58 - x11-libs/libXrandr
59 - x11-libs/libXrender
60 - bidi? ( dev-libs/fribidi )
61 - png? ( media-libs/libpng:0= )
62 - readline? (
63 - sys-libs/ncurses:0=
64 - sys-libs/readline:0=
65 - )
66 - stroke? ( dev-libs/libstroke )
67 - svg? ( gnome-base/librsvg )
68 - truetype? (
69 - media-libs/fontconfig
70 - x11-libs/libXft
71 - )
72 - xinerama? ( x11-libs/libXinerama )
73 -"
74 -RDEPEND="${COMMON_DEPEND}
75 - dev-lang/perl
76 - gtk2-perl? ( dev-perl/Gtk2 )
77 - perl? ( tk? (
78 - dev-lang/tk
79 - dev-perl/Tk
80 - >=dev-perl/X11-Protocol-0.56
81 - )
82 - )
83 - rplay? ( media-sound/rplay )
84 - lock? ( x11-misc/xlockmore )
85 - userland_GNU? ( sys-apps/debianutils )
86 - !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
87 -"
88 -DEPEND="${COMMON_DEPEND}
89 - virtual/pkgconfig
90 - x11-base/xorg-proto
91 - doc? ( dev-libs/libxslt )
92 -"
93 -
94 -src_prepare() {
95 - if ! use vanilla; then
96 - # Enables fast translucent menus; patch from fvwm-user mailing list.
97 - epatch "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
98 -
99 - # Allow more mouse buttons, bug #411811
100 - epatch "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
101 -
102 - # Apply user-provided patches to the source tree, bug #411811
103 - epatch_user
104 - fi
105 -
106 - epatch "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
107 - epatch "${FILESDIR}/${PN}-2.6.8-perl528.patch" #674742
108 - eautoreconf
109 -}
110 -
111 -src_configure() {
112 - local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs --without-gnome"
113 -
114 - # Non-upstream email where bugs should be sent; used in fvwm-bug.
115 - export FVWM_BUGADDR="desktop-wm@g.o"
116 -
117 - # Recommended by upstream.
118 - append-flags -fno-strict-aliasing
119 -
120 - # Signed chars are required.
121 - use ppc && append-flags -fsigned-char
122 -
123 - myconf="${myconf} --disable-gtk"
124 -
125 - use readline && myconf="${myconf} --without-termcap-library"
126 -
127 - econf ${myconf} \
128 - $(use_enable bidi) \
129 - $(use_enable debug debug-msgs) \
130 - $(use_enable debug command-log) \
131 - $(use_enable doc htmldoc) \
132 - $(use_enable nls) \
133 - $(use_enable nls iconv) \
134 - $(use_enable perl perllib) \
135 - $(use_with png png-library) \
136 - $(use_with readline readline-library) \
137 - $(use_with rplay rplay-library) \
138 - $(use_with stroke stroke-library) \
139 - $(use_enable svg rsvg) \
140 - $(use_enable truetype xft) \
141 - $(use_enable xinerama) \
142 - --docdir="/usr/share/doc/${P}"
143 -}
144 -
145 -src_install() {
146 - emake DESTDIR="${D}" docdir="/usr/share/doc/${P}" install
147 -
148 - # These are always removed, because gentoo doesn't have anymore
149 - # a dev-perl/gtk-perl package, so, these modules are pointless.
150 - rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm"
151 - find "${D}" -name '*FvwmGtkDebug*' -exec rm -f '{}' \; 2>/dev/null
152 -
153 - if ! use lock; then
154 - find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
155 - fi
156 -
157 - if use perl; then
158 - if ! use tk; then
159 - rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm"
160 - if ! use gtk2-perl; then # no tk and no gtk2 bindings
161 - rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm"
162 - find "${D}/usr/share/fvwm/perllib" -depth -type d -exec rmdir '{}' \; 2>/dev/null
163 - fi
164 - fi
165 -
166 - # Now, the Gtk2.pm file, it will require dev-perl/Gtk2
167 - # so it implies gtk2 as well. That's why we need another use flag.
168 - if ! use gtk2-perl; then
169 - rm -f "${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm"
170 - fi
171 - else
172 - # Completely wipe it if ! use perl
173 - rm -rf "${D}/usr/bin/fvwm-perllib" \
174 - "${D}/usr/share/man/man1/fvwm-perllib.1"
175 - fi
176 -
177 - # Utility for testing FVWM behaviour by creating a simple window with
178 - # configurable hints.
179 - if use debug; then
180 - dobin "${S}/tests/hints/hints_test"
181 - newdoc "${S}/tests/hints/README" README.hints
182 - fi
183 -
184 - dodir /etc/X11/Sessions
185 - echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die
186 - fperms a+x /etc/X11/Sessions/${PN}
187 -
188 - dodoc AUTHORS ChangeLog NEWS README \
189 - docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \
190 - docs/{DEVELOPERS,error_codes,FAQ,TODO,fvwm.lsm}
191 -
192 - # README file for translucent menus patch.
193 - if ! use vanilla; then
194 - dodoc "${FILESDIR}"/README.translucency
195 - ewarn "You are using a patched build, so, please, don't"
196 - ewarn "report bugs at the fvwm-workers list unless you are"
197 - ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
198 - fi
199 -}