Fixed license (as-is).

6 files changed, 14 insertions, 108 deletions

diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index 5a26e16463cb..64bf01666368 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/fluxbox
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.81 2003/12/14 02:28:49 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.82 2003/12/20 01:52:38 tseng Exp $
+
+  19 Dec 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.1.14-r2.ebuild,
+  fluxbox-0.9.6.ebuild, fluxbox-0.9.6_pre9.ebuild:
+  Fixed license (as-is).
 
   14 Dec 2003; Lars Weiler <pylon@gentoo.org> fluxbox-0.9.6.ebuild:
   Masked stable on ppc
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index 18548c5a078a..39d283b780ff 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,17 +1,14 @@
-MD5 358b8742de817ea3a299e01755268602 ChangeLog 16868
-MD5 70bdb679a0bec937f9dfc9157e24f1ed fluxbox-0.9.6_pre9.ebuild 2751
-MD5 d33791fab5cec5a1de58a92d43bd5396 fluxbox-0.1.14-r2.ebuild 1553
+MD5 f07bede6c40a94cb45b25bbbaa78ef67 ChangeLog 17018
+MD5 e16077e6f49f640cabe7d96ab3e8f99f fluxbox-0.1.14-r2.ebuild 1551
+MD5 2c62e9868bff0c034d5a9886a0c769ca fluxbox-0.9.6.ebuild 2717
 MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
-MD5 688d212f6243eea9ed71f6493e89e6ad fluxbox-0.9.6.ebuild 2717
-MD5 395d40ebc808880f6345acd3e4db1f50 files/digest-fluxbox-0.9.6_pre9 134
 MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r2 67
 MD5 c28b191f95d32d2ab4d6c4f353faa070 files/fluxbox 27
-MD5 5f1cedd6893799695fbbc3a19f5c5cff files/fluxbox-0.1.13-openoffice.patch 525
 MD5 1613a723da70c8ef3f16df1f5639990b files/fluxbox-0.1.13-Xft2.patch 1408
 MD5 9a521a2ef9c0942ec02b714c3637e789 files/fluxbox-0.1.13-aa2.patch 1365
 MD5 86549bc3a5561ad2a0400a3b405003f4 files/fluxbox-0.1.13-menukey.patch 6269
 MD5 f0a0494829d2f32f6c17073ebb87f60a files/fluxbox-0.1.13-nls.patch 581
-MD5 8b338e04168ae3111707a90b13eaaa57 files/digest-fluxbox-0.9.6 130
+MD5 5f1cedd6893799695fbbc3a19f5c5cff files/fluxbox-0.1.13-openoffice.patch 525
 MD5 5ad4a28ef73318001e9526c5f2915355 files/fluxbox-0.1.13-remember.patch 38913
 MD5 7f9e9a76b3680c9ff5412c14a38b6198 files/fluxbox-0.1.14-gcc33.patch 4525
 MD5 ecd86299d1554e7b08784e43077c2d32 files/fluxbox-0.1.14-ja.patch 2459
@@ -19,3 +16,4 @@ MD5 96957d6246f0287f85531f6447a077c7 files/fluxbox-0.1.14-menukey.patch 6267
 MD5 0836c864c5f49e72c19bef764dbdfcac files/fluxbox-0.1.14-remember.patch 42020
 MD5 7b7044a97f3d2f84897e7fddf925b309 files/fluxbox-0.1.14-toggledecor.patch 823
 MD5 ddf99954256a3dc12763651bbf63bf3a files/fluxbox-vano-gentoo.patch 1092
+MD5 8b338e04168ae3111707a90b13eaaa57 files/digest-fluxbox-0.9.6 130
diff --git a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre9 b/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre9
deleted file mode 100644
index 8eb24a1deab9..000000000000
--- a/x11-wm/fluxbox/files/digest-fluxbox-0.9.6_pre9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 25b50d9cb00701a9b6a40149d026df31 fluxbox-0.9.6pre9.tar.gz 631548
-MD5 f6fa316baa5aa593c7bc4c40ac7e4517 blueflux_0.1.0.tar.gz 17601
diff --git a/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild b/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
index 63750a4773cd..68a1499fb46e 100644
--- a/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild,v 1.8 2003/12/06 08:12:27 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.1.14-r2.ebuild,v 1.9 2003/12/20 01:52:38 tseng Exp $
 
 IUSE="kde gnome nls xinerama truetype cjk"
 
@@ -11,7 +11,7 @@ DESCRIPTION="Window manager based on Blackbox -- has tabs."
 SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://fluxbox.sf.net"
 
-LICENSE="GPL-2"
+LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 ppc sparc hppa mips amd64 alpha"
 PROVIDE="virtual/blackbox"
diff --git a/x11-wm/fluxbox/fluxbox-0.9.6.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6.ebuild
index c9496cbd0126..e6a245c4f6c1 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.6.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6.ebuild,v 1.5 2003/12/14 02:28:49 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6.ebuild,v 1.6 2003/12/20 01:52:38 tseng Exp $
 
 IUSE="gnome kde nls xinerama truetype"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.gz
 HOMEPAGE="http://www.fluxbox.org/"
 
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="as-is"
 KEYWORDS="~x86 ppc ~mips ~sparc ~alpha ~amd64"
 
 DEPEND="virtual/x11
diff --git a/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild b/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild
deleted file mode 100644
index c490a4b4ffe1..000000000000
--- a/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.6_pre9.ebuild,v 1.2 2003/11/04 06:47:35 kumba Exp $
-
-IUSE="gnome kde nls xinerama truetype"
-
-#inherit flag-o-matic eutils
-
-MY_P=${P/_pre/pre}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Fluxbox is yet another windowmanager for X. It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and handles styles, colors, window placement and similar thing exactly like blackbox (100% theme/style compability). So what's the difference between fluxbox and blackbox then? The answer is: LOTS! *This is a development release and should not be considered stable.* *This release includes the Blueflux style.*"
-SRC_URI="http://fluxbox.org/download/${MY_P}.tar.gz
-	http://koti.mbnet.fi/bionik/blueflux/blueflux_0.1.0.tar.gz"
-HOMEPAGE="http://www.fluxbox.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips"
-
-DEPEND="virtual/x11
-		>=sys-devel/autoconf-2.52"
-RDEPEND="x11-misc/commonbox-utils
-		x11-themes/commonbox-styles"
-PROVIDE="virtual/blackbox"
-
-mydoc="ChangeLog COPYING NEWS"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	use nls && ( \
-		einfo "Redirecting NLS"
-		for i in `find ${S} -name 'Makefile.am'`
-		do
-			sed -i -e 's:$(pkgdatadir)/nls:/usr/share/locale:' ${i}
-		done
-	)
-
-	sed -i -e 's:bsetroot.1::' ${S}/doc/Makefile.am
-	sed -i -e 's:bsetroot::' ${S}/util/Makefile.*
-}
-
-
-src_compile() {
-
-	econf \
-		`use_enable nls` \
-		`use_enable kde` \
-		`use_enable gnome` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` \
-		--sysconfdir=/etc/X11/${PN} \
-		--datadir=/usr/share/commonbox \
-		${myconf} || die
-
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/Makefile
-	sed -i -e 's:\$(datadir)/fluxbox:/usr/share/commonbox:' ${S}/data/Makefile
-
-	emake \
-		pkgdatadir=/usr/share/commonbox || die
-
-	cd data make \
-		pkgdatadir=/usr/share/commonbox init
-}
-
-src_install() {
-
-	dodir /usr/share/commonbox/${PN}
-	dodir /usr/share/commonbox/styles
-	make DESTDIR=${D} install || die
-	dodoc README* AUTHORS TODO* ${mydoc}
-	rmdir ${D}/usr/share/${PN}
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/${PN}" > ${D}/etc/X11/Sessions/${PN}
-	fperms a+x /etc/X11/Sessions/${PN}
-
-	cd data
-	insinto /usr/share/commonbox
-	doins init keys
-	insinto /usr/share/commonbox/styles
-	doins ${D}/usr/share/commonbox/fluxbox/styles/Meta
-	rm -rf ${D}/usr/share/commonbox/fluxbox
-
-	# blueflux style
-	insinto /usr/share/commonbox/pixmaps
-	doins ${WORKDIR}/pixmaps/*
-	# fix some paths and change b->B at the same time
-	sed -e 's:\.fluxbox:/usr/share/commonbox:' ${WORKDIR}/styles/blueflux \
-		> ${WORKDIR}/styles/Blueflux
-	insinto /usr/share/commonbox/styles
-	doins ${WORKDIR}/styles/Blueflux
-}