Version bump - 1.1.1 is released

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 147 insertions, 9 deletions

diff --git a/x11-wm/awesome/Manifest b/x11-wm/awesome/Manifest
index 0528ec70c91b..4765d2434d99 100644
--- a/x11-wm/awesome/Manifest
+++ b/x11-wm/awesome/Manifest
@@ -1,14 +1,10 @@
 AUX awesome-session 33 RMD160 68a828295285a5232603df6574fdffa2527fb183 SHA1 c30cf121e89f0fc7320b79ca3452c33ec516f38d SHA256 a76cca201d3f815658acfb54a9ff3737d263cae1f6cc3527a59b0f22aa01df1b
 AUX awesome.desktop 150 RMD160 a50c71cfbcb9ee4b86da8cca19cbd876b3a7f9b0 SHA1 8314ccbed775ecb0af5107cec56632dbec1fe3cf SHA256 433f5cf4adea408e38d464af8b6259efd39a909735679f4625c0cb7fcab3337b
 DIST awesome-2.3.2.tar.gz 230593 RMD160 02bfaf317d849991a52e0d8a1bcdfd415798ae1d SHA1 d49ceec58c456fff696432d2226f4eb10d2f605b SHA256 5d2079e6c9add9bfcd2a598a6dfe6e544b0f5bbe9c96731a18c132a70a3af348
-DIST awesome-2.3.3.tar.gz 230640 RMD160 4eb0f39aebf22df07d99fd90103705ad09304995 SHA1 118f0c176b01694c919398219c1d6318358753ca SHA256 bccd57fcbb242d942a3f694140f7ad45b324242c1fb34792da3d93aa54e436e2
 DIST awesome-2.3.4.tar.gz 230800 RMD160 dca3ae76d91d3fd370d7fc51438896dfd472803d SHA1 d7ec69bf5d2a2caa4d14b4afc68d444a5bf580df SHA256 a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a
-DIST awesome-3.0-rc5.tar.bz2 140894 RMD160 ff7932bf59342286c5374ac2865a52eb34f70fd7 SHA1 812e2057cf4945742e9a64f389742e6ea6dac760 SHA256 5ffd2b542bd370a3d3f3225346a5c0373b298cad3f3b2e081107499209df1591
-DIST awesome-3.0-rc6.tar.bz2 141971 RMD160 0fa4a82c2fde75f4a0c4a8ea3f068993a61e493d SHA1 882fff959f5d787486e776a7fc75f1a0fd9524b8 SHA256 872e7634880ddbe3467d2842cc095dc2736f136a4dd9ac7fd7ef038197d5aaca
+DIST awesome-3.0.tar.bz2 142225 RMD160 a2e602e70f93600e57e100d8aa71766fe8786c64 SHA1 237a05f931a3889bfbcc9e31aaf4c56e55b3272a SHA256 9a4fa26f069223714d584b6b19f017f67808f83aa5788e6ae25c1f71001b9d4c
 EBUILD awesome-2.3.2.ebuild 1271 RMD160 82a731b5442abe3eda49c47056c2953d2b59c87b SHA1 e1f48a408f5a962dc716c0e404e04bb734ec1b4b SHA256 8f8e04baf39b2eb54ecdd8254b36b43912fad5995fa4dd75595319526c831525
-EBUILD awesome-2.3.3.ebuild 1277 RMD160 b34a43c8b745c42f2eabefe520bc5bb8de18e4b8 SHA1 b23f7246458dc5f8706360887f59e14514d50ebd SHA256 6c333f81afe3b304de246740439eb0dce032baf80c9a84c3a4d75439b95ee5de
 EBUILD awesome-2.3.4.ebuild 1277 RMD160 32f03de382745f915691114210e161fdf082db0a SHA1 601cf947c22928940993ed9cc0e343aec746c50e SHA256 9def271a20a6492a55e2a6f717c0ba13cc8cca945181a0d177cda88366ac2969
-EBUILD awesome-3.0_rc5.ebuild 2055 RMD160 2543047f6760267e9d7979bc9054bafb34077dae SHA1 ff714cd1db87942fa160b954f236d0f2a6ca2ee7 SHA256 6133a2d59b0682522902af8baa8bf61688f0906103f2fda93ea5f5a50843fe2c
-EBUILD awesome-3.0_rc6.ebuild 2145 RMD160 5b9da48ffe8506a89e5ce5977f031ec16c407f2a SHA1 a8802790529f2f8f1bd8f1057ccfa5316ff0032a SHA256 4813cff7ae32a60d6f07b102614d5625c39e761de64cde6d0c9238101be239b9
-MISC ChangeLog 5102 RMD160 691178e5e1221d5b733b0e1fe1541bcbe24cf22b SHA1 a475062843c627fe05d8b2313e45861f52405b8c SHA256 1e1e009d6afbd3e9af8fe469205b47dfbcb5f1eba6e4e1b64f9b8ad20bd6c9f3
+EBUILD awesome-3.0.ebuild 2106 RMD160 b27d27797d0185c979fe01d5d22baf8ec82cc7de SHA1 5a8d0755a85ef36b209e0248496594db4fc4309c SHA256 875f980aacf564f4ebb4caf002650f0fbb1f4614b14eac5933ef7a35ff5accc4
+MISC ChangeLog 5316 RMD160 79dc5ab16a1e9f7c117aadea7e4ca429129f32b3 SHA1 344e09a1934a2b329d3cbde20ec825bb5795cd30 SHA256 dfef1b02d39ddb21fa311c4a7643c29bb35b328cbcd92b57439f6beec20fe263
 MISC metadata.xml 248 RMD160 ade4235c4b35539d6cccd6005afba23a7c9d2afd SHA1 e6af7cb4622744522ecc176d800015b77cd75d81 SHA256 5d0b7e035a2cb76eeb00ece66b18b59060068ea76dd196e6cd4f4524c92cde17
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 0315ee6bd160..7da79a72b726 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.258 2008/09/04 18:06:14 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.259 2008/09/18 15:38:32 lack Exp $
+
+*fluxbox-1.1.1 (18 Sep 2008)
+
+  18 Sep 2008; Jim Ramsay <lack@gentoo.org>
+  +files/gentoo_style_location-1.1.x.patch, +fluxbox-1.1.1.ebuild:
+  Version bump - 1.1.1 is released
 
 *fluxbox-1.1.0.1 (04 Sep 2008)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 59b45b3b36df..48cec7abef00 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -4,13 +4,16 @@ AUX 1.0.0/gentoo_style_location.patch 676 RMD160 1425985eaa03a4404a4a0128d7e695d
 AUX 1.1.0.1/gentoo_style_location.patch 711 RMD160 d6d358759ba664bcfcf098f47d37f206387de007 SHA1 1ac6b515ab6004757cd5217cb74c892feb5ea5ee SHA256 84aba82bc9ab3a9dcdeb3857eb7ee0236a8ec96ae77e29cd0455813bac473915
 AUX fluxbox.desktop 202 RMD160 255bb2cdae75e1fc204d4b60f39c8aba66770e7a SHA1 d57b4d0fad653660cc6cf0a2cd808b7a34d72b95 SHA256 8859f44f3eccc7b3e08c9f61f40351c49cd77c4624aabe3029572a3412687834
 AUX fluxbox.xsession 2004 RMD160 9a5f192628d6d888734f24b9ff4f6f1b7e8f178b SHA1 ec59f4611868866b8bc6d7fc9762bbc9bca640c3 SHA256 dbff4840a2c32c8ab837e4f34cb002f810dccca107f5e04a28c22d33db2a59bd
+AUX gentoo_style_location-1.1.x.patch 711 RMD160 d6d358759ba664bcfcf098f47d37f206387de007 SHA1 1ac6b515ab6004757cd5217cb74c892feb5ea5ee SHA256 84aba82bc9ab3a9dcdeb3857eb7ee0236a8ec96ae77e29cd0455813bac473915
 AUX styles-menu-commonbox 127 RMD160 e5668235e10ffa8fa73683d23d4483c85bf4296e SHA1 59c6aed23a105536de1b1264f94ee75008d74557 SHA256 44a56b182b0da9bf26ac41ff7e5ea8da3ddb7c5cbca0f554e3c74f15c72a3d98
 AUX styles-menu-fluxbox 117 RMD160 a2f3ced8acd6bd9057aea30b6ca374cff7d3db3e SHA1 99692536559b07878054852e17171d4ef5f79a76 SHA256 f5829a442d8653941e2741ab73f49e9d9c95fc8129531e4197730c0bbb2f2989
 AUX styles-menu-user 93 RMD160 2a6831b45ce1d655586b699d16c0547de201d187 SHA1 84a02411e552875877c169a08b49dc452176c474 SHA256 5f708a443c602485d958cb21cf55d9680e86aa3369215552c35ed9f46429e946
 DIST fluxbox-1.0.0.tar.bz2 767586 RMD160 320b11a1cf96a757da079886cd6496b9d84ab202 SHA1 7985e35fbb170fda24b9e04610690cd04c7a8748 SHA256 3c27672fdd4709d7f5c7968b4197ef704fce82766f51a5bebf411953516794c5
 DIST fluxbox-1.1.0.1.tar.bz2 778639 RMD160 319158d5c618302a3505db8e58de60bef82ee251 SHA1 70d41a0192b77d2da491221185ce1a7ec4ebda3c SHA256 5876363c6cb13a68be86c193027634ced4333027b4edc23b511346166884f1fc
+DIST fluxbox-1.1.1.tar.bz2 777660 RMD160 aabfdd10c835d0ef903885646a7f34f7df75af17 SHA1 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f SHA256 903f676a71a301513cd0b3db17e49f88c8d91583793176c4c70358a3012cca34
 EBUILD fluxbox-1.0.0-r2.ebuild 3621 RMD160 d4ac47671bd8b1f74f1c6fcbfff30f689cc062ad SHA1 7a768c690670c49ba2733b2fc0fd73b23caa1723 SHA256 eb2d6cb5af60fc6a7677cffac0cab425aa0bfaa628aa5df4a43e47c1aa502204
 EBUILD fluxbox-1.0.0.ebuild 3479 RMD160 4f03ae5c929ec5a5bf29910860d49c13588ee204 SHA1 7bfeb545af7967ed61a960569184fcb159f1224b SHA256 02181696623588a70588203a6e8c876d3f1eb84d1a8544b88bc3dea9c09ac580
 EBUILD fluxbox-1.1.0.1.ebuild 3421 RMD160 f9bcd4a6698a7e278fac78e96d9319ba80b47f61 SHA1 14cc1e8ae6cfb443490009e64f30c0174854eb25 SHA256 2f976be74bf1c9108b13176985918d4735328e43ad2871b3d3fbae47f5066da1
-MISC ChangeLog 47961 RMD160 949ccd9ebd09fc52620ab366493921261b9f910d SHA1 a82a7c6798fa404d8d2ca814a2a32c1a2c79a657 SHA256 9764f074887df68aa4a357c54288b1adc1c36e00c21baaae12a37a8e5a83702a
+EBUILD fluxbox-1.1.1.ebuild 3419 RMD160 b09dc93abe4394e0656deabe8cd3085da5dfa456 SHA1 354123723a0c58919324c08fd42ed98a6704d6f3 SHA256 e0ea40475effb96bbe0a09a9bd2c851f65467fa52419c7bcecb039c25d987dd2
+MISC ChangeLog 48138 RMD160 c81517be99f84c11c99583a234233b6bc669d7bf SHA1 087da33a142c8f0f36ae37febbdd9b40ee4596a0 SHA256 8c9c4c39213e48845576aaff3c113d683455d00874b2aeebb1bc5c66a150f155
 MISC metadata.xml 889 RMD160 bc0b3e6606a75d67a5c0d825774380838b61b392 SHA1 a524bf36cd130073955d5690f47e926d10640e7a SHA256 40f77cbb0c2d9a438acd8d30b8c79f33899e0f58e63565a14dc88057a0f79751
diff --git a/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
new file mode 100644
index 000000000000..71183e2754b1
--- /dev/null
+++ b/x11-wm/fluxbox/files/gentoo_style_location-1.1.x.patch
@@ -0,0 +1,19 @@
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index aca8b08..b229046 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -1794,12 +1794,8 @@ fi
+ 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/fluxbox-1.1.1.ebuild b/x11-wm/fluxbox/fluxbox-1.1.1.ebuild
new file mode 100644
index 000000000000..3a69ed1bfab3
--- /dev/null
+++ b/x11-wm/fluxbox/fluxbox-1.1.1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.1.1.ebuild,v 1.1 2008/09/18 15:38:32 lack Exp $
+
+EAPI=1
+inherit eutils
+
+IUSE="nls xinerama truetype gnome +imlib +slit +toolbar vim-syntax"
+
+DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
+
+SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
+HOMEPAGE="http://www.fluxbox.org"
+
+# Please note that USE="gnome" simply adds support for some gnome protocols, and
+# does not depend on external libraries.  However, it does make the binary a
+# fair bit bigger, so we don't want to turn it on unless the user actually wants
+# it.
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXrandr
+	xinerama? ( x11-libs/libXinerama )
+	x11-apps/xmessage
+	virtual/xft
+	truetype? ( media-libs/freetype )
+	imlib? ( >=media-libs/imlib2-1.2.0 )
+	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="nls? ( sys-devel/gettext )
+	x11-proto/xextproto
+	xinerama? ( x11-proto/xineramaproto )
+	${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 && ! 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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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"
+
+	# 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_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) \
+		$(use_enable gnome) \
+		$(use_enable imlib imlib2) \
+		$(use_enable slit ) \
+		$(use_enable 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
+	emake DESTDIR="${D}" STRIP="" install || die "install failed"
+	dodoc README* AUTHORS TODO* ChangeLog NEWS
+
+	dodir /usr/share/xsessions
+	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" || die
+	doins "${FILESDIR}/styles-menu-commonbox" || die
+	doins "${FILESDIR}/styles-menu-user" || die
+}