Fixed makefile to add missing symbol to shared lib (see bug #157287).

(Portage version: 2.1.3.19)

5 files changed, 28 insertions, 16 deletions

diff --git a/media-libs/qhull/ChangeLog b/media-libs/qhull/ChangeLog
index 7cddddf3e536..6f46fab8d70c 100644
--- a/media-libs/qhull/ChangeLog
+++ b/media-libs/qhull/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/qhull
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.20 2007/02/22 02:05:28 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/ChangeLog,v 1.21 2007/11/18 13:15:43 markusle Exp $
+
+  18 Nov 2007; Markus Dittrich <markusle@gentoo.org>
+  files/qhull-3.1-makefile.patch, metadata.xml, qhull-3.1-r1.ebuild,
+  qhull-2003.1.ebuild:
+  Fixed makefile to add missing symbol to shared lib (see bug #157287). 
+  Thanks much to Dylan <dshell@robotics.usc.edu> for pointing this out.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-libs/qhull/files/qhull-3.1-makefile.patch b/media-libs/qhull/files/qhull-3.1-makefile.patch
index 4ea5e8bed550..edb6e1766e4c 100644
--- a/media-libs/qhull/files/qhull-3.1-makefile.patch
+++ b/media-libs/qhull/files/qhull-3.1-makefile.patch
@@ -1,5 +1,14 @@
---- Makefile	2001-02-12 03:26:08.000000000 +0100
-+++ /root/Makefile	2005-02-22 22:00:15.077553880 +0100
+--- Makefile.old	2001-02-11 21:26:08.000000000 -0500
++++ Makefile	2007-11-18 08:03:19.000000000 -0500
+@@ -62,7 +62,7 @@
+ 
+ # OBJS in execution frequency order.  CFILES after qhull.c are alphabetical
+ OBJS = user.o global.o stat.o io.o geom2.o poly2.o \
+-       merge.o qhull.o geom.o poly.o qset.o mem.o
++       merge.o qhull.o geom.o poly.o qset.o mem.o unix.o
+ 
+ CFILES= unix.c qhull.c geom.c geom2.c global.c io.c mem.c merge.c poly.c \
+         poly2.c qset.c stat.c user.c qconvex.c qdelaun.c qhalf.c qvoronoi.c
 @@ -78,7 +78,7 @@
  		qh-poly.htm qh-qhull.htm qh-set.htm qh-stat.htm qh-user.htm \
  		qdelau_f.htm qhalf.htm qvoronoi.htm qvoron_f.htm rbox.htm 
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
index 54494c4bb860..5a2f1c7b832e 100644
--- a/media-libs/qhull/metadata.xml
+++ b/media-libs/qhull/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
+<herd>sci-mathematics</herd>
 </pkgmetadata>
diff --git a/media-libs/qhull/qhull-2003.1.ebuild b/media-libs/qhull/qhull-2003.1.ebuild
index 13cd809d57ae..70b2308bb588 100644
--- a/media-libs/qhull/qhull-2003.1.ebuild
+++ b/media-libs/qhull/qhull-2003.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2003.1.ebuild,v 1.1 2007/01/22 19:24:29 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-2003.1.ebuild,v 1.2 2007/11/18 13:15:43 markusle Exp $
 
 inherit eutils
 
@@ -16,12 +16,12 @@ IUSE=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd "${S}"/src
 	mv Makefile.txt Makefile
 	# Replaced sed/echo hacks by a clean patch. Fix build error on -fPIC archs
 	# BUG #82646
 	# Danny van Dyk <kugelfang@gentoo.org> 2005/02/22
-	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
@@ -39,7 +39,7 @@ src_install() {
 	insinto /usr/include/qhull
 	doins *.h
 
-	cd ${S}
+	cd "${S}"
 	dodoc Announce.txt COPYING.txt File_id.diz README.txt REGISTER.txt
 	cd html
 	dohtml *
diff --git a/media-libs/qhull/qhull-3.1-r1.ebuild b/media-libs/qhull/qhull-3.1-r1.ebuild
index 3d2191d9689a..e97ec68cbbed 100644
--- a/media-libs/qhull/qhull-3.1-r1.ebuild
+++ b/media-libs/qhull/qhull-3.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-3.1-r1.ebuild,v 1.12 2006/03/07 12:49:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qhull/qhull-3.1-r1.ebuild,v 1.13 2007/11/18 13:15:43 markusle Exp $
 
 inherit eutils
 
@@ -18,12 +18,12 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
+	cd "${S}"/src
 	mv Makefile.txt Makefile
 	# Replaced sed/echo hacks by a clean patch. Fix build error on -fPIC archs
 	# BUG #82646
 	# Danny van Dyk <kugelfang@gentoo.org> 2005/02/22
-	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
@@ -41,7 +41,7 @@ src_install() {
 	insinto /usr/include/qhull
 	doins *.h
 
-	cd ${S}
+	cd "${S}"
 	dodoc Announce.txt COPYING.txt File_id.diz README.txt REGISTER.txt
 	cd html
 	dohtml *