Multilib fixes. Don't use einstall.

(Portage version: 2.0.51-r15)

9 files changed, 116 insertions, 15 deletions

diff --git a/dev-libs/libmcal/ChangeLog b/dev-libs/libmcal/ChangeLog
index b3b160048f65..f638f34ed4d0 100644
--- a/dev-libs/libmcal/ChangeLog
+++ b/dev-libs/libmcal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmcal
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.22 2004/12/29 22:25:16 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.23 2005/02/07 05:28:10 eradicator Exp $
+
+*libmcal-0.7-r4 (06 Feb 2005)
+
+  06 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libmcal-0.7-libdir.patch, +libmcal-0.7-r4.ebuild:
+  Multilib fixes.  Don't use einstall.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-libs/libmcal/Manifest b/dev-libs/libmcal/Manifest
index 3a2fb4ec4da0..4d334b93d371 100644
--- a/dev-libs/libmcal/Manifest
+++ b/dev-libs/libmcal/Manifest
@@ -1,11 +1,13 @@
-MD5 9e501406a9f7a3ebcd9b668af6c07601 libmcal-0.7.ebuild 685
-MD5 d8f6c79e5b31dda631878ec0d6569030 libmcal-0.7-r1.ebuild 787
 MD5 42aeace760c41ce5fb107a0f3ea588cf ChangeLog 2841
-MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 d8f6c79e5b31dda631878ec0d6569030 libmcal-0.7-r1.ebuild 787
 MD5 7ca136ef0038667c616eecd92fd2eb5b libmcal-0.7-r2.ebuild 1785
 MD5 9546a6091f7c5820ef98e8560b3ab8c9 libmcal-0.7-r3.ebuild 1878
+MD5 9e501406a9f7a3ebcd9b668af6c07601 libmcal-0.7.ebuild 685
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 9546a6091f7c5820ef98e8560b3ab8c9 libmcal-0.7-r4.ebuild 1878
 MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
-MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r3 128
 MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7-r1 62
-MD5 d438648eeab0ea0e90bdf8ea2f3321c6 files/libmcal-0.7-fpic.patch 1302
 MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r2 128
+MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r3 128
+MD5 d438648eeab0ea0e90bdf8ea2f3321c6 files/libmcal-0.7-fpic.patch 1302
+MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r4 128
diff --git a/dev-libs/libmcal/files/digest-libmcal-0.7-r4 b/dev-libs/libmcal/files/digest-libmcal-0.7-r4
new file mode 100644
index 000000000000..fa36e3231f67
--- /dev/null
+++ b/dev-libs/libmcal/files/digest-libmcal-0.7-r4
@@ -0,0 +1,2 @@
+MD5 8d8f16e59a7e859c1407df3d72052825 libmcal-0.7.tar.gz 49039
+MD5 c8c96f6cd574139b88a13f6084164cfa mcaldrivers-0.9.tar.gz 13445
diff --git a/dev-libs/libmcal/files/libmcal-0.7-libdir.patch b/dev-libs/libmcal/files/libmcal-0.7-libdir.patch
new file mode 100644
index 000000000000..b784993aed01
--- /dev/null
+++ b/dev-libs/libmcal/files/libmcal-0.7-libdir.patch
@@ -0,0 +1,25 @@
+diff -Naur libmcal.orig/Makefile.in libmcal/Makefile.in
+--- libmcal.orig/Makefile.in	2003-01-28 09:45:21.000000000 -0800
++++ libmcal/Makefile.in	2005-02-06 21:20:58.860199158 -0800
+@@ -20,17 +20,17 @@
+ all: libmcal.a libmcal.so
+ 
+ install: libmcal.a libmcal.so
+-	mkdir -p ${DESTDIR}@prefix@/lib/
++	mkdir -p ${DESTDIR}@libdir@
+ 	mkdir -p ${DESTDIR}@prefix@/include/mcal/
+-	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@prefix@/lib
++	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@libdir@
+ 	install -m 644 -o 0 -g 0 \
+ 	  mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
+ 	  ${DESTDIR}@prefix@/include/mcal/
+ 	touch installed
+ 
+ install-strip: installed
+-	strip ${DESTDIR}@prefix@/lib/libmcal.so
+-	strip ${DESTDIR}@prefix@/lib/libmcal.a
++	strip ${DESTDIR}@libdir@/libmcal.so
++	strip ${DESTDIR}@libdir@/libmcal.a
+ 
+ libmcal.a: $(LIBOBJS)
+ 	rm -f $(LIBCAL)
diff --git a/dev-libs/libmcal/libmcal-0.7-r1.ebuild b/dev-libs/libmcal/libmcal-0.7-r1.ebuild
index c6646cd4cdfd..dc70534d8fc0 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-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.11 2004/08/07 21:54:30 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r1.ebuild,v 1.12 2005/02/07 05:28:10 eradicator Exp $
 
 inherit eutils
 
diff --git a/dev-libs/libmcal/libmcal-0.7-r2.ebuild b/dev-libs/libmcal/libmcal-0.7-r2.ebuild
index e1f52a66b202..5c7a4aa764fc 100644
--- a/dev-libs/libmcal/libmcal-0.7-r2.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r2.ebuild,v 1.7 2004/08/26 10:38:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r2.ebuild,v 1.8 2005/02/07 05:28:10 eradicator Exp $
 
 inherit eutils
 
diff --git a/dev-libs/libmcal/libmcal-0.7-r3.ebuild b/dev-libs/libmcal/libmcal-0.7-r3.ebuild
index 0c0c6c09bc73..05d2e0d22cc2 100644
--- a/dev-libs/libmcal/libmcal-0.7-r3.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r3.ebuild,v 1.5 2004/10/19 08:28:11 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r3.ebuild,v 1.6 2005/02/07 05:28:10 eradicator Exp $
 
 inherit eutils
 
diff --git a/dev-libs/libmcal/libmcal-0.7-r4.ebuild b/dev-libs/libmcal/libmcal-0.7-r4.ebuild
new file mode 100644
index 000000000000..c9332ec401f5
--- /dev/null
+++ b/dev-libs/libmcal/libmcal-0.7-r4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r4.ebuild,v 1.1 2005/02/07 05:28:10 eradicator Exp $
+
+inherit eutils
+
+DRIVERS="mcaldrivers-0.9"
+SRC_URI_BASE="mirror://sourceforge/libmcal"
+DESCRIPTION="Modular Calendar Access Library"
+HOMEPAGE="http://mcal.chek.com/"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.gz ${SRC_URI_BASE}/${DRIVERS}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sparc ~x86"
+IUSE="pam"
+
+DEPEND="pam? ( sys-libs/pam )"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv ${S}/../mcal-drivers/* ${S}/
+	einfo "Using /var/spool/calendar instead of /var/calendar"
+	for i in FAQ-MCAL HOW-TO-MCAL mstore/mstore.c mstore/README mstore/Changelog; do
+		sed -e 's|/var/calendar|/var/spool/calendar|g' -i ${i}
+	done
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fpic.patch
+	epatch ${FILESDIR}/${P}-libdir.patch
+}
+
+src_compile() {
+	use pam && CFLAGS="${CFLAGS} -DUSE_PAM -lpam" LDFLAGS="${LDFLAGS} -lpam"
+	einfo "Setting up mstore back-end"
+	cd ${S}/mstore
+	emake CFLAGS="${CFLAGS} -I.." LDFLAGS="${LDFLAGS}" || die
+
+	einfo "Setting up icap back-end"
+	cd ${S}/icap
+	emake CFLAGS="${CFLAGS} -I.." LDFLAGS="${LDFLAGS}" || die
+
+	cd ${S}
+	myconf="--with-mstore --with-icap"
+	econf ${myconf} || die
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION HOW-TO-MCAL LICENSE README
+	newdoc mstore/README mstore-README
+	newdoc mstore/Changelog mstore-Changelog
+	newdoc icap/Changelog icap-Changelog
+	dohtml FUNCTION-REF.html
+	keepdir /var/spool/calendar
+	fperms 1777 /var/spool/calendar
+}
+
+pkg_postinst() {
+	einfo "You should start adding users to your calendar. ( e.g. htpasswd -c /etc/mpasswd username )"
+	# enforce perms
+	chmod 1777 ${ROOT}/var/spool/calendar
+}
diff --git a/dev-libs/libmcal/libmcal-0.7.ebuild b/dev-libs/libmcal/libmcal-0.7.ebuild
index b080ff00867a..829a98dcd5ac 100644
--- a/dev-libs/libmcal/libmcal-0.7.ebuild
+++ b/dev-libs/libmcal/libmcal-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7.ebuild,v 1.9 2004/08/19 03:51:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7.ebuild,v 1.10 2005/02/07 05:28:10 eradicator Exp $
 
 DESCRIPTION="Modular Calendar Access Library"
 HOMEPAGE="http://mcal.chek.com/"