gentoo resync : 29.06.2020

4 files changed, 54 insertions, 54 deletions

diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
index 5d1aac3d2088..f5413388266c 100644
--- a/x11-wm/cwm/Manifest
+++ b/x11-wm/cwm/Manifest
@@ -1,8 +1,7 @@
 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
+DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
 EBUILD cwm-6.6.ebuild 1017 BLAKE2B 2da4f398acfe5e1bb351cdaf75d8cf46af19a78a75741f9a40121495f9f9207ab9d181b8e604339dd74c607a1388b58e37e33b1b26d593d8b65f800caae5b990 SHA512 015d5b4d8eb74fc7d1af00e95c8cf33ef390571a999138430965435688f1f1a6b059a3f140b63a074ed38cf9df70c78ec6f45a0ba12d86f93cb7a32857d962d1
-EBUILD cwm-9999.ebuild 958 BLAKE2B 592d23a69e9ad7bc664354df19000a726dd64f93452c1f4e4fa4a8439de8050c12cee941ea91fb82a831af1fb97cd0b52bf80312dd71649c473fea6479c36b49 SHA512 0cd8900c7f3d23733752d348e67882bc26bcbaf25c89742c7279a410369ea15ca76186cff91d3a7a6d1c7df8bd7421f23a9c506f3f9d909a1ac51a971c70eb7f
+EBUILD cwm-6.7.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
+EBUILD cwm-9999.ebuild 945 BLAKE2B 3cdddaece0891f8d7904118ca3e35f02b1aaac4005daa6202a31dc32d51d15aebe6534bff91bdc7fa4f5991d3c293a37affb0c2500f4dddc1af2657acf965355 SHA512 fa2222f80c05c59a07e6ba7457164465e9107101154be05e17f1cf0bffe68586bfdde053c8aa0db4ee9cedacf743e5214051e78cfa40e8bf9bbfbd812da1621d
 MISC metadata.xml 440 BLAKE2B a1ed14101aa667304e039f287fcec44a7f125585b20af9b1e9c35d68520f567d7eb4306ceabc888dbf25c3effffed13fbadf0a2703ed7cee1424b7a5225a3157 SHA512 97dace19645fdebf1f37d8023d689eb6b8bd5747f0c88d1c5cae410862d5123a46bfc112f8d77c6259144138381a866509986ae774dc058e422c11fd2d6c5478
diff --git a/x11-wm/cwm/cwm-5.6.ebuild b/x11-wm/cwm/cwm-5.6.ebuild
deleted file mode 100644
index 82d341433eaa..000000000000
--- a/x11-wm/cwm/cwm-5.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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"
-SRC_URI="vanilla? ( http://chneukirchen.org/releases/${P}.tar.gz -> ${P}-chneukirchen.tar.gz )
-	!vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> ${P}-xmw.tar.gz )"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="vanilla"
-
-RDEPEND="x11-libs/libXft
-	x11-libs/libXinerama
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/bison"
-
-src_unpack() {
-	default
-	# vcs-snapshot doesn't work with tarball names
-	if ! use vanilla ; then
-		mv *${PN}-* ${P} || die
-	fi
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-	dodoc README
-	make_session_desktop ${PN} ${PN}
-}
diff --git a/x11-wm/cwm/cwm-6.7.ebuild b/x11-wm/cwm/cwm-6.7.ebuild
new file mode 100644
index 000000000000..c35cf81e9f80
--- /dev/null
+++ b/x11-wm/cwm/cwm-6.7.ebuild
@@ -0,0 +1,42 @@
+# 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://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
+else
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+DEPEND="x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+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 23dab4acd436..c35cf81e9f80 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -6,27 +6,28 @@ 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"
+HOMEPAGE="https://github.com/leahneukirchen/cwm
+	https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
-	KEYWORDS=""
+	EGIT_REPO_URI="https://github.com/leahneukirchen/cwm.git"
 else
-	SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/leahneukirchen/cwm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="ISC"
 SLOT="0"
 
-RDEPEND="x11-libs/libXft
+DEPEND="x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 "
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/bison
 	virtual/pkgconfig
 "