update patch with final form from upstream, add missed addition from bug 537356 to -1.3.5-r1, full update to live ebuild from patch from same bug, remove broken 1.3.6 ebuild, fixes Bugs 537356, 536370 by maintainers

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

5 files changed, 64 insertions, 150 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 419875c58b5a..33e5814e7248 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.323 2015/01/26 10:18:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.324 2015/01/26 12:31:03 idella4 Exp $
+
+  26 Jan 2015; Ian Delaney <idella4@gentoo.org> -fluxbox-1.3.6.ebuild,
+  files/1.3.5-generate_menu-printf-fix.patch, fluxbox-1.3.5-r1.ebuild,
+  fluxbox-9999.ebuild:
+  update patch with final form from upstream, add missed addition from bug
+  537356 to -1.3.5-r1, full update to live ebuild from patch from same bug,
+  remove broken 1.3.6 ebuild, fixes Bugs 537356, 536370 by maintainers
 
   26 Jan 2015; Agostino Sarubbo <ago@gentoo.org> fluxbox-1.3.5.ebuild:
   Stable for x86, wrt bug #536086
diff --git a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
index 6804b29102ee..f9246f159076 100644
--- a/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
+++ b/x11-wm/fluxbox/files/1.3.5-generate_menu-printf-fix.patch
@@ -1,12 +1,22 @@
---- fluxbox-1.3.6/util/fluxbox-generate_menu.in	2015-01-15 13:35:50.223367998 -0800
-+++ fluxbox-1.3.6-copy/util/fluxbox-generate_menu.in	2015-01-15 13:38:21.789755711 -0800
-@@ -331,7 +331,7 @@
+https://github.com/fluxbox/fluxbox/commit/fc245408d6975d0813cd4440e7089d987b54d42e
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 525315c..33b0153 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -330,13 +330,13 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
-         if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
 -            printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
++        if ! grep -q -m 1 "^.${execname}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
 +            printf "\"${execname}\" \t <${entry_icon}>\n" >> $ICONMAPPING
          else 
-             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+-            : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
++            : echo "#    mapping already exists for ${execname}" >> $ICONMAPPING
          fi
-
+     else
+-        echo "# No icon file found for $entry_exec" >> $ICONMAPPING
++        echo "# No icon file found for $execname" >> $ICONMAPPING
+     fi
+ }
diff --git a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
index 629e74583de3..70f98a0a7d68 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.1 2015/01/26 02:37:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild,v 1.2 2015/01/26 12:31:03 idella4 Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs prefix
@@ -69,7 +69,7 @@ src_configure() {
 		$(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} \
diff --git a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild b/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
deleted file mode 100644
index 9034a8f492e5..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.6.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.6.ebuild,v 1.1 2015/01/11 17:18:40 titanofold Exp $
-
-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 ~x86-interix ~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
-
-	# 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 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-9999.ebuild b/x11-wm/fluxbox/fluxbox-9999.ebuild
index e249d2a60c9c..50dd49a48e02 100644
--- a/x11-wm/fluxbox/fluxbox-9999.ebuild
+++ b/x11-wm/fluxbox/fluxbox-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.13 2013/01/08 21:32:50 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-9999.ebuild,v 1.14 2015/01/26 12:31:03 idella4 Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils flag-o-matic toolchain-funcs git-2 prefix
 
 IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
@@ -12,29 +12,32 @@ DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
 EGIT_REPO_URI="git://git.fluxbox.org/fluxbox.git"
 SRC_URI=""
 HOMEPAGE="http://www.fluxbox.org"
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS=""
 
-RDEPEND="x11-libs/libXpm
-	x11-libs/libXrandr
+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
-	|| ( x11-misc/gxmessage x11-apps/xmessage )
 	xinerama? ( x11-libs/libXinerama )
-	truetype? ( media-libs/freetype )
-	bidi? ( >=dev-libs/fribidi-0.19.2 )
-	imlib? ( >=media-libs/imlib2-1.2.0[X] )
-	vim-syntax? ( app-vim/fluxbox-syntax )
-	!!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
-	!!<=x11-misc/fluxconf-0.9.9
-	!!<=x11-misc/fbdesk-1.2.1"
-DEPEND="bidi? ( virtual/pkgconfig )
+	|| ( x11-misc/gxmessage x11-apps/xmessage )
+"
+DEPEND="
+	${RDEPEND}
+	bidi? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
 	x11-proto/xextproto
-	${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS=""
+"
 
 src_prepare() {
 	./autogen.sh
@@ -45,6 +48,8 @@ src_prepare() {
 	epatch "${FILESDIR}/gentoo_style_location-1.1.x.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"
@@ -59,17 +64,17 @@ src_prepare() {
 src_configure() {
 	use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
 
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
+	econf ${myconf} \
+		$(use_enable bidi fribidi ) \
 		$(use_enable imlib imlib2) \
+		$(use_enable nls) \
 		$(use_enable slit ) \
 		$(use_enable toolbar ) \
-		$(use_enable bidi fribidi ) \
+		$(use_enable toolbar systray ) \
+		$(use_enable truetype xft) \
+		$(use_enable xinerama) \
 		--sysconfdir="${EPREFIX}"/etc/X11/${PN} \
-		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
-		${myconf}
+		--with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
 }
 
 src_compile() {
@@ -77,29 +82,30 @@ src_compile() {
 
 	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" \
-		"${S}/util/fluxbox-generate_menu" -is -ds \
+		bash "${S}/util/fluxbox-generate_menu" -is -ds \
 		|| die "menu generation failed"
 	eend $?
 }
 
 src_install() {
-	dodir /usr/share/fluxbox
 	emake DESTDIR="${D}" STRIP="" install
 	dodoc README* AUTHORS TODO* ChangeLog NEWS
 
-	dodir /usr/share/xsessions
+	# 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
 
-	dodir /usr/share/fluxbox/menu.d
-
 	# Styles menu framework
-	dodir /usr/share/fluxbox/menu.d/styles
 	insinto /usr/share/fluxbox/menu.d/styles
 	doins "${FILESDIR}"/styles-menu-fluxbox
 	doins "${FILESDIR}"/styles-menu-commonbox