Fix bug 87160

(Portage version: 2.0.51.19)

5 files changed, 89 insertions, 11 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index ab98cc68eda7..21028258ae64 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.96 2005/03/30 16:37:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.97 2005/04/05 22:36:59 lostlogic Exp $
+
+*openbox-3.3_rc1-r2 (05 Apr 2005)
+
+  05 Apr 2005; Brandon Low <lostlogic@gentoo.org> openbox-3.3_rc1-r1.ebuild,
+  +openbox-3.3_rc1-r2.ebuild:
+  Fix bug 87160
 
   30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> openbox-3.2-r2.ebuild:
   Stable on ppc.
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 882881bf5959..f3244e7ff6cd 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,13 +1,15 @@
+MD5 2b63fb7f06fd3618de68285c4ac6d5a2 openbox-3.2-r2.ebuild 1581
+MD5 28bb531204dd2e8ef6c833dab8beb941 openbox-3.3_rc1-r2.ebuild 1732
 MD5 79cff5950461065f7c400f64e3ff2c92 openbox-3.2-r1.ebuild 1504
-MD5 d87e96216b91be365fcbc08521298824 metadata.xml 251
+MD5 28bb531204dd2e8ef6c833dab8beb941 openbox-3.3_rc1-r1.ebuild 1732
 MD5 0355177f2d7c4b012230b92b2abff1d6 ChangeLog 17063
-MD5 2b63fb7f06fd3618de68285c4ac6d5a2 openbox-3.2-r2.ebuild 1581
-MD5 47a673b76254e7074afd4ca3f4db2b20 openbox-3.3_rc1-r1.ebuild 1681
-MD5 0b79bdcff70f29cdaf7980382b34dee4 files/openbox-2.3.1-nls-codeset.patch 306
+MD5 d87e96216b91be365fcbc08521298824 metadata.xml 251
 MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r1 134
+MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r2 134
 MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
+MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
 MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192
-MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
+MD5 0b79bdcff70f29cdaf7980382b34dee4 files/openbox-2.3.1-nls-codeset.patch 306
 MD5 519483ed863bad15ab1a51dc3a9d8e07 files/digest-openbox-3.3_rc1-r1 138
-MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r2 134
-MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
+MD5 519483ed863bad15ab1a51dc3a9d8e07 files/digest-openbox-3.3_rc1-r2 138
+MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
diff --git a/x11-wm/openbox/files/digest-openbox-3.3_rc1-r2 b/x11-wm/openbox/files/digest-openbox-3.3_rc1-r2
new file mode 100644
index 000000000000..0acbf44964b9
--- /dev/null
+++ b/x11-wm/openbox/files/digest-openbox-3.3_rc1-r2
@@ -0,0 +1,2 @@
+MD5 83bbb28369050f5767f5b4f5c34d90e0 openbox-3.3-rc1.tar.gz 575982
+MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild b/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild
index cd8efe324d68..94135d73074c 100644
--- a/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild,v 1.1 2005/03/29 13:46:27 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild,v 1.2 2005/04/05 22:36:59 lostlogic Exp $
 
 inherit eutils
 
@@ -33,8 +33,12 @@ src_unpack() {
 }
 
 src_compile() {
-	econf `use_enable nls` \
-	      `use_enable pango` || die
+	if use pango ; then
+		myconf="--enable-pango"
+	else
+		myconf=""
+	fi
+	econf `use_enable nls` ${myconf} || die
 	emake || die
 }
 
diff --git a/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild b/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild
new file mode 100644
index 000000000000..049c7c1f28ac
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild,v 1.1 2005/04/05 22:36:59 lostlogic Exp $
+
+inherit eutils
+
+DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
+HOMEPAGE="http://icculus.org/openbox/"
+SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz
+	mirror://gentoo/ob-themes-usability.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+IUSE="pango nls startup-notification"
+
+RDEPEND="virtual/xft
+	virtual/x11
+	>=dev-libs/glib-2
+	>=media-libs/fontconfig-2
+	>=dev-libs/libxml2-2.0"
+DEPEND="${RDEPEND}
+	pango? ( x11-libs/pango )
+	startup-notification? ( x11-libs/startup-notification )
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${P/_/-}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-3.2-makefile.patch
+}
+
+src_compile() {
+	if use pango ; then
+		myconf="--enable-pango"
+	else
+		myconf=""
+	fi
+	econf `use_enable nls` ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
+	fperms a+x /etc/X11/Sessions/openbox
+
+	dodir /usr/share/xsessions
+	insinto /usr/share/xsessions
+	doins ${FILESDIR}/${PN}.desktop
+
+	make DESTDIR=${D} install || die
+	dodoc ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README
+
+	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
+	# These are included due to the poor usability of the default themes
+	# for users with limited vision. These are based on Jimmac's
+	# Gorilla and Industrial themes for Metacity.
+
+	dodir /usr/share/themes
+	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
+}