diff options
Diffstat (limited to 'x11-plugins')
| -rw-r--r-- | x11-plugins/wmmon+smp/Manifest | 2 | ||||
| -rw-r--r-- | x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild | 6 | ||||
| -rw-r--r-- | x11-plugins/wmswallow/Manifest | 2 | ||||
| -rw-r--r-- | x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild | 33 |
4 files changed, 27 insertions, 16 deletions
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest index fd5b8aef3ebe..ef5b773998ed 100644 --- a/x11-plugins/wmmon+smp/Manifest +++ b/x11-plugins/wmmon+smp/Manifest @@ -1 +1 @@ -DIST wmmon+smp.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94 +DIST wmmon+smp-1.0.tar.gz 15807 BLAKE2B e58ad4a1a6f9deb33e031f20674cd6ad4d0a558e84906a470a2b2802df1736dfac4f6a9ae0bfc5f36192684f59374d5cd1d5186ef505f9b4da26082d31f9c728 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94 diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild index 45c4bc627777..8c90cc0ff0cb 100644 --- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild +++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,10 +7,10 @@ inherit toolchain-funcs DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp" HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/" -SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz" +SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="amd64 ppc64 x86" RDEPEND=" diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest index ed945a89292c..a43de4916d9f 100644 --- a/x11-plugins/wmswallow/Manifest +++ b/x11-plugins/wmswallow/Manifest @@ -1 +1 @@ -DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc +DIST wmswallow-0.6.1.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild index d5ab7c82a729..5821727229a1 100644 --- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild +++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild @@ -1,34 +1,45 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils toolchain-funcs +EAPI=7 + +inherit flag-o-matic toolchain-funcs DESCRIPTION="A dock applet to make any application dockable" HOMEPAGE="https://www.dockapps.net/wmswallow" -SRC_URI="https://www.dockapps.net/download/${PN}.tar.Z" +SRC_URI="https://www.dockapps.net/download/${PN}.tar.Z -> ${P}.tar.Z" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" IUSE="" -RDEPEND="x11-libs/libX11 +RDEPEND=" + x11-libs/libX11 x11-libs/libXext" DEPEND="${RDEPEND} x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" -S=${WORKDIR}/wmswallow +S="${WORKDIR}/${PN}" +PATCHES=( "${FILESDIR}"/${P}-format-security.patch ) src_prepare() { - epatch "${FILESDIR}"/${P}-format-security.patch - sed -e "s:\${OBJS} -o:\${OBJS} \${LDFLAGS} -o:" \ - -e "/LIBS/s/-lXext/-lX11 \0/"\ - -i Makefile || die + default + + # the Makefile is a mess, just + # rely on implicit rules instead + rm Makefile || die +} + +src_configure() { + tc-export CC + append-cppflags $($(tc-getPKG_CONFIG) --cflags x11 xext) + export LDLIBS="$($(tc-getPKG_CONFIG) --libs x11 xext)" } src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" xfree + emake wmswallow } src_install() { |