summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaran McCreesh <ciaranm@gentoo.org>2005-02-26 17:28:07 +0000
committerCiaran McCreesh <ciaranm@gentoo.org>2005-02-26 17:28:07 +0000
commit59dd0f41e56acf2c6858030f78534a12e93818fa (patch)
treeae7b60ae15769bbac1b5d58afe70d9cb8d9be2d2 /x11-wm/fluxbox
parentversion bump (diff)
downloadgentoo-2-59dd0f41e56acf2c6858030f78534a12e93818fa.tar.gz
gentoo-2-59dd0f41e56acf2c6858030f78534a12e93818fa.tar.bz2
gentoo-2-59dd0f41e56acf2c6858030f78534a12e93818fa.zip
Erm, no.
(Portage version: 2.0.51.16-militant-sandwich)
Diffstat (limited to 'x11-wm/fluxbox')
-rw-r--r--x11-wm/fluxbox/ChangeLog7
-rw-r--r--x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch56
-rw-r--r--x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r21
-rw-r--r--x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild167
4 files changed, 6 insertions, 225 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 91863c70e940..b678a6b0723c 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/fluxbox
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.145 2005/02/26 11:01:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.146 2005/02/26 17:28:07 ciaranm Exp $
+
+ 26 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org>
+ -files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch,
+ -fluxbox-0.9.12-r2.ebuild:
+ Erm, no.
*fluxbox-0.9.12-r2 (26 Feb 2005)
diff --git a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch b/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch
deleted file mode 100644
index 6ab454c1a6d0..000000000000
--- a/x11-wm/fluxbox/files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Nuar fluxbox-0.9.12.orig/src/FbTk/Makefile.am fluxbox-0.9.12/src/FbTk/Makefile.am
---- fluxbox-0.9.12.orig/src/FbTk/Makefile.am 2005-01-26 17:36:10.255652000 -0800
-+++ fluxbox-0.9.12/src/FbTk/Makefile.am 2005-01-26 17:37:42.226670672 -0800
-@@ -1,4 +1,4 @@
--noinst_LIBRARIES = libFbTk.a
-+lib_LTLIBRARIES = libFbTk.la
-
- AM_CPPFLAGS=@CPPFLAGS@
-
-@@ -15,7 +15,7 @@
- imlib2_SOURCE= ImageImlib2.hh ImageImlib2.cc
- endif
-
--libFbTk_a_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
-+libFbTk_la_SOURCES = App.hh App.cc Color.cc Color.hh Command.hh \
- FileUtil.hh FileUtil.cc \
- EventHandler.hh EventManager.hh EventManager.cc \
- FbWindow.hh FbWindow.cc Font.cc Font.hh FontImp.hh \
-diff -Nuar fluxbox-0.9.12.orig/src/Makefile.am fluxbox-0.9.12/src/Makefile.am
---- fluxbox-0.9.12.orig/src/Makefile.am 2004-11-15 12:40:45.000000000 -0800
-+++ fluxbox-0.9.12/src/Makefile.am 2005-01-26 17:41:31.127872400 -0800
-@@ -120,4 +120,4 @@
- ${REMEMBER_SOURCE} ${REGEXP_SOURCE} ${TOOLBAR_SOURCE}
-
-
--LDADD=FbTk/libFbTk.a
-+LDADD=FbTk/libFbTk.la
-diff -Nuar fluxbox-0.9.12.orig/util/Makefile.am fluxbox-0.9.12/util/Makefile.am
---- fluxbox-0.9.12.orig/util/Makefile.am 2004-11-15 12:40:54.000000000 -0800
-+++ fluxbox-0.9.12/util/Makefile.am 2005-01-26 17:41:50.346950656 -0800
-@@ -5,7 +5,7 @@
- bin_PROGRAMS= bsetroot
- bsetroot_SOURCES= bsetroot.cc bsetroot.hh
- bsetroot_LDADD= ../src/FbRootWindow.o ../src/FbAtoms.o \
-- ../src/FbTk/libFbTk.a
-+ ../src/FbTk/libFbTk.la
-
- MAINTAINERCLEANFILES= Makefile.in
- EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \
-diff -Nuar fluxbox-0.9.12.orig/util/fbrun/Makefile.am fluxbox-0.9.12/util/fbrun/Makefile.am
---- fluxbox-0.9.12.orig/util/fbrun/Makefile.am 2004-11-15 12:40:54.000000000 -0800
-+++ fluxbox-0.9.12/util/fbrun/Makefile.am 2005-01-26 17:55:37.061270976 -0800
-@@ -2,7 +2,9 @@
- INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
- bin_PROGRAMS= fbrun
- fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
--fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
-
--${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
-- cd ${FLUXBOX_SRC_DIR}FbTk && make
-\ No newline at end of file
-+FbTkDir= ${FLUXBOX_SRC_DIR}FbTk
-+fbrun_LDADD= $(FbTkDir)/libFbTk.la
-+
-+$(fbrun_LDADD):
-+ cd $(FbTkDir) && make
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2
deleted file mode 100644
index 9f51ea28b9fd..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 398f4e10d88b47507ea309968340961c fluxbox-0.9.12.tar.bz2 648685
diff --git a/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild
deleted file mode 100644
index b58693122e91..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12-r2.ebuild,v 1.1 2005/02/26 11:01:30 robbat2 Exp $
-
-inherit eutils
-
-IUSE="nls xinerama truetype kde gnome imlib bigger-fonts disablexmb"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-# SourceForge mirrors are broken. Yay!
-# SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-SRC_URI="http://www.fluxbox.org/download/${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="virtual/x11
- truetype? ( media-libs/freetype )
- nls? ( sys-devel/gettext )
- imlib? ( >=media-libs/imlib2-1.2.0 )
- !<x11-themes/fluxbox-styles-fluxmod-20040809-r1"
-DEPEND=">=sys-devel/autoconf-2.52
- sys-devel/libtool
- sys-devel/automake
- ${RDEPEND}"
-PROVIDE="virtual/blackbox"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~ppc-macos"
-
-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}/${P}-our-styles-go-over-here.patch
-
- # menu generator things
- epatch ${FILESDIR}/${PV}/${P}-you-got-mail.patch
- epatch ${FILESDIR}/${PV}/${P}-sweet-sweet-music.patch
- epatch ${FILESDIR}/${PV}/${P}-vi-sucks-use-vim.patch
- epatch ${FILESDIR}/${PV}/${P}-pretty-eye-candy.patch
-
- # fixes
- epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-not-null.patch
- epatch ${FILESDIR}/${PV}/${P}-3853-zero-is-still-not-null.patch
- epatch ${FILESDIR}/${PV}/${P}-3856-hide-and-seek-is-bad.patch
- epatch ${FILESDIR}/${PV}/${P}-3860-menu-backups.patch
-
- # make FbTk build in a more intelligent fashion, and make it public.
- epatch ${FILESDIR}/${PV}/${P}-make-FbTk-available-as-la.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"
-
- # Use a less fugly default theme
- sed -i \
- -e 's~styles/Meta~styles/Emerge~' data/init.in
-
- # Turn on aa by default if possible. Fluxbox fonts are really frickin'
- # broken, we'll do what we can to make it less painful by default.
- use truetype 1>/dev/null && \
- echo "session.screen0.antialias: true" >> data/init.in
-
- ebegin "Fixing style fonts..."
- for style in data/styles/* ; do
- [[ -d "${style}" ]] && style=${style}/theme.cfg
- [[ -f "${style}" ]] || die "waah! ${style} doesn't exist"
-
- # Make fonts more readable if we use bigger-fonts
- if use bigger-fonts 1>/dev/null ; then
- sed -i \
- -e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
- ${style} || die "sed voodoo failed (insufficient goats?)"
- fi
-
- # We don't have a reliable sans font alias, change it to lucidasans.
- # That might not work either, but it's more likely...
- sed -i \
- -e 's~\([ \t:]\)sans\(-\|$\)~\1lucidasans\2~' \
- ${style} || die "sed voodoo failed (not a full moon)"
- done
- eend $?
-
- ebegin "auto-foo time"
- aclocal
- libtoolize --force --copy
- automake --add-missing --copy
- autoconf
- eend $?
-}
-
-src_compile() {
- export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
-
- econf \
- $(use_enable nls) \
- $(use_enable xinerama) \
- $(use_enable truetype xft) \
- $(use_enable kde) \
- $(use_enable gnome) \
- $(use_enable !disablexmb xmb) \
- $(use_enable imlib imlib2) \
- --sysconfdir=/etc/X11/${PN} \
- ${myconf} || die "configure failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- make DESTDIR=${D} install || die "make install failed"
- dodoc README* AUTHORS TODO* COPYING 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}/0.9.10/styles-menu-fluxbox || die
- doins ${FILESDIR}/0.9.10/styles-menu-commonbox || die
- doins ${FILESDIR}/0.9.10/styles-menu-user || die
-}
-
-pkg_postinst() {
- einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
- einfo "handling styles in the menu. To take advantage of this, use"
- einfo "the following for your menu styles section:"
- einfo " "
- einfo " [submenu] (Styles) {Select a Style}"
- einfo " [include] (/usr/share/fluxbox/menu.d/styles/)"
- einfo " [end]"
- einfo " "
- einfo "If you use fluxbox-generate_menu or the default global fluxbox"
- einfo "menu file, this will already be present."
- einfo " "
- if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
- ewarn "You must restart fluxbox before using the [include] /directory/"
- ewarn "feature if you are upgrading from an older fluxbox!"
- ewarn " "
- fi
- einfo "If you experience font problems, or if fluxbox takes a very"
- einfo "long time to start up, please try the 'disablexmb' USE flag."
- einfo "If that fails, please report bugs upstream."
- epause
-}