From ea1d9e75dca34948a865a9bdd8b706d13a256de2 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Mon, 7 Jun 2004 03:55:14 +0000 Subject: Fix use invocation --- mail-client/pine/ChangeLog | 7 ++++++- mail-client/pine/Manifest | 28 ++++++++++++++-------------- mail-client/pine/pine-4.50-r4.ebuild | 12 ++++++------ mail-client/pine/pine-4.58-r1.ebuild | 10 +++++----- mail-client/pine/pine-4.58-r2.ebuild | 12 ++++++------ mail-client/pine/pine-4.58-r3.ebuild | 20 ++++++++++---------- mail-client/pine/pine-4.58.ebuild | 10 +++++----- 7 files changed, 52 insertions(+), 47 deletions(-) (limited to 'mail-client/pine') diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog index 7be42c94f8d6..37d7dcd0ee81 100644 --- a/mail-client/pine/ChangeLog +++ b/mail-client/pine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/pine # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.1 2004/05/30 02:56:38 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.2 2004/06/07 03:55:14 agriffis Exp $ + + 06 Jun 2004; Aron Griffis pine-4.50-r4.ebuild, + pine-4.58-r1.ebuild, pine-4.58-r2.ebuild, pine-4.58-r3.ebuild, + pine-4.58.ebuild: + Fix use invocation *pine-4.58-r2 (29 May 2004) diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest index 8e01c9c4912a..ffd52d00fe19 100644 --- a/mail-client/pine/Manifest +++ b/mail-client/pine/Manifest @@ -1,25 +1,25 @@ +MD5 e0b5d9760534c982ddfab472a274fd76 pine-4.58-r2.ebuild 3324 +MD5 cebcdf0798f508121fc30942fa5c2790 pine-4.58.ebuild 3296 +MD5 0c43cc360d13611c57e1d87e817e7062 pine-4.50-r4.ebuild 3473 +MD5 ac38b7a948630d92106109b938d53a56 pine-4.58-r1.ebuild 3408 +MD5 09a324a2109a4f3a1d84656d03ca9bb2 pine-4.58-r3.ebuild 4300 +MD5 5e3e249b9c0aa1ea33649244b35a60c1 ChangeLog 8644 +MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131 -MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62 MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r1 145 MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r2 145 MD5 21aa4bed99713a0b9c9971226fda0807 files/digest-pine-4.58-r3 429 -MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182 -MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646 -MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551 -MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531 -MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830 -MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448 MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420 +MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551 MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460 +MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646 +MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531 MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337 +MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830 MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512 +MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932 MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504 +MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448 +MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447 -MD5 f41ba74de351f87f3c13f03b4b723801 ChangeLog 8466 -MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 -MD5 62e3b6b715913aff429056907a5fb3c0 pine-4.50-r4.ebuild 3511 -MD5 36fcee8249eae9ed143b18771278f1fd pine-4.58-r1.ebuild 3438 -MD5 7fa799d039cd59ba4fb1d0ec6f2955df pine-4.58-r2.ebuild 3364 -MD5 3fe3348b86a53d6b1a81e0ef1e2d3ad4 pine-4.58-r3.ebuild 4372 -MD5 c7138d7f69f5a97a831822762524d56b pine-4.58.ebuild 3326 diff --git a/mail-client/pine/pine-4.50-r4.ebuild b/mail-client/pine/pine-4.50-r4.ebuild index a628dad5140b..9c4e29769937 100644 --- a/mail-client/pine/pine-4.50-r4.ebuild +++ b/mail-client/pine/pine-4.50-r4.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/mail-client/pine/pine-4.50-r4.ebuild,v 1.1 2004/05/30 02:56:38 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.50-r4.ebuild,v 1.2 2004/06/07 03:55:14 agriffis Exp $ inherit eutils @@ -27,7 +27,7 @@ src_unpack() { unpack pine-4.50-maildir.patch.gz cd ${S} - if [ "`use mbox`" ] ; then + if use mbox ; then epatch ${FILESDIR}/imap-4.7c2-flock.patch else epatch ${FILESDIR}/pine-4.50-maildir.patch @@ -43,7 +43,7 @@ src_unpack() { # change /bin/passwd to /usr/bin/passwd epatch ${FILESDIR}/pine-4.21-passwd.patch - if [ "`use ldap`" ] ; then + if use ldap ; then # link to shared ldap libs instead of static epatch ${FILESDIR}/pine-4.30-ldap.patch mkdir ${S}/ldap @@ -66,7 +66,7 @@ src_unpack() { # gets rid of a call to stripwhitespace() epatch ${FILESDIR}/pine-4.33-whitespace.patch - if [ `use debug` ]; then + if use debug; then cd ${S}/pine cp makefile.lnx makefile.orig sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \ @@ -89,7 +89,7 @@ src_unpack() { src_compile() { BUILDOPTS="" - if [ "`use ssl`" ] + if use ssl then BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs" cd ${S}/imap/src/osdep/unix @@ -103,7 +103,7 @@ src_compile() { else BUILDOPTS="${BUILDOPTS} NOSSL" fi - if [ "`use ldap`" ] + if use ldap then ./contrib/ldap-setup lnp lnp BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP" diff --git a/mail-client/pine/pine-4.58-r1.ebuild b/mail-client/pine/pine-4.58-r1.ebuild index 85f53bf85b43..ed6d26b947d5 100644 --- a/mail-client/pine/pine-4.58-r1.ebuild +++ b/mail-client/pine/pine-4.58-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/mail-client/pine/pine-4.58-r1.ebuild,v 1.2 2004/05/30 11:17:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r1.ebuild,v 1.3 2004/06/07 03:55:14 agriffis Exp $ inherit eutils @@ -36,7 +36,7 @@ src_unpack() { epatch ${FILESDIR}/imap-4.7c2-flock.patch cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix - if [ "`use ldap`" ] ; then + if use ldap ; then # link to shared ldap libs instead of static epatch ${FILESDIR}/pine-4.30-ldap.patch mkdir ${S}/ldap @@ -58,7 +58,7 @@ src_unpack() { # bug #23336 - makes pine transparent in terms that support it epatch ${FILESDIR}/transparency.patch - if [ `use debug` ]; then + if use debug; then cd ${S}/pine sed -i \ -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \ @@ -86,7 +86,7 @@ src_unpack() { src_compile() { BUILDOPTS="" - if [ "`use ssl`" ] + if use ssl then BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs" cd ${S}/imap/src/osdep/unix @@ -99,7 +99,7 @@ src_compile() { else BUILDOPTS="${BUILDOPTS} NOSSL" fi - if [ "`use ldap`" ] + if use ldap then ./contrib/ldap-setup lnp lnp BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP" diff --git a/mail-client/pine/pine-4.58-r2.ebuild b/mail-client/pine/pine-4.58-r2.ebuild index 6bea34ab1c05..0de771234e3b 100644 --- a/mail-client/pine/pine-4.58-r2.ebuild +++ b/mail-client/pine/pine-4.58-r2.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/mail-client/pine/pine-4.58-r2.ebuild,v 1.2 2004/05/30 11:17:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r2.ebuild,v 1.3 2004/06/07 03:55:14 agriffis Exp $ inherit eutils @@ -33,7 +33,7 @@ src_unpack() { epatch "${FILESDIR}/imap-4.7c2-flock.patch" cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" - if [ "`use ldap`" ] ; then + if use ldap ; then # link to shared ldap libs instead of static epatch "${FILESDIR}/pine-4.30-ldap.patch" mkdir "${S}/ldap" @@ -41,7 +41,7 @@ src_unpack() { ln -s /usr/include "${S}/ldap/include" fi - if [ "`use passfile`" ] ; then + if use passfile ; then epatch "${FILESDIR}/pine-4.56-passfile.patch" fi @@ -52,7 +52,7 @@ src_unpack() { # bug #23336 - makes pine transparent in terms that support it epatch "${FILESDIR}/transparency.patch" - if [ "`use debug`" ] ; then + if use debug ; then sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \ -i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed" sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \ @@ -71,7 +71,7 @@ src_unpack() { src_compile() { local BUILDOPTS - if [ "`use ssl`" ] ; then + if use ssl ; then BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs" sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \ -e "s:\$(SSLCERTS):/etc/ssl/certs:" \ @@ -81,7 +81,7 @@ src_compile() { BUILDOPTS="${BUILDOPTS} NOSSL" fi - if [ "`use ldap`" ] ; then + if use ldap ; then ./contrib/ldap-setup lnp lnp BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP" else diff --git a/mail-client/pine/pine-4.58-r3.ebuild b/mail-client/pine/pine-4.58-r3.ebuild index 9ebd941cb1b3..3d4cf172dde7 100644 --- a/mail-client/pine/pine-4.58-r3.ebuild +++ b/mail-client/pine/pine-4.58-r3.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/mail-client/pine/pine-4.58-r3.ebuild,v 1.1 2004/05/30 02:56:38 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58-r3.ebuild,v 1.2 2004/06/07 03:55:14 agriffis Exp $ inherit eutils @@ -43,7 +43,7 @@ src_unpack() { # Fix flock() emulation. cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix" - if [ "`use maildir`" ] ; then + if use maildir ; then epatch "${DISTDIR}/${P}-maildir.patch" # Build the flock() emulation. epatch "${FILESDIR}/imap-4.7c2-flock+maildir.patch" @@ -51,17 +51,17 @@ src_unpack() { # Build the flock() emulation. epatch "${FILESDIR}/imap-4.7c2-flock.patch" fi - if [ "`use ldap`" ] ; then + if use ldap ; then # Link to shared ldap libs instead of static. epatch "${FILESDIR}/pine-4.30-ldap.patch" mkdir "${S}/ldap" ln -s /usr/lib "${S}/ldap/libraries" ln -s /usr/include "${S}/ldap/include" fi - if [ "`use ipv6`" ] ; then + if use ipv6 ; then epatch "${DISTDIR}/${P}-v6-20031001.diff" fi - if [ "`use passfile`" ] ; then + if use passfile ; then epatch "${FILESDIR}/pine-4.56-passfile.patch" fi @@ -76,7 +76,7 @@ src_unpack() { # Bug #23336 - makes pine transparent in terms that support it. epatch "${FILESDIR}/transparency.patch" - if [ "`use debug`" ] ; then + if use debug ; then sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \ -i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed" sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \ @@ -94,7 +94,7 @@ src_unpack() { src_compile() { local myconf - if [ "`use ssl`" ] ; then + if use ssl ; then myconf="${myconf} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs" sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \ -e "s:\$(SSLCERTS):/etc/ssl/certs:" \ @@ -103,13 +103,13 @@ src_compile() { else myconf="${myconf} NOSSL" fi - if [ "`use ldap`" ] ; then + if use ldap ; then ./contrib/ldap-setup lnp lnp myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP" else myconf="${myconf} NOLDAP" fi - if [ "`use kerberos`" ] ; then + if use kerberos ; then myconf="${myconf} EXTRAAUTHENTICATORS=gss" fi @@ -125,7 +125,7 @@ src_install() { doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt - if [ "`use ipv6`" ] ; then + if use ipv6 ; then dodoc "${DISTDIR}/readme.${P}-v6-20031001" fi diff --git a/mail-client/pine/pine-4.58.ebuild b/mail-client/pine/pine-4.58.ebuild index 20a17b093c53..7e98e1ab46d5 100644 --- a/mail-client/pine/pine-4.58.ebuild +++ b/mail-client/pine/pine-4.58.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/mail-client/pine/pine-4.58.ebuild,v 1.2 2004/05/30 11:17:58 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.58.ebuild,v 1.3 2004/06/07 03:55:14 agriffis Exp $ inherit eutils @@ -33,7 +33,7 @@ src_unpack() { epatch ${FILESDIR}/imap-4.7c2-flock.patch cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix - if [ "`use ldap`" ] ; then + if use ldap ; then # link to shared ldap libs instead of static epatch ${FILESDIR}/pine-4.30-ldap.patch mkdir ${S}/ldap @@ -55,7 +55,7 @@ src_unpack() { # bug #23336 - makes pine transparent in terms that support it epatch ${FILESDIR}/transparency.patch - if [ `use debug` ]; then + if use debug; then cd ${S}/pine sed -i \ -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \ @@ -83,7 +83,7 @@ src_unpack() { src_compile() { BUILDOPTS="" - if [ "`use ssl`" ] + if use ssl then BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs" cd ${S}/imap/src/osdep/unix @@ -96,7 +96,7 @@ src_compile() { else BUILDOPTS="${BUILDOPTS} NOSSL" fi - if [ "`use ldap`" ] + if use ldap then ./contrib/ldap-setup lnp lnp BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP" -- cgit v1.2.3-65-gdbad