8 files changed, 22 insertions, 57 deletions
diff --git a/x11-themes/commonbox-styles/ChangeLog b/x11-themes/commonbox-styles/ChangeLog
index 5592c58a73a1..c44102bbe1d1 100644
--- a/x11-themes/commonbox-styles/ChangeLog
+++ b/x11-themes/commonbox-styles/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-themes/commonbox-styles
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/commonbox-styles/ChangeLog,v 1.8 2002/10/14 23:35:23 mkeadle Exp $
+# $Header:
+
+*commonbox-styles-0.6 (26 Nov 2002)
+
+  26 Nov 2002; Matt Keadle <mkeadle@gentoo.org>
+  commonbox-styles-0.6.ebuild files/digest-commonbox-styles-0.6 :
+
+  New revisions of styles from Openbox are now included. Openbox
+  can now use pixmaps as window buttons, which the new styles now
+  are able to take advantage of. Pixmap buttons will now be
+  installed untill Openbox is installed.
 
 *commonbox-styles-0.5 (14 Oct 2002)
 
diff --git a/x11-themes/commonbox-styles/commonbox-styles-0.3.ebuild b/x11-themes/commonbox-styles/commonbox-styles-0.3.ebuild
deleted file mode 100644
index 11b5895a17db..000000000000
--- a/x11-themes/commonbox-styles/commonbox-styles-0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/commonbox-styles/commonbox-styles-0.3.ebuild,v 1.3 2002/10/22 15:45:00 bjb Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Common styles for flux|black|open(box)."
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://mkeadle.org/ebuilds/${P}.tar.bz2"
-HOMEPAGE="http://mkeadle.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64 alpha"
-
-RDEPEND="virtual/x11"
-
-src_install () {
-
-	insinto /usr/share/commonbox/styles
-	doins ${S}/styles/*
-	dodoc README.commonbox-styles COPYING
-
-}
diff --git a/x11-themes/commonbox-styles/commonbox-styles-0.4.ebuild b/x11-themes/commonbox-styles/commonbox-styles-0.4.ebuild
deleted file mode 100644
index 691fb9fdbba0..000000000000
--- a/x11-themes/commonbox-styles/commonbox-styles-0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/commonbox-styles/commonbox-styles-0.4.ebuild,v 1.3 2002/10/22 15:45:01 bjb Exp $
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Common styles for flux|black|open(box)."
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://mkeadle.org/ebuilds/${P}.tar.bz2"
-HOMEPAGE="http://mkeadle.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64 alpha"
-
-RDEPEND="virtual/x11"
-
-src_install () {
-
-	insinto /usr/share/commonbox/styles
-	doins ${S}/styles/*
-	dodoc README.commonbox-styles COPYING
-
-}
diff --git a/x11-themes/commonbox-styles/commonbox-styles-0.2.ebuild b/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
index 2576eca7d82b..a36b839f77c5 100644
--- a/x11-themes/commonbox-styles/commonbox-styles-0.2.ebuild
+++ b/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild
@@ -1,24 +1,27 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/commonbox-styles/commonbox-styles-0.2.ebuild,v 1.6 2002/10/22 15:45:00 bjb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/commonbox-styles/commonbox-styles-0.6.ebuild,v 1.1 2002/11/26 23:16:09 mkeadle Exp $
 
-S=${WORKDIR}/${PN}
-DESCRIPTION="Common styles for flux|black|open(box)."
+S=${WORKDIR}/${P}
+DESCRIPTION="Common styles for fluxbox, blackbox, and openbox."
 SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://mkeadle.org/ebuilds/${P}.tar.bz2"
-HOMEPAGE="http://mkeadle.org/"
+		http://mkeadle.org/ebuilds/${P}.tar.bz2"
+HOMEPAGE="http://gentoo.mkeadle.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc sparc64 alpha"
 
-DEPEND="virtual/x11"
 RDEPEND="virtual/x11"
 
 src_install () {
 
+	insinto /usr/share/commonbox/backgrounds
+	doins ${S}/backgrounds/*
+
 	insinto /usr/share/commonbox/styles
 	doins ${S}/styles/*
-	dodoc README.commonbox-styles COPYING
+
+	dodoc README.commonbox-styles COPYING STYLES.authors
 
 }
diff --git a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.2 b/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.2
deleted file mode 100644
index 036acbb76e7e..000000000000
--- a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bc52d3f9d9771c2bff1a462324adef7c commonbox-styles-0.2.tar.bz2 30599
diff --git a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.3 b/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.3
deleted file mode 100644
index 2ffd4f47959d..000000000000
--- a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3024dad62c1bb764ce5be9432fe35bbf commonbox-styles-0.3.tar.bz2 31539
diff --git a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.4 b/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.4
deleted file mode 100644
index 0e90f0334475..000000000000
--- a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 141eb672560b227fc6acd3072479f49c commonbox-styles-0.4.tar.bz2 31964
diff --git a/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.6 b/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.6
new file mode 100644
index 000000000000..1d4cab6e8172
--- /dev/null
+++ b/x11-themes/commonbox-styles/files/digest-commonbox-styles-0.6
@@ -0,0 +1 @@
+MD5 fca998bce194850e5c56b53cb7ebd228 commonbox-styles-0.6.tar.bz2 106381