From b1a7f3b42e67d2ab50b5960a2f5d7486fc73c36d Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Mon, 26 Jan 2015 02:37:56 +0000 Subject: [PATCH] revbump to -1.3.5; patch by D. Campbell, fixes bug #537356 made by co-maintainer Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- x11-wm/fluxbox/ChangeLog | 8 +- x11-wm/fluxbox/Manifest | 9 +- x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild | 112 +++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index 00fb25f1f7d1..12291605a4bf 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,12 @@ # 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.320 2015/01/24 03:11:20 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.321 2015/01/26 02:37:31 idella4 Exp $ + +*fluxbox-1.3.5-r1 (26 Jan 2015) + + 26 Jan 2015; Ian Delaney +fluxbox-1.3.5-r1.ebuild: + revbump to -1.3.5; patch by D. Campbell, fixes bug #537356 made by co- + maintainer *fluxbox-1.3.6-r1 (24 Jan 2015) diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index 6910e89971d4..6291277a7b86 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -13,16 +13,17 @@ DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b DIST fluxbox-1.3.5.tar.lzma 694672 SHA256 f4faf1fcb995dbe85d272e511e388de347ff07b69e9f8c5af0248cf330ee2a07 SHA512 55d1689660b9240851be55183f665efff281f8f344474ddd1bee089635cb34e343cca85743900675c21579cf9e58c7bd756932a30c2ff4e6384b500d7c4bdcd8 WHIRLPOOL 6f379f9f224478556c53e2585f76c28f29c20b1fce5ab24ed0d06a813e51ddb1e0eaea7658ec1fa5979b951613542dd47dad4fd7af17bbdf0530653b8583b18d DIST fluxbox-1.3.6.tar.xz 793144 SHA256 fa09ad8d30841021a1e5147efa944eb509201fa3619da5b6608d94cbbf55bf33 SHA512 66257f00b3f92cb3b87990610e0b5d6c7191c75997bbcba6744d581ccec36da2d1724767575dcde81be4fdbf39e2e25c8530013ee52a28d4775230fdf04b2f9a WHIRLPOOL 198a3972a81287a1fa6346a708bf461cd9b5262adb7cb17504077e9d154c582947b05f7508d151363f36f78d822fa9fbf9797ee4cc6f7f76a8cc5b7a69db4c52 EBUILD fluxbox-1.3.2.ebuild 3074 SHA256 2b40e87e859143f3ee4624b43dceb3aa2a6d7ef91e8ff0f0ed0b2baa761019a6 SHA512 2b7d10575df296824b792b199aeb0b42422b95394bb4dbb1c2074adba351d8ec2870a75e898901d96d469de23ebd3ff6ee1f912e1f874301ec9816f08b9d5bb0 WHIRLPOOL caa40774d95533f3cedd31f41531de367c7166f2a8f2cd804a0361cf8cda62bb35de8ef09eba3e8118b26434bf4437538706e12397391cbca79567f01a1871b7 +EBUILD fluxbox-1.3.5-r1.ebuild 3250 SHA256 78e12a014b162324ada36f32783142577e456d1c21400126e6246c363e417b50 SHA512 a1e4159757b16d6bb7e09368c6461a57a0f5742042011a27125e293558fe1a0457d2c2b408aaff8044358736fe0a08dc11a1d6d9ae59cc5f7e1fd440c568f906 WHIRLPOOL 032c7d791ab7d0a281b4e0f1be46bf072b15df430df221699cdd7899b1305bb9ff6e3d8a0f321a14e6c87d908458453757c888d459792d3fc07c9c66346afc93 EBUILD fluxbox-1.3.5.ebuild 3083 SHA256 0fcf83c3de3c0e88934b2068763ef2a8ec8a83f5cefbdc045a7c56d152ed2d10 SHA512 ed401b50a513a875abc91f8cdba965adaaa14d93df683a2f69e193694f597008a0c335c8bdab0c174da5faf4ae90457cc363da17cc7cb8496cb5b417405ed4b0 WHIRLPOOL 82473cdee231835194da5654e1bd02723f5538f5b3ea00d3fd6d5edbc670a69de0a76cbe128c540199404d48e2c488b9e8121ecbd83da41556b62800e4684aab EBUILD fluxbox-1.3.6-r1.ebuild 3248 SHA256 970fc07935a1b03a3aba0373095a92bf9f0125ec005372be2362ec7364a882f8 SHA512 c5e527585c5f31d9e24bf265bd80d6033810425d2387ef91edc191991f79b67488d46991444eea7a3e90e6fd8d1996a4d3a8f77af0abbced5b3bc2a8f0c32622 WHIRLPOOL 05d30163072cc88800653e70f746ff046b417fac8837e3ee5e73725cffd7b04d51bae2a156e64b1e9475be3e67847ce6f332a86a8186407e2ae8eefa18d1d2c9 EBUILD fluxbox-1.3.6.ebuild 3135 SHA256 8ec46cdda647a68cba31740b90c343b37a686cde471bfbb7ed28a88a37ae3a1c SHA512 d00e39f80d894529c67d0f14e2c1a5e4afb82c7e0a74ac96a7c89a1c35cf7567c51dfd2022894766947e0c4203a851995a54b84f0b86285e295d5b7443c3b475 WHIRLPOOL 5751d45f12377e2f0306b9a11ccf701c74f8679e79bda66e18ae62340dd76b27a66118b7d8dd195a858052cb544461cd758fd21015754e2df254f58860aa7d79 EBUILD fluxbox-9999.ebuild 2960 SHA256 297cf54004736243350e870ca81bd15e3e26f1a3bd758c17c49d6bdb1364f1fd SHA512 cdc5279caa7919e38c72001f0b6048709874f7b4283f96dbdc7105b3d656bbfa3ca8cad5f4c754a5cb7e22c8bd6e3033af79d0057ed95284a731f19a20676c9d WHIRLPOOL 66e3f7ff9f35c5f89a551a80a48f15846f9c1b966eed2564978b72bff215aa27654bc64286cadcc7da0cf00ca1ade5ee1a70195d1cb3357547a85822eb2e23b7 -MISC ChangeLog 57960 SHA256 04816d40faf9da515e5ec4d2d3f16d35a04ab3ee3303a81d79ae34725e571baa SHA512 33ed636581208c3f1920bae70f42a91d30fab2c94bb04c51b2bad36684fb199389ce73f9304108dd30d446a9c32d5f95148ba71a6e6e9e034ddddfb833000b06 WHIRLPOOL a5fc90eddfd5c7bddb10b3991b2d5b8cfa17a330bb3e74342faea4c93f4b2935eb20d73f52386436dd69ba9a4020221137dcfb650216eb6d3081ce09808fba4a +MISC ChangeLog 58154 SHA256 835d5253988fbe79b7d3c31df8fdc2cf89af010b12c60abfcbd984f23e335862 SHA512 fc3dd884e10522436cbb2f037a32ceb44d7314d0d9d68be72e3012087445e3cddb5ba26f9a092bf15d7ccc6be83c55bddc9bd7e1b2d6bb60d0b12d50535c0648 WHIRLPOOL 36df561f52f9b15a1067096b9a2177b26d6ab7e6f71fa4a5c1e518ba0625f7351439030cff45b40ac95a78590d268ea933f43a002c21dd6d0bcd03283a2f165b MISC metadata.xml 967 SHA256 2ffac0979f0372a134fd4d867258de0771847fe5114e58aedc0bc6d51cc43955 SHA512 f5b54fcf45f9dde3370ef781d8ae52aa696d260ef113555f34e6b17beca7d96a3992cf0713aed33d5daf215990d3d35244253b99b93b2fecb332ae630d486234 WHIRLPOOL 7262d71d2ddb256766535935fe9403aa1ac81b37b03f78b513e6a5700250ca10e9cac65a110498186736eca17e6703bd5555770383daef426fea445ca285409c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlTDDWcACgkQso7CE7gHKw0rhACgoc+Tsl0XVA/AtMcfb5YGOvAA -7TMAoNh7PwSk7jFZsasCwcoM2b8Z7G2X -=RkFr +iEYEAREIAAYFAlTFqHoACgkQso7CE7gHKw1ESQCfSqkkyGU/+I1YZhGnLokfjgGW +MC0AnjkUzS4jrQgFp88nBEB/hA3V/wd1 +=NFFX -----END PGP SIGNATURE----- diff --git a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild new file mode 100644 index 000000000000..629e74583de3 --- /dev/null +++ b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild @@ -0,0 +1,112 @@ +# 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 $ + +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.lzma" +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 + !!=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}"/${PV}-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 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 +} -- 2.26.2