Diff wmii-3.9.2-r6 with a wmii-3.9.2-r7

/usr/portage/x11-wm/wmii/wmii-3.9.2-r7.ebuild 2023-10-09 14:52:36.004368514 +0300
1
# Copyright 1999-2021 Gentoo Authors
1
# Copyright 1999-2022 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6
inherit flag-o-matic multilib toolchain-funcs
6
inherit flag-o-matic toolchain-funcs
7 7

  
8 8
MY_P="wmii+ixp-${PV}"
9 9

  
10 10
DESCRIPTION="A dynamic window manager for X11"
11 11
HOMEPAGE="https://github.com/0intro/wmii"
12
SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
12
SRC_URI="https://dl.suckless.org/wmii/${MY_P}.tbz"
13 13

  
14 14
LICENSE="MIT"
15 15
SLOT="0"
......
37 37
# Force dynamic linking, bug #273332
38 38
MAKEOPTS="${MAKEOPTS} STATIC= -j1"
39 39

  
40
PATCHES=(
41
	"${FILESDIR}"/${PN}-3.9.2-libdir.patch
42
)
43

  
40 44
src_prepare() {
41 45
	default
46

  
42 47
	mywmiiconf=(
43 48
		PREFIX=/usr
44 49
		DOC=/usr/share/doc/${PF}
......
47 52
		CC="$(tc-getCC) -c"
48 53
		LD="$(tc-getCC)"
49 54
		AR="$(tc-getAR) crs"
50
		DESTDIR="${D}"
51
		LIBIXP=/usr/$(get_libdir)/libixp.so
55
		LIBIXP="${ESYSROOT}/usr/$(get_libdir)/libixp.so"
52 56
	)
53 57

  
54
	# punt internal copy of sys-libs/libixp #323037
58
	# Punt internal copy of sys-libs/libixp, bug #323037
55 59
	rm include/ixp{,_srvutil}.h || die
56 60
	sed -i -e '/libixp/d' Makefile || die
57 61

  
58
	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
59
	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115
62
	# bug #335083
63
	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die
64
	# bug #369115
65
	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die
60 66
}
61 67

  
62
src_configure() {
68
src_compile() {
69
	append-flags -I"${ESYSROOT}"/usr/include/freetype2
63 70
	append-flags -fcommon
64
	default
65
}
66 71

  
67
src_compile() {
68
	append-flags -I/usr/include/freetype2
69 72
	emake "${mywmiiconf[@]}"
70 73
}
71 74

  
72 75
src_install() {
73
	emake "${mywmiiconf[@]}" install
76
	emake "${mywmiiconf[@]}" DESTDIR="${D}" install
74 77

  
75
	echo "${PN}" > "${T}/${PN}" || die
78
	echo ${PN} > "${T}"/${PN} || die
76 79
	exeinto /etc/X11/Sessions
77
	doexe "${T}/${PN}"
80
	doexe "${T}"/${PN}
78 81

  
79 82
	insinto /usr/share/xsessions
80 83
	doins "${FILESDIR}"/${PN}.desktop
Thank you!