4 files changed, 46 insertions, 13 deletions
diff --git a/dev-libs/libmcal/ChangeLog b/dev-libs/libmcal/ChangeLog
index dff68ba658c8..13cfdf1a6247 100644
--- a/dev-libs/libmcal/ChangeLog
+++ b/dev-libs/libmcal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libmcal
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.2 2003/07/24 11:23:54 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.3 2003/11/27 16:20:51 aliz Exp $
+
+  27 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> libmcal-0.7-r1.ebuild:
+  Added -fPIC patch to add better -fPIC compilation. Closing #32951.
 
 *libmcal-0.7-r1 (24 Jul 2003)
 
diff --git a/dev-libs/libmcal/Manifest b/dev-libs/libmcal/Manifest
index 69024f7445da..5579fc2f2148 100644
--- a/dev-libs/libmcal/Manifest
+++ b/dev-libs/libmcal/Manifest
@@ -1,5 +1,6 @@
-MD5 abb3505f88eee9b7cdf78468d07887ec ChangeLog 600
 MD5 03adf005d039557fdff883650e258835 libmcal-0.7.ebuild 743
-MD5 0efde098d114a966797b0faa8a48fd2b libmcal-0.7-r1.ebuild 837
-MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
+MD5 2878a54dc259b8ece515d58e19240e2d ChangeLog 739
+MD5 810f97181ab0733fad317da237cfd399 libmcal-0.7-r1.ebuild 772
 MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7-r1 62
+MD5 164c1590a106af41fb8a5de71843861b files/libmcal-0.7-fpic.patch 769
+MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
diff --git a/dev-libs/libmcal/files/libmcal-0.7-fpic.patch b/dev-libs/libmcal/files/libmcal-0.7-fpic.patch
new file mode 100644
index 000000000000..cedb6ebf0072
--- /dev/null
+++ b/dev-libs/libmcal/files/libmcal-0.7-fpic.patch
@@ -0,0 +1,30 @@
+--- Makefile.in	2003-11-27 15:46:46.887752568 +0000
++++ Makefile.in	2003-11-27 16:14:17.325847840 +0000
+@@ -7,7 +7,7 @@
+ 
+ INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
+ 
+-CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
++CFLAGS=-O0 -Wall -g ${OTHER_CFLAGS}
+ 
+ LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
+ ALLOBJS=${LIBOBJS} tester.o
+@@ -17,6 +17,9 @@
+ LIBCAL=libmcal.a
+ LIBCAL_SO=libmcal.so
+ 
++%.o: %.c
++	gcc $(CFLAGS) -fPIC $(INCLUDE) -c -o $@ $<
++
+ all: libmcal.a libmcal.so
+ 
+ install: libmcal.a libmcal.so
+@@ -38,7 +41,7 @@
+ 
+ libmcal.so: $(LIBOBJS)
+ 	rm -f $(LIBCAL_SO)
+-	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
++	gcc $(CFLAGS) $(INCLUDE) -shared -o $(LIBCAL_SO) $(LIBOBJS)
+ 
+ lex.ical_yy.c: icalscanner.lex
+ 	$(FLEX) $<
diff --git a/dev-libs/libmcal/libmcal-0.7-r1.ebuild b/dev-libs/libmcal/libmcal-0.7-r1.ebuild
index 32d105c77d74..e7997d53866e 100644
--- a/dev-libs/libmcal/libmcal-0.7-r1.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r1.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/dev-libs/libmcal/libmcal-0.7-r1.ebuild,v 1.3 2003/09/08 07:19:26 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r1.ebuild,v 1.4 2003/11/27 16:20:51 aliz Exp $
 
 DESCRIPTION="Modular Calendar Access Libary"
 HOMEPAGE="http://mcal.chek.com/"
@@ -15,16 +15,15 @@ DEPEND=""
 RDEPEND=""
 S=${WORKDIR}/${PN}
 
-src_compile() {
-	econf
-
-	[ "${ARCH}" = "hppa" ] && CFLAGS="${CFLAGS} -fPIC"
+src_unpack() {
+	unpack ${A} ; cd ${S}
 
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s/-O0 -Wall -g/-Wall ${CFLAGS}/" Makefile.orig > Makefile
+	epatch ${FILESDIR}/${P}-fpic.patch
+}
 
-	emake || die
+src_compile() {
+	econf
+	emake CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {