diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
| commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
| tree | 326613a08f25851c388715e205576a2e7d25dc4f /x11-plugins/wmswallow | |
| parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) | |
gentoo resync : 18.08.2019
Diffstat (limited to 'x11-plugins/wmswallow')
| -rw-r--r-- | x11-plugins/wmswallow/Manifest | 4 | ||||
| -rw-r--r-- | x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild | 33 |
2 files changed, 24 insertions, 13 deletions
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest index 73d23f6a6637..e68250b2e757 100644 --- a/x11-plugins/wmswallow/Manifest +++ b/x11-plugins/wmswallow/Manifest @@ -1,4 +1,4 @@ AUX wmswallow-0.6.1-format-security.patch 497 BLAKE2B 6ac2b96dcba5035b36a90fc9a34364cb472e8b59345d94ca765554065c3382fd1456bc0a45b4fd54beecce534cd9125c7079286c8aab659cfe32e129578533b4 SHA512 6761417ff8dfb000804bb86e2580fbe79b4f8aef21dbf5592e3ed24a097a028c955da72c51b4f3866401db78f81bdf09efc24b408829c125e20d3c409b11fc44 -DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc -EBUILD wmswallow-0.6.1-r1.ebuild 802 BLAKE2B bcc1c2a86066fe51c2892e94bdc20344b37ce80669f0daf8b802606afff4919c956f05feacd0b4a05c9f326459c29782bc065fad0889c3bebb4fd49de183b7b5 SHA512 6f329d967e4ff425ae5a15fcc594620629e4e173a32b6d688ccd6e386d3acb7358db97ff17820e08380fbb3a000f3cd9e3acf2b106f6490e808b23acee6b9c71 +DIST wmswallow-0.6.1.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc +EBUILD wmswallow-0.6.1-r1.ebuild 939 BLAKE2B 62cfba10220745896ede3902abbf47cecde53c229373302c60882cab987f42182c866a5bf401974a23518eaefe8d531d658e658827d9c2c886e0e2507b04a2ae SHA512 5e4385e79ca8f1ebfbb1d9fd94a8537006037831037e907c54b4f784d9fa43a70a5ff8fb30dc9aee3806a00bac435f7dc3f1cabe587176bee52f0ec1081e6fe9 MISC metadata.xml 644 BLAKE2B 28bbab4a2d177905c74f92f8c57bbe7d046ebcfafff891856d7361ae8c2982271d9f146b5cf5306070e48958eb110aa6855d0187051bb6d33ae4fb0798cbf967 SHA512 fc8f033978bedc4b9d080bc5d99dcd4200988b9751946fb855f182279a16913999c7372f6acb445818fb7fe336176dccd971b3709ee83a691966f6a35643de34 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() { |