r1 stable, and bug #14915 finally, providing r2 with mstore+icap.

5 files changed, 83 insertions, 7 deletions

diff --git a/dev-libs/libmcal/ChangeLog b/dev-libs/libmcal/ChangeLog
index cc0dc25c6b90..f71be69ba5f5 100644
--- a/dev-libs/libmcal/ChangeLog
+++ b/dev-libs/libmcal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libmcal
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.8 2004/05/12 03:18:44 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/ChangeLog,v 1.9 2004/05/20 06:22:16 robbat2 Exp $
+
+*libmcal-0.7-r2 (19 May 2004)
+
+  19 May 2004; Robin H. Johnson <robbat2@gentoo.org> libmcal-0.7-r1.ebuild,
+  libmcal-0.7-r2.ebuild:
+  r1 stable, and bug #14915 finally, providing r2 with mstore+icap.
 
   11 May 2004; Michael McCabe <randy@gentoo.org> libmcal-0.7-r1.ebuild:
   Added s390 keywords
diff --git a/dev-libs/libmcal/Manifest b/dev-libs/libmcal/Manifest
index 26365c3c464b..92d39027a56a 100644
--- a/dev-libs/libmcal/Manifest
+++ b/dev-libs/libmcal/Manifest
@@ -1,6 +1,14 @@
-MD5 0abbaf27f4ef6a1914cf646e32ea2f52 ChangeLog 1312
-MD5 f8e833d47ca8b6874488a4a5044a65e4 libmcal-0.7-r1.ebuild 794
-MD5 2503170a110b75e97ede4e3ac6d373e8 libmcal-0.7.ebuild 690
-MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
+MD5 d0f5c00de527a9df7eef12e382ffdef6 at.tar.bz2 2356
+MD5 0aae7808a48fff1198b73ef7e3748fb3 libmcal-0.7-r2.ebuild 1409
+MD5 d6a3d6954f5634372aa704ae531f27bf libmcal-0.7.ebuild 689
+MD5 4a5130dc0008c4d9c43dfa709829b207 ChangeLog 1311
+MD5 59c95d889210e1b0eeb2839e8f8b7f1e libmcal-0.7-r1.ebuild 793
 MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7-r1 62
+MD5 e40f5b90c038f8c8703b83953b10012b files/digest-libmcal-0.7-r2 128
 MD5 164c1590a106af41fb8a5de71843861b files/libmcal-0.7-fpic.patch 769
+MD5 33ec0e0ab40e02bedea5e6b2b8ec51bc files/digest-libmcal-0.7 62
+MD5 39c539906d3fd408b082e1849b19daef libmcal/Manifest 255
+MD5 c1ec281df1fefc6301a1b2a181580365 libmcal/libmcal-0.7-r2.ebuild 1492
+MD5 639a5d8ac0f94bd0d7b68da15dac77c1 libmcal/ChangeLog 1229
+MD5 e40f5b90c038f8c8703b83953b10012b libmcal/files/digest-libmcal-0.7-r2 128
+MD5 164c1590a106af41fb8a5de71843861b libmcal/files/libmcal-0.7-fpic.patch 769
diff --git a/dev-libs/libmcal/files/digest-libmcal-0.7-r2 b/dev-libs/libmcal/files/digest-libmcal-0.7-r2
new file mode 100644
index 000000000000..fa36e3231f67
--- /dev/null
+++ b/dev-libs/libmcal/files/digest-libmcal-0.7-r2
@@ -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/libmcal-0.7-r1.ebuild b/dev-libs/libmcal/libmcal-0.7-r1.ebuild
index 12d415c86d1b..a6fa94f99278 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 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.8 2004/05/12 03:18:44 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmcal/libmcal-0.7-r1.ebuild,v 1.9 2004/05/20 06:22:16 robbat2 Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libmcal/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc ~sparc alpha hppa ~mips amd64 ia64 s390"
+KEYWORDS="x86 ppc ~sparc alpha hppa ~mips amd64 ia64 s390"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-libs/libmcal/libmcal-0.7-r2.ebuild b/dev-libs/libmcal/libmcal-0.7-r2.ebuild
new file mode 100644
index 000000000000..4a36ce5c052f
--- /dev/null
+++ b/dev-libs/libmcal/libmcal-0.7-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2004 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-r2.ebuild,v 1.1 2004/05/20 06:22:16 robbat2 Exp $
+
+DESCRIPTION="Modular Calendar Access Libary"
+HOMEPAGE="http://mcal.chek.com/"
+DRIVERS="mcaldrivers-0.9"
+SRC_URI_BASE="mirror://sourceforge/libmcal"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.gz ${SRC_URI_BASE}/${DRIVERS}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~s390"
+IUSE="pam"
+DEPEND="pam? ( sys-libs/pam )"
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fpic.patch
+	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
+}
+
+src_compile() {
+	use pam && CFLAGS="${CFLAGS} -DUSE_PAM"
+	einfo "Setting up mstore back-end"
+	cd ${S}/mstore
+	emake CFLAGS="${CFLAGS} -I.." || die
+
+	einfo "Setting up icap back-end"
+	cd ${S}/icap
+	emake CFLAGS="${CFLAGS} -I.." || die
+
+	cd ${S}
+	myconf="--with-mstore --with-icap"
+	econf ${myconf} || die
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	einstall DESTDIR=${D} || 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
+}
+