diff options
author | Jim Ramsay <lack@gentoo.org> | 2007-07-13 20:25:35 +0000 |
---|---|---|
committer | Jim Ramsay <lack@gentoo.org> | 2007-07-13 20:25:35 +0000 |
commit | a8bff4ddc3fc4c99f70e1a2ad0471f76b31c2178 (patch) | |
tree | c12d433b4dae5889671ba0b3b5c1a4419c54c824 /x11-wm | |
parent | alpha/ia64/x86 stable (diff) | |
download | historical-a8bff4ddc3fc4c99f70e1a2ad0471f76b31c2178.tar.gz historical-a8bff4ddc3fc4c99f70e1a2ad0471f76b31c2178.tar.bz2 historical-a8bff4ddc3fc4c99f70e1a2ad0471f76b31c2178.zip |
Latest SVN snapshot: 4983. Fixes all previous bugs and bug 183982.
Package-Manager: portage-2.1.3_rc4
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/fluxbox/ChangeLog | 9 | ||||
-rw-r--r-- | x11-wm/fluxbox/Manifest | 20 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/1.0_rc3_p4983/gentoo_style_location.patch | 17 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983 | 6 | ||||
-rw-r--r-- | x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild | 144 |
5 files changed, 191 insertions, 5 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index 6c47aafc92fe..9d0e5d44085a 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-wm/fluxbox # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.224 2007/07/13 17:12:45 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.225 2007/07/13 20:25:35 lack Exp $ + +*fluxbox-1.0_rc3_p4983 (13 Jul 2007) + + 13 Jul 2007; Jim Ramsay <lack@gentoo.org> + +files/1.0_rc3_p4983/gentoo_style_location.patch, + +fluxbox-1.0_rc3_p4983.ebuild: + Latest SVN snapshot: 4983. Fixes all previous bugs and bug 183982. 13 Jul 2007; Jim Ramsay <lack@gentoo.org> fluxbox-1.0_rc3_p4949.ebuild: Removed old (unneeded) antialias setting from ebuild, thanks to ak|ra on diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest index 463e2bdb4799..9c9b61b72df1 100644 --- a/x11-wm/fluxbox/Manifest +++ b/x11-wm/fluxbox/Manifest @@ -42,6 +42,10 @@ AUX 1.0_rc3_p4949/svn_up_from_4937.patch 55278 RMD160 25b109f780e2baffec61761610 MD5 8d8768ef5a03f95497e3e1d4045b92ac files/1.0_rc3_p4949/svn_up_from_4937.patch 55278 RMD160 25b109f780e2baffec61761610b0502ec9d07586 files/1.0_rc3_p4949/svn_up_from_4937.patch 55278 SHA256 a472a930c2edec5847006e1b304ac95b6b48424cc8a60acdbbfbdc3a77a6c71c files/1.0_rc3_p4949/svn_up_from_4937.patch 55278 +AUX 1.0_rc3_p4983/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f SHA1 83d725fd320b8f9af329176bc8941b843e4ab559 SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f +MD5 2440cd51fb1517b9f949fbbdc50d8d19 files/1.0_rc3_p4983/gentoo_style_location.patch 676 +RMD160 1425985eaa03a4404a4a0128d7e695dbbc14d51f files/1.0_rc3_p4983/gentoo_style_location.patch 676 +SHA256 3765d1d02fa0db808d8d657b996508bd8425ed6ef6d898f4ecb0b7fe39d26a5f files/1.0_rc3_p4983/gentoo_style_location.patch 676 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834 MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a files/fluxbox.desktop 202 @@ -59,6 +63,7 @@ MD5 9ae40c5c7aebae1c5919adbd888710b4 files/styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 files/styles-menu-user 93 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946 files/styles-menu-user 93 DIST fluxbox-0.9.15.1.tar.bz2 685740 RMD160 aa9418de9ff700c14b21911f6de24503449e7f0f SHA1 94652432037203f1619ba8ed657339fb85b3c894 SHA256 b72bfcbe26651323d975a2469ba426da8e8e7d96b813061386f4bc5148dfb2b9 +DIST fluxbox-1.0_rc3_p4983.patch.gz 115293 RMD160 425c937fdd0b25503b50a3c490725aee52b31d29 SHA1 d1782d1d3a88c3b432cad7a68e051780e1d701d3 SHA256 051ce8d5d37f2ab22ac25db71a0a557244adc5b5a67e207dfb6204ffde8788fd DIST fluxbox-1.0rc3-svn-4937.tar.bz2 864552 RMD160 1559db3cae589b1bc576c0a5601c9fe5a008a90c SHA1 dff90bdf7a1a03ec52f45cd7084a5756f6a23517 SHA256 5b3cc757ec4f5638b2beab29068482f3abb57be0e077acdbc9be1ad720ef25d7 DIST fluxbox-1.0rc3.tar.bz2 780622 RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 SHA1 4524960e3e9702b61e29c5e1dfae8c050abaaf7f SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6 EBUILD fluxbox-0.9.15.1-r2.ebuild 5178 RMD160 d9777cbdcca4e261a71c3b58282986e05ce1d71f SHA1 8da9d238b953f3da80f640559d46aa7c9352c236 SHA256 e44dbd29118d3920394d8e7f720c0aad97909c717ada24e692e03b7e21373038 @@ -89,10 +94,14 @@ EBUILD fluxbox-1.0_rc3_p4949.ebuild 4110 RMD160 2f2f947725321607f8761a35b5a33920 MD5 d4a40af1099ad999477a02b2324967fd fluxbox-1.0_rc3_p4949.ebuild 4110 RMD160 2f2f947725321607f8761a35b5a33920eecf31b5 fluxbox-1.0_rc3_p4949.ebuild 4110 SHA256 368038847fc0aa41cf23f6c19d15dc36a55e4aa1213a64102996d2335dd0628a fluxbox-1.0_rc3_p4949.ebuild 4110 -MISC ChangeLog 41745 RMD160 c40f9f27e97f2d9ee53a9c0813c8eb0556a0c63b SHA1 a74ea7f13ce1ca0e7f0b7920f5de85afcdee8242 SHA256 03fc36ae1ffd1f0bbffdea1d8242f7aa2bbf91c51a8d63b3b4794346c1e39a43 -MD5 8e7222dca8f2915d1753f8f6bab35cbd ChangeLog 41745 -RMD160 c40f9f27e97f2d9ee53a9c0813c8eb0556a0c63b ChangeLog 41745 -SHA256 03fc36ae1ffd1f0bbffdea1d8242f7aa2bbf91c51a8d63b3b4794346c1e39a43 ChangeLog 41745 +EBUILD fluxbox-1.0_rc3_p4983.ebuild 4150 RMD160 d2a32789575de94707e8fc2cc45cd78c4f2c6f70 SHA1 f2e5bc953e9b8444130cf75864332e7597b862ee SHA256 25c9c48b30a9e48279ddbcdacc392d212b38fd63fee447d763dcd3c02f16aa0d +MD5 c72f58d4345cacee031705eaa437bb67 fluxbox-1.0_rc3_p4983.ebuild 4150 +RMD160 d2a32789575de94707e8fc2cc45cd78c4f2c6f70 fluxbox-1.0_rc3_p4983.ebuild 4150 +SHA256 25c9c48b30a9e48279ddbcdacc392d212b38fd63fee447d763dcd3c02f16aa0d fluxbox-1.0_rc3_p4983.ebuild 4150 +MISC ChangeLog 41983 RMD160 0a745754d3d3616261aea31b9a9611f0eb10db61 SHA1 e52fc0de946c0b64fbd9118a42ec06d936c5f5b3 SHA256 574ac05898f2af21896fc9cc01d134b0840653c4af8f3bf0364927d4cf9686ff +MD5 5abf7263824d179523071846571d453d ChangeLog 41983 +RMD160 0a745754d3d3616261aea31b9a9611f0eb10db61 ChangeLog 41983 +SHA256 574ac05898f2af21896fc9cc01d134b0840653c4af8f3bf0364927d4cf9686ff ChangeLog 41983 MISC metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 SHA1 9f493761c477ad9b3f532638a1351489442d4f54 SHA256 415fa5c634f5ee4aa0a77dab674282588c0befbb209ce31c0eb4375e4ec36b65 MD5 2c8f22e229558b963d967e6ca024506e metadata.xml 712 RMD160 28bbbb6c8c1ad0897f5a66d3b3fb251c13b532c1 metadata.xml 712 @@ -118,3 +127,6 @@ SHA256 ff56c7c3862da60f8cb857e521792f3ea708fbb8551d724d56b8a12cc4c031bf files/di MD5 79076209dcd820596bf667b36244392f files/digest-fluxbox-1.0_rc3_p4949 274 RMD160 6a2b2e97caa903430245ae0822157c351f1c324e files/digest-fluxbox-1.0_rc3_p4949 274 SHA256 ff56c7c3862da60f8cb857e521792f3ea708fbb8551d724d56b8a12cc4c031bf files/digest-fluxbox-1.0_rc3_p4949 274 +MD5 9d783a1fd8f4c0dc6c0584ae93f61e27 files/digest-fluxbox-1.0_rc3_p4983 518 +RMD160 66957ca6a555227dde85e936915ce4547eb969db files/digest-fluxbox-1.0_rc3_p4983 518 +SHA256 f2c2246121242476d9d9f40597aa820b4e70c1d4bc3dd5b6839b92a92fa5718e files/digest-fluxbox-1.0_rc3_p4983 518 diff --git a/x11-wm/fluxbox/files/1.0_rc3_p4983/gentoo_style_location.patch b/x11-wm/fluxbox/files/1.0_rc3_p4983/gentoo_style_location.patch new file mode 100644 index 000000000000..3bf59802ab1f --- /dev/null +++ b/x11-wm/fluxbox/files/1.0_rc3_p4983/gentoo_style_location.patch @@ -0,0 +1,17 @@ +--- util/fluxbox-generate_menu.in.orig 2007-07-13 13:47:11.000000000 -0600 ++++ util/fluxbox-generate_menu.in 2007-07-13 13:51:03.000000000 -0600 +@@ -1803,12 +1803,8 @@ + append_submenu "${FBSETTINGSMENU}" + append "[config] (${CONFIGUREMENU})" + +- append_menu "[submenu] (${SYSTEMSTYLES}) {${STYLEMENUTITLE}}" +- append "[stylesdir] (${PREFIX}/share/fluxbox/styles)" +- append_menu_end +- +- append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}" +- append "[stylesdir] (~/.@pkgprefix@fluxbox@pkgsuffix@/styles)" ++ append_submenu "Styles" ++ append "[include] (/usr/share/fluxbox/menu.d/styles/)" + append_menu_end + + # Backgroundmenu diff --git a/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983 b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983 new file mode 100644 index 000000000000..d8fc75258545 --- /dev/null +++ b/x11-wm/fluxbox/files/digest-fluxbox-1.0_rc3_p4983 @@ -0,0 +1,6 @@ +MD5 31765a651afb84b86822f39379893574 fluxbox-1.0_rc3_p4983.patch.gz 115293 +RMD160 425c937fdd0b25503b50a3c490725aee52b31d29 fluxbox-1.0_rc3_p4983.patch.gz 115293 +SHA256 051ce8d5d37f2ab22ac25db71a0a557244adc5b5a67e207dfb6204ffde8788fd fluxbox-1.0_rc3_p4983.patch.gz 115293 +MD5 8ed52d10d7de72efab0948eaaa4a6a50 fluxbox-1.0rc3.tar.bz2 780622 +RMD160 5086545ea2c2b0dd71f17d314838d04f197a1294 fluxbox-1.0rc3.tar.bz2 780622 +SHA256 cf1e2aa77716e42b2457b19989c2b2d2fc5f7d900cc16a3621a2e42372f474b6 fluxbox-1.0rc3.tar.bz2 780622 diff --git a/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild b/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild new file mode 100644 index 000000000000..38d10f3f5ccc --- /dev/null +++ b/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0_rc3_p4983.ebuild,v 1.1 2007/07/13 20:25:35 lack Exp $ + +inherit eutils autotools versionator + +IUSE="nls xinerama truetype kde gnome imlib disableslit disabletoolbar" + +DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar" + +MY_P="fluxbox-1.0rc3" +MY_PBASE=$(get_version_component_range 1-3) +MY_SVN=$(get_version_component_range 4) + +S="${WORKDIR}/${MY_P}" +SRC_URI="mirror://sourceforge/fluxbox/${MY_P}.tar.bz2 + mirror://gentoo/${P}.patch.gz" +HOMEPAGE="http://www.fluxbox.org" + +# Please note that USE="kde gnome" simply adds support for the respective +# protocols, and does not depend on external libraries. They do, however, +# make the binary a fair bit bigger, so we don't want to turn them on unless +# the user actually wants them. + +RDEPEND="|| ( ( x11-libs/libXpm + x11-libs/libXrandr + xinerama? ( x11-libs/libXinerama ) + x11-apps/xmessage + ) + virtual/x11 + ) + virtual/xft + truetype? ( media-libs/freetype ) + imlib? ( >=media-libs/imlib2-1.2.0 ) + !<x11-themes/fluxbox-styles-fluxmod-20040809-r1" +DEPEND="!<=x11-misc/fluxconf-0.9.9 + >=sys-devel/autoconf-2.52 + nls? ( sys-devel/gettext ) + || ( ( x11-proto/xextproto + xinerama? ( x11-proto/xineramaproto ) + ) + virtual/x11 + ) + ${RDEPEND}" +PROVIDE="virtual/blackbox" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +pkg_setup() { + if use imlib ; then + if ! built_with_use media-libs/imlib2 X ; then + eerror "To build fluxbox with imlib in USE, you need an X enabled" + eerror "media-libs/imlib2 . Either recompile imlib2 with the X" + eerror "USE flag turned on or disable the imlib USE flag for fluxbox." + die "USE=imlib requires imlib2 with USE=X" + fi + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${WORKDIR}/${P}.patch" + + # 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}/${PV}/gentoo_style_location.patch" + + # Add in the Gentoo -r number to fluxbox -version output. + if [[ "${PR}" == "r0" ]] ; then + suffix="${MY_SVN}-gentoo" + else + suffix="${MY_SVN}-gentoo-${PR}" + fi + sed -i \ + -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \ + version.h.in || die "version sed failed" + + # Fix broken styles + ebegin "Fixing backgrounds..." + for style in "${S}/data/styles/"* ; do + [[ -f "${style}" ]] || continue + sed -i -e 's,\([^f]\)bsetroot,\1fbsetroot,' "${style}" \ + || die "styles sed failed on ${style}" + done + eend 0 +} + +src_compile() { + export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig + + eautoreconf + + econf \ + $(use_enable nls) \ + $(use_enable xinerama) \ + $(use_enable truetype xft) \ + $(use_enable kde) \ + $(use_enable gnome) \ + $(use_enable imlib imlib2) \ + $(use_enable !disableslit slit ) \ + $(use_enable !disabletoolbar toolbar ) \ + --sysconfdir=/etc/X11/${PN} \ + --with-style=/usr/share/fluxbox/styles/Emerge \ + ${myconf} || die "configure failed" + + emake || die "make failed" + + ebegin "Creating a menu file (may take a while)" + mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed" + MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \ + CHECKINIT="no. go away." HOME="${T}/home" \ + "${S}/util/fluxbox-generate_menu" -is -ds \ + || die "menu generation failed" + eend $? +} + +src_install() { + dodir /usr/share/fluxbox + make DESTDIR="${D}" install || die "make install failed" + dodoc README* AUTHORS TODO* ChangeLog NEWS + + dodir /usr/share/xsessions + insinto /usr/share/xsessions + doins "${FILESDIR}/${PN}.desktop" + + dodir /etc/X11/Sessions + echo "/usr/bin/startfluxbox" > "${D}/etc/X11/Sessions/fluxbox" + fperms a+x /etc/X11/Sessions/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" || die + doins "${FILESDIR}/styles-menu-commonbox" || die + doins "${FILESDIR}/styles-menu-user" || die +} + |