gentoo resync : 10.03.2018

5 files changed, 1 insertions, 234 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c1a5ca8e4da0..3529f3be890a 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index aca18afd5745..ce3acc98aa54 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -7,11 +7,8 @@ AUX osx-has-otool.patch 472 BLAKE2B 6341fa70a3e58bfeb63d2a829a86dd8a134fbcb1f4c0
 AUX styles-menu-commonbox 127 BLAKE2B a216b4b3b94ce1710876676a75fe6657c89b68106e1124b0c6d0cf4fcec84a612cc525e038625d87cf8d13b9d6a8212c7916a789ab45872e17c978f7bcc54142 SHA512 116876f0edb60b993738b367f5c6a25a401cfd26a9062416e6d4e58dd92e814f79c43357352a1fddf9e52b6274914efa4b41479643557a38295b0d9e5c2c9dee
 AUX styles-menu-fluxbox 117 BLAKE2B 8a72f7739a3fc80f6c5dc31204df4d930111f5279bd6eb8625cbceed770502137c87b2130fed6ce6817b59350bba4ba43127195c720a8f536bdec34eeab5c1bb SHA512 fd68d1d7ceefc70d222e92b3958fe408ebb8bef394d4601a9b8187e53a69fdd0141e83e1b982f2111b5f40c25b26abc7f00a4eb90494c07aaa2ee1e62831e622
 AUX styles-menu-user 93 BLAKE2B a2161d88f4fe85f3b95374186dbdc4c5eed480f631a3b8902545bd7cddcf9c9df74befd58747da7e9382742f7c8c5710be1aff411a83f982ee0d668fbe88a75b SHA512 c4d7ff6f0b074cbf3c0cea1548be63e65953d528cf3aa909371f3650bb1067ce0556cbf390fd7f53d2ea4e5d01c49ba241607682d06478dd41eab97d9e523094
-DIST fluxbox-1.3.6.tar.xz 793144 BLAKE2B 45874b5fddb752661664c41f5529797cb3eeb32fea4b006dbf3d556520b2a782185ab0ecf21026348efd3caff3b4f8a99c8091cd59824eeacb649c391a1f03db SHA512 66257f00b3f92cb3b87990610e0b5d6c7191c75997bbcba6744d581ccec36da2d1724767575dcde81be4fdbf39e2e25c8530013ee52a28d4775230fdf04b2f9a
 DIST fluxbox-1.3.7.tar.xz 786492 BLAKE2B ecf50e2eb19949b4a301366eaffc1d5199c17b116b7d19a31392eea632e6320210e1dff24b1794d3427c14206e31d9722d3c21ce24b584c61288233feb564925 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01
-EBUILD fluxbox-1.3.6-r1.ebuild 3147 BLAKE2B 352c7208c8d349c507f3aed4b410ef2a9dca494b2b14df2ccc89aab36cb49132316fdcd28cfea410b4e6ddf915bfab4b5a3128f48ab330ab6d0fa2ca331b81dd SHA512 cda36abf7e37c650ab8248cc3817b437820360a81db9932d21b744bed482bdbc29ca359bdb43e9cfca6142f553e7c687cfd68494f925b5f081c2f99f491f21d2
-EBUILD fluxbox-1.3.7-r2.ebuild 3173 BLAKE2B 07d014e3fb8a5236d9b5ca5f0115752a030824a7714ea98bda9002e8656c43986001d24b6bcce9e17eccd951bda0147d8552a9e09a20cff96188ac71e206ecc6 SHA512 28e6a6c5146c417c9e7ac8ca4eb60aee7fbd0b2c952c433f5a974d05f8f31dea44039932888088b79484b08e33da229dab58e2542eb9be1666df0b8a15cc3252
 EBUILD fluxbox-1.3.7-r3.ebuild 3175 BLAKE2B b928065f6ebca4830db1b2de639c7a66730e34457d68d1bd17ab1e43015ad32f13c3aa528da76cc266007858cb9b1cd141b181974eeda97276472cd5b7ac425d SHA512 0419913064ad2d4edfe00c429b74936fc4284cd208f6db1004fce7cf8eb3fe2cd18ff8422c9232f49ef52e24a8c48c3ee4d92cc1d9e10cc8795f0adf3bb93bc0
 EBUILD fluxbox-1.3.7-r4.ebuild 3217 BLAKE2B f02470ac8c6c60a73b2df359801f85a75028608fd800ebaf34ef234575153633aa1c522c849e9c500bc85313c8f042b87fca4407871d05da52c4fd2343608e9b SHA512 16ca60b87181b516bb6d76e6cea2c7507e4a0a435f567c8758fb660a521f4168d92d8ec9a41ed9d6d44878278856bb53b1d9700d52f0767cd45c3788a3096207
 EBUILD fluxbox-9999.ebuild 3003 BLAKE2B 11673f919a8a953122ce411308194ebf0a158cebe229b71e61ff7e51a9db756da5dbd7ffbce1ec694e03107406565ae69052e2438f5d1433cd384d2d536e3d11 SHA512 d9cff50cad586aafb16b9de11f581a81405f35c85523965f89a079e9fcdfab6484addc06d2280ea6f923e2f3597960605eb154b67ccb811823fe2516c7e32026
-MISC metadata.xml 1011 BLAKE2B dc0725204a6549e62e1d3177304ad99ef9e8d479584ec14ef492f125a1082d8dc020cfb9a7e76829c4744b07ad43df3f73eb743bb773e357a74f7756ace87a15 SHA512 2a056e964ff8cdfd9872305b13afdee80434efb0321dbe0802c29eb77e09d59f3ebd22f89ba5fc4e6c140fc550aa6f2be3a4ea939d5a26a07b2460ddb793fe6d
+MISC metadata.xml 892 BLAKE2B 324c11cd6885665c2fece22490878f3b1caafad7dfb171cfd6da71d3f8b606f5e451f53172dd485abbfb59cfa99b515fda414e7a0ae8a24a11afc609a8573e95 SHA512 79bccf48be50e5b1a66838e26023d949acf45809521d50162cbcf0595d2b3039c125e3831d8e1038365e5342e323ffefa26750cfd1fecdd1b44d1362cf7ab4de
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
deleted file mode 100644
index 0368c77fcfbd..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!!<=x11-misc/fbdesk-1.2.1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	truetype? ( media-libs/freetype )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
-	${RDEPEND}
-	bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
-"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
-	# Fix the semantic issue of icon paths, bug #536370
-	epatch "${FILESDIR}"/1.3.5-generate_menu-printf-fix.patch
-
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
-	econf ${myconf} \
-		$(use_enable bidi fribidi ) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable slit ) \
-		$(use_enable toolbar ) \
-		$(use_enable toolbar systray ) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	# Call fluxbox-generate_menu through bash since it lacks +x
-	# chmod 744 may be an equal fix
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		bash "${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	# Install the generated menu
-	insinto /usr/share/fluxbox
-	doins data/menu
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
-	# Styles menu framework
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxbox
-	doins "${FILESDIR}"/styles-menu-commonbox
-	doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
deleted file mode 100644
index 0af7d5b91c24..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	!!<=x11-misc/fbdesk-1.2.1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	truetype? ( media-libs/freetype )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	xinerama? ( x11-libs/libXinerama )
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
-	${RDEPEND}
-	bidi? ( virtual/pkgconfig )
-	nls? ( sys-devel/gettext )
-	x11-proto/xextproto
-"
-
-src_prepare() {
-	# We need to be able to include directories rather than just plain
-	# files in menu [include] items. This patch will allow us to do clever
-	# things with style ebuilds.
-	epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
-
-	eprefixify util/fluxbox-generate_menu.in
-
-	epatch "${FILESDIR}"/osx-has-otool.patch
-
-	# Fix bug #551522; 1.3.8 will render this obsolete
-	epatch "${FILESDIR}"/fix-hidden-toolbar.patch
-
-	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
-	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
-		version.h.in || die "version sed failed"
-}
-
-src_configure() {
-	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
-	econf $(use_enable bidi fribidi ) \
-		$(use_enable imlib imlib2) \
-		$(use_enable nls) \
-		$(use_enable slit ) \
-		$(use_enable systray ) \
-		$(use_enable toolbar ) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
-	default
-
-	ebegin "Creating a menu file (may take a while)"
-	mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
-	# Call fluxbox-generate_menu through bash since it lacks +x
-	# chmod 744 may be an equal fix
-	MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
-		CHECKINIT="no. go away." HOME="${T}/home" \
-		bash "${S}/util/fluxbox-generate_menu" -is -ds \
-		|| die "menu generation failed"
-	eend $?
-}
-
-src_install() {
-	emake DESTDIR="${D}" STRIP="" install
-	dodoc README* AUTHORS TODO* ChangeLog NEWS
-
-	# Install the generated menu
-	insinto /usr/share/fluxbox
-	doins data/menu
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/${PN}.desktop
-
-	exeinto /etc/X11/Sessions
-	newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
-	# Styles menu framework
-	insinto /usr/share/fluxbox/menu.d/styles
-	doins "${FILESDIR}"/styles-menu-fluxbox
-	doins "${FILESDIR}"/styles-menu-commonbox
-	doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index 8aff88a0169f..fd1d4d49dfe1 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pchrist@gentoo.org</email>
-		<name>Panagiotis Christopoulos</name>
-	</maintainer>
 	<longdescription>
 		Fluxbox is yet another windowmanager for X. Originally based upon the
 		Blackbox 0.61.1 code, Fluxbox has been extended to include a new tabbed