From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- x11-wm/cwm/Manifest | 7 ++++-- x11-wm/cwm/cwm-6.6.ebuild | 45 +++++++++++++++++++++++++++++++++++++ x11-wm/cwm/cwm-9999.ebuild | 36 ++++++++++++++--------------- x11-wm/cwm/files/cwm-Makefile.patch | 21 +++++++++++++++++ x11-wm/cwm/metadata.xml | 9 +++++++- 5 files changed, 97 insertions(+), 21 deletions(-) create mode 100644 x11-wm/cwm/cwm-6.6.ebuild create mode 100644 x11-wm/cwm/files/cwm-Makefile.patch (limited to 'x11-wm/cwm') diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest index 4db7e1ad373e..e0509a090fb2 100644 --- a/x11-wm/cwm/Manifest +++ b/x11-wm/cwm/Manifest @@ -1,5 +1,8 @@ +AUX cwm-Makefile.patch 596 BLAKE2B 561277a5a4da0a2b06c01c14cd0c8baf4dfcffe3ccd9a7f5e5009c2a6820145e124bc7d1eb4cee9826281cce1433a21f74b5799f8f2e3c4287b918d60603b8d4 SHA512 544ea3805211679f565dcdff42f1b438452e304701c9138e5c15b19374150c1e63e8d83eb64c0519b5c6664d7d7d70657c0b15516b770605115021b77b592308 DIST cwm-5.6-chneukirchen.tar.gz 50799 BLAKE2B 4d9341e89b21187044bbcbc658dea2eac6f6c1c87f25e1b0b81871a9f8b95af7354c8b486bd77f201acba430e019a5c784591cfc5efb281fd40d6670749958ad SHA512 0bb5f9c69e1ed30ef38ced70008baa347032a0c31ee2d4a88e3b45092969a5427ef160577da4891aba3181067235b244f11fc796815f41448930b438099b5bfc DIST cwm-5.6-xmw.tar.gz 53738 BLAKE2B 9c36c42fc35a8206035ed59fb8fe2e8eb13effcdb43d488bcc99c2d0f48476e206e46fd52c0928afdb51d55c68d9be03a186aaf4c49d03bcdf8754df0c5d81db SHA512 cf0174523838dba5997206be904ab667efc5ff7e413e98bb81cc3a69d40a79b54e21405787e088486feb8790d1094a2d3cce0be08d7ee36a2b9b0dadd78466c7 +DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042 EBUILD cwm-5.6.ebuild 1004 BLAKE2B 27ef899c7d0fb99f273a31a0cfa0f5429bbd0b24c692af1e15fa5cd5c22f347d65e93120b1564ed6b9fc0d563801340f6dfaa7d2559dac5693c791a0beca2f2c SHA512 bcfcb3689de10912b31c88601185bb23e1f99305cf0c6a79d3ea02760b5ea0b8f213f63b6b84b1e3471049b9b3a7fb3df374580883e972e3fde69921dcd92493 -EBUILD cwm-9999.ebuild 870 BLAKE2B 17a5b61890a88ff72178add1339caa550254dd1266069c239ae5200d47ba7b5d21cc03f7187f1ae3f89454e131286e3a7658f4fd0480413ebfd77011dd3a1b3f SHA512 6ac0ce705cef59471a0d4066b9af783df6e2a4caa335c1634ee61d687d4616629cdb1504ab3d22c793b4276a4d8a27f1c0b086cd71e74725978555a20eee8bd0 -MISC metadata.xml 248 BLAKE2B 86a7b2f7d520b71d9bbed3427dc2c32a5ede55db3ee30766436b19c61a8507efc10d0de50bf84f16bc8cf73dd5b2c0cb31ac17221303dff9bd08ce8fb0e23666 SHA512 07df1249bbdd7c937f1b711b88f3d26f9de18c594692b6446022ea4562570abaa08ed2c83d31d8730707036704fa7decc5b382ec8586adaabd7f1205be4433f8 +EBUILD cwm-6.6.ebuild 1007 BLAKE2B 8dd3cce566d8a43b65af117948475389caa6df4844a430ca8df071efed0061351cb2c27c60efafcf6f880f5f07a05ef3855260d50417a2f7a057656b2aecebcd SHA512 5c16be2f52bf886e11cfe126b6f4435c19af503d2bbff53e609bbf72e01d2d6a596221b74dc130663ecb8734d56c2db443f8c885be4627c7476e9afaf2cbb2d0 +EBUILD cwm-9999.ebuild 958 BLAKE2B 592d23a69e9ad7bc664354df19000a726dd64f93452c1f4e4fa4a8439de8050c12cee941ea91fb82a831af1fb97cd0b52bf80312dd71649c473fea6479c36b49 SHA512 0cd8900c7f3d23733752d348e67882bc26bcbaf25c89742c7279a410369ea15ca76186cff91d3a7a6d1c7df8bd7421f23a9c506f3f9d909a1ac51a971c70eb7f +MISC metadata.xml 440 BLAKE2B a1ed14101aa667304e039f287fcec44a7f125585b20af9b1e9c35d68520f567d7eb4306ceabc888dbf25c3effffed13fbadf0a2703ed7cee1424b7a5225a3157 SHA512 97dace19645fdebf1f37d8023d689eb6b8bd5747f0c88d1c5cae410862d5123a46bfc112f8d77c6259144138381a866509986ae774dc058e422c11fd2d6c5478 diff --git a/x11-wm/cwm/cwm-6.6.ebuild b/x11-wm/cwm/cwm-6.6.ebuild new file mode 100644 index 000000000000..083e7d8776c3 --- /dev/null +++ b/x11-wm/cwm/cwm-6.6.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop toolchain-funcs + +DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager" +HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ + https://github.com/chneukirchen/cwm" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git" + KEYWORDS="" +else + SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +LICENSE="ISC" +SLOT="0" + +RDEPEND="x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr +" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/bison + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-Makefile.patch" +) + +src_compile() { + emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install + dodoc README + make_session_desktop ${PN} ${PN} +} diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild index 8e881833ac13..23dab4acd436 100644 --- a/x11-wm/cwm/cwm-9999.ebuild +++ b/x11-wm/cwm/cwm-9999.ebuild @@ -1,37 +1,37 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils toolchain-funcs git-r3 +inherit desktop toolchain-funcs DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager" HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm" -EGIT_BRANCH=linux + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git" + KEYWORDS="" +else + SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi LICENSE="ISC" SLOT="0" -KEYWORDS="" -IUSE="vanilla" RDEPEND="x11-libs/libXft x11-libs/libXinerama - x11-libs/libXrandr" -DEPEND="${RDEPEND} + x11-libs/libXrandr +" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/bison virtual/pkgconfig - sys-devel/bison" - -pkg_setup() { - if use vanilla ; then - EGIT_REPO_URI="https://github.com/chneukirchen/cwm.git" - else - EGIT_REPO_URI="https://github.com/xmw/cwm.git" - fi -} +" src_compile() { - emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" + emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)" } src_install() { diff --git a/x11-wm/cwm/files/cwm-Makefile.patch b/x11-wm/cwm/files/cwm-Makefile.patch new file mode 100644 index 000000000000..56755fe19067 --- /dev/null +++ b/x11-wm/cwm/files/cwm-Makefile.patch @@ -0,0 +1,21 @@ +diff --git a/Makefile b/Makefile +index 74d0d0d..802cd33 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,12 +13,14 @@ OBJS= calmwm.o screen.o xmalloc.o client.o menu.o \ + search.o util.o xutil.o conf.o xevents.o group.o \ + kbfunc.o strlcpy.o strlcat.o y.tab.o \ + strtonum.o reallocarray.o ++ ++PKG_CONFIG?= pkg-config + +-CPPFLAGS+= `pkg-config --cflags x11 xft xrandr` ++CPPFLAGS+= `${PKG_CONFIG} --cflags x11 xft xrandr` + + CFLAGS?= -Wall -O2 -g -D_GNU_SOURCE + +-LDFLAGS+= `pkg-config --libs x11 xft xrandr` ++LDFLAGS+= `${PKG_CONFIG} --libs x11 xft xrandr` + + MANPREFIX?= ${PREFIX}/share/man + diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml index 9dddd6338e3d..7fd942a5adbf 100644 --- a/x11-wm/cwm/metadata.xml +++ b/x11-wm/cwm/metadata.xml @@ -1,7 +1,14 @@ - + + gentoo@aisha.cc + Aisha Tammy + + + proxy-maint@gentoo.org + Proxy Maintainers + chneukirchen/cwm -- cgit v1.2.3