diff options
-rw-r--r-- | x11-wm/fluxbox/ChangeLog | 6 | ||||
-rw-r--r-- | x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild | 118 | ||||
-rw-r--r-- | x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild | 4 |
3 files changed, 7 insertions, 121 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog index 82fa82b94bd0..4f6354ee86a3 100644 --- a/x11-wm/fluxbox/ChangeLog +++ b/x11-wm/fluxbox/ChangeLog @@ -1,6 +1,10 @@ # 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.250 2008/05/13 18:34:39 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.251 2008/05/22 13:36:02 lack Exp $ + + 22 May 2008; Jim Ramsay <lack@gentoo.org> -fluxbox-1.0.0-r1.ebuild, + fluxbox-1.0.0-r2.ebuild: + Marking stable on amd64, plus some small version cleanups 13 May 2008; Joseph Jezak <josejx@gentoo.org> fluxbox-1.0.0-r2.ebuild: Marked ppc stable. diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild deleted file mode 100644 index ae43e5357619..000000000000 --- a/x11-wm/fluxbox/fluxbox-1.0.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# 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.0.0-r1.ebuild,v 1.3 2008/02/28 15:27:57 lack Exp $ - -EAPI=1 -inherit eutils - -IUSE="nls xinerama truetype kde 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="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/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}/${PV}/gentoo_style_location.patch" - - # A couple menu generation fixes, #199437 and #199439 - epatch "${FILESDIR}/${PV}/generate-menu.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 kde) \ - $(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}" 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 -} diff --git a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild index af4f3fa9cccf..0962b106b7a8 100644 --- a/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild +++ b/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild @@ -1,6 +1,6 @@ # 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.0.0-r2.ebuild,v 1.5 2008/05/13 18:34:39 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.0.0-r2.ebuild,v 1.6 2008/05/22 13:36:03 lack Exp $ EAPI=1 inherit eutils @@ -36,7 +36,7 @@ PROVIDE="virtual/blackbox" SLOT="0" LICENSE="MIT" -KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +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 |