Apply Makefile fix from bug #50190.

5 files changed, 98 insertions, 14 deletions

diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 1e84d6416f56..4a729a4f0c41 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/openbox
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.79 2004/04/27 17:59:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.80 2004/05/06 16:20:41 tseng Exp $
+
+*openbox-3.2-r1 (06 May 2004)
+
+  06 May 2004; Brandon Hale <tseng@gentoo.org>
+  +files/openbox-3.2-makefile.patch, +openbox-3.2-r1.ebuild:
+  Apply Makefile fix from bug #50190.
 
   27 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> openbox-3.2.ebuild:
   Keyworded sparc
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 20fd05f7f3a6..7da1022b6198 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,20 +1,23 @@
-MD5 d7d3769c614747ee9ea7b3f44c811f61 ChangeLog 15058
-MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
+MD5 71a7aff82923c115b37a4554e537815c ChangeLog 15233
+MD5 b09677ff53035b74c6b28636f9a6c834 openbox-3.1.ebuild 1447
+MD5 695381af489977c86734b680055a92a9 openbox-3.2-r1.ebuild 1474
+MD5 f6723c0aacb7c4f1cce3cdcf8716cc4f openbox-3.0.ebuild 1341
+MD5 1d71a1dfaddeeebfab9c670f05ea561a openbox-3.2.ebuild 1405
 MD5 7b8dce280ab31281f57b448d4b2d3efa openbox-2.3.0.ebuild 1237
 MD5 ae76a246cf47a588609fb00681fcd613 openbox-2.3.1.ebuild 1260
-MD5 f90e8860954c9ad0c229287c336c82ce openbox-3.0-r1.ebuild 1441
-MD5 f6723c0aacb7c4f1cce3cdcf8716cc4f openbox-3.0.ebuild 1341
 MD5 aa3cd0e578c5d4ce8acbc02079f47fc0 openbox-3.1-r1.ebuild 1419
-MD5 b09677ff53035b74c6b28636f9a6c834 openbox-3.1.ebuild 1447
-MD5 1d71a1dfaddeeebfab9c670f05ea561a openbox-3.2.ebuild 1405
-MD5 e8173797964d97d9293eee8faa1a95aa files/digest-openbox-2.3.0 65
-MD5 3e1e2a98c9d9ad020a2d31e32335631d files/digest-openbox-2.3.1 65
-MD5 b304744ad6cee743ab5e4c2f1ddd3409 files/digest-openbox-3.0 134
-MD5 b304744ad6cee743ab5e4c2f1ddd3409 files/digest-openbox-3.0-r1 134
+MD5 f90e8860954c9ad0c229287c336c82ce openbox-3.0-r1.ebuild 1441
+MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
+MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192
 MD5 65fe3e6fb33eb6717d28799c961b51ca files/digest-openbox-3.1 134
+MD5 3e1e2a98c9d9ad020a2d31e32335631d files/digest-openbox-2.3.1 65
 MD5 65fe3e6fb33eb6717d28799c961b51ca files/digest-openbox-3.1-r1 134
+MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
+MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r1 134
+MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
+MD5 b304744ad6cee743ab5e4c2f1ddd3409 files/digest-openbox-3.0-r1 134
 MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2 134
-MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
 MD5 0b79bdcff70f29cdaf7980382b34dee4 files/openbox-2.3.1-nls-codeset.patch 306
-MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
-MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192
+MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
+MD5 e8173797964d97d9293eee8faa1a95aa files/digest-openbox-2.3.0 65
+MD5 b304744ad6cee743ab5e4c2f1ddd3409 files/digest-openbox-3.0 134
diff --git a/x11-wm/openbox/files/digest-openbox-3.2-r1 b/x11-wm/openbox/files/digest-openbox-3.2-r1
new file mode 100644
index 000000000000..40daee057d5f
--- /dev/null
+++ b/x11-wm/openbox/files/digest-openbox-3.2-r1
@@ -0,0 +1,2 @@
+MD5 96b6393839883c4b260388879154d294 openbox-3.2.tar.gz 561115
+MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/files/openbox-3.2-makefile.patch b/x11-wm/openbox/files/openbox-3.2-makefile.patch
new file mode 100644
index 000000000000..f50fa086f15a
--- /dev/null
+++ b/x11-wm/openbox/files/openbox-3.2-makefile.patch
@@ -0,0 +1,14 @@
+--- Makefile.am.orig	2004-05-06 01:59:08.943196669 -0700
++++ Makefile.am	2004-05-06 02:02:30.184343747 -0700
+@@ -55,6 +55,11 @@
+ 	-DDEFAULT_THEME=\"$(theme)\"
+ render_libobrender_la_LDFLAGS = \
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++render_libobrender_la_LIBADD = \
++	$(X_LIBS) \
++	$(XFT_LIBS) \
++	$(GLIB_LIBS) \
++	$(XML_LIBS) 
+ render_libobrender_la_SOURCES = \
+ 	gettext.h \
+ 	render/color.h \
diff --git a/x11-wm/openbox/openbox-3.2-r1.ebuild b/x11-wm/openbox/openbox-3.2-r1.ebuild
new file mode 100644
index 000000000000..8ba99271d1d6
--- /dev/null
+++ b/x11-wm/openbox/openbox-3.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r1.ebuild,v 1.1 2004/05/06 16:20:41 tseng Exp $
+
+S=${WORKDIR}/${P/_/-}
+DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
+
+SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz
+		mirror://gentoo/ob-themes-usability.tar.bz2"
+
+HOMEPAGE="http://icculus.org/openbox/"
+IUSE="nls"
+SLOT="3"
+
+RDEPEND="virtual/xft
+	virtual/x11
+	>=dev-libs/glib-2
+	>=media-libs/fontconfig-2
+	>=dev-libs/libxml2-2.0"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile.patch
+}
+
+src_compile() {
+
+	econf \
+		`use_enable nls` || 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 README AUTHORS ChangeLog TODO
+
+	# 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
+}