Diff fvwm3-1.0.4-r2 with a fvwm3-1.0.6a

/usr/portage/x11-wm/fvwm3/fvwm3-1.0.6a.ebuild 2023-10-09 14:52:36.000368514 +0300
22 22
LICENSE="GPL-2+ FVWM
23 23
	go? ( Apache-2.0 BSD MIT )"
24 24
SLOT="0"
25
IUSE="bidi debug doc go netpbm nls perl readline stroke svg tk vanilla lock"
25
IUSE="bidi debug doc +go netpbm nls perl readline stroke svg tk lock"
26 26
REQUIRED_USE="
27 27
	${PYTHON_REQUIRED_USE}"
28 28

  
29 29
DOCS=( NEWS )
30 30

  
31 31
if [[ ${PV} == 9999 ]]; then
32
	DOCS+=( dev-docs/COMMANDS dev-docs/DEVELOPERS.md dev-docs/INSTALL.md dev-docs/PARSING.md dev-docs/TODO.md dev-docs/NEW-COMMANDS.md )
32
	DOCS+=(
33
		dev-docs/COMMANDS
34
		dev-docs/DEVELOPERS.md
35
		dev-docs/INSTALL.md
36
		dev-docs/PARSING.md
37
		dev-docs/TODO.md
38
		dev-docs/NEW-COMMANDS.md
39
	)
33 40
fi
34 41

  
35 42
BDEPEND="
......
85 92
DEPEND="${COMMON_DEPEND}
86 93
	x11-base/xorg-proto"
87 94

  
88
PATCHES=(
89
	"${FILESDIR}/${P}-translucent-menus.patch"
90
)
91

  
92
if [[ ${PV} == 9999 ]]; then
93
	PATCHES+=(
94
		"${FILESDIR}/${P}-goflags.patch"
95
	)
96
fi
97

  
98 95
src_prepare() {
99 96
	default
100
	if use doc; then
101
		eapply "${FILESDIR}/${P}-htmldoc.patch"
102
	fi
97
	use go && ( sed -e 's/GOFLAGS=-ldflags="-s -w"/GOFLAGS=/' \
98
		-i bin/FvwmPrompt/Makefile.am || die )
99
	# Patch configure to allow later go versions
100
	sed -e 's/1.19\*)$/1.19*|1.20*|1.21*)/' -i configure.ac || die
103 101

  
104 102
	eautoreconf
105 103
}
......
128 126
		$(use_with readline readline-library)
129 127
		$(use_enable svg rsvg)
130 128
		--enable-png
131
		--enable-xft
132 129
	)
133 130

  
134 131
	use readline && myconf+=( --without-termcap-library )
135 132

  
136
	econf ${myconf[@]}
133
	econf "${myconf[@]}"
137 134
}
138 135

  
139 136
src_compile() {
140 137
	PREFIX="${EPREFIX}/usr" emake AR="$(tc-getAR)"
141 138
	if [[ ${PV} == *9999 ]]; then
142
		use doc && emake -C doc html
139
		use doc && emake -C doc
143 140
	fi
144 141
}
145 142

  
......
148 145

  
149 146
	dodir /etc/X11/Sessions
150 147
	echo "/usr/bin/fvwm3" > "${ED}/etc/X11/Sessions/${PN}" || die
151
	fperms a+x /etc/X11/Sessions/${PN} || die
148
	fperms a+x "/etc/X11/Sessions/${PN}" || die
152 149

  
153 150
	python_scriptinto "/usr/bin"
154 151
	python_doscript "${ED}/usr/bin/FvwmCommand" "${ED}/usr/bin/fvwm-menu-desktop"
155
	if use doc; then
156
		if [[ ${PV} == *9999 ]]; then
157
			HTML_DOCS=( doc/*.html )
158
		else
159
			HTML_DOCS=( doc/html/*.html )
160
		fi
161
	fi
162 152
	einstalldocs
163 153

  
164 154
	make_session_desktop fvwm3 /usr/bin/fvwm3
......
168 158
	if use go; then
169 159
		ewarn "FvwmPrompt has been installed, it provides the functionality of both FvwmCommand and FvwmConsole."
170 160
		ewarn "For compatibility with the existing fvwm2 configurations, the ebuild will install a FvwmCommand wrapper script."
171
		ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\", but FvwmPrompt and FvwmCommnd will not be installed."
161
		ewarn "If you need FvwmConsole, install ${PN} with USE=\"-go\", but FvwmPrompt and FvwmCommand will not be installed."
172 162
	else
173
		ewarn "Fvwmconsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
163
		ewarn "FvwmConsole has been installed, but FvwmCommand and FvwmPrompt are no longer included in this ebuild."
174 164
		ewarn "If you need FvwmPrompt or FvwmCommand, install ${PN} with USE=\"go\"."
175 165
		ewarn "In that case, FvwmPrompt will replace FvwmConsole and provide the same functionality in a more flexible way."
176 166
	fi
Thank you!