From: Jeremy Olexa Date: Mon, 14 Jun 2010 20:21:58 +0000 (+0000) Subject: Import modifications from the Gentoo Prefix overlay. Add keywords, convert to EAPI3... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72363a6d9e173d9d74e2b4e801f9f97322f8085a;p=gentoo.git Import modifications from the Gentoo Prefix overlay. Add keywords, convert to EAPI3, add some darwin build fixes. Approved by dertobi123 of the net-mail team Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog index 13f65aba49d0..c2dc1a1fd99c 100644 --- a/mail-client/pine/ChangeLog +++ b/mail-client/pine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/pine -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.107 2009/10/10 16:28:54 armin76 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.108 2010/06/14 20:21:58 darkside Exp $ + + 14 Jun 2010; Jeremy Olexa pine-4.64-r7.ebuild: + Import modifications from the Gentoo Prefix overlay. Add keywords, convert + to EAPI3, add some darwin build fixes. Approved by dertobi123 of the + net-mail team 10 Oct 2009; Raúl Porcel pine-4.64-r7.ebuild: sparc/x86 stable wrt #286137 diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest index a935fe32c55e..240a1b79c986 100644 --- a/mail-client/pine/Manifest +++ b/mail-client/pine/Manifest @@ -16,6 +16,6 @@ DIST pine-4.64-r7-chappa-all.patch.gz 187959 RMD160 2e30b604eaaeec257adb39ed4716 DIST pine4.64.tar.bz2 3110790 RMD160 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd SHA1 b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e SHA256 5a697f1ffed84bba2dddb3534d0829eab6dacd169ea0122621e6b3dd522eb783 EBUILD pine-4.64-r5.ebuild 5535 RMD160 1838c09c5244239ce1f8389fdbcd9e8f38e9bbff SHA1 c8a8b4292bc859cec23946a12fbd3c636aa7dd54 SHA256 354f623d5c01ef61fcb625f029d47a4bf391bb5d396c04be03ce6ab329a30663 EBUILD pine-4.64-r6.ebuild 5907 RMD160 0476b063364202537111537b93f113c8d1ff26a0 SHA1 44bb00d9610ee91ddb681f6d77a002d218d3fd44 SHA256 1ae2a6270431bab33df84174472da11315e8cea5215440ade583c9fed782fa88 -EBUILD pine-4.64-r7.ebuild 5902 RMD160 51f1eb271bc518105a5e1c83ae10ea34a08233ea SHA1 43fcb1ffd7bd329e08f558c7de194c064dd537aa SHA256 e85a82f9aaf5a49a9d3cd787e73914b2a67e10668a67e25d2365fd6a133c3239 -MISC ChangeLog 23368 RMD160 4d8f165e81e6442d2b5a9bd89872ca350607a66a SHA1 7a9de52f3350694a88aedd34a099d96e6f8b7dc4 SHA256 f0bb62c1b73cbfa4fd864759cb6f362b94452f6bc69d45766b1410c355a8894b +EBUILD pine-4.64-r7.ebuild 6069 RMD160 165261de4bf1de6832b480f5377342ec2ceb5cfe SHA1 bc97e54246857403e70f8eb0e02dbf36dcf7309e SHA256 e6306ddce25e7cf4c56768447aa9ffd4aaceac0f0409fb5949696e18db881eec +MISC ChangeLog 23605 RMD160 f874a619f20a8ae6a9374d2f2b3fa2722f00c06b SHA1 c4172d5a08478394b7e9eafeab03725ef115f8ad SHA256 f7f640d3217ad1f1cb7fbd93efce7b46a19bb8ea3ecee45796235cc5cfcc6ef3 MISC metadata.xml 399 RMD160 d040cc64dc9e8a124319a1aabfb5da6ad56baaf8 SHA1 2002632d6f4236f1db97e695d5e046dda10d832f SHA256 974021bbe96256ccf1286bcda1ca194e67f8fc0a7ce0b968007d993fd09cf08a diff --git a/mail-client/pine/pine-4.64-r7.ebuild b/mail-client/pine/pine-4.64-r7.ebuild index deae3549f364..5784d21db617 100644 --- a/mail-client/pine/pine-4.64-r7.ebuild +++ b/mail-client/pine/pine-4.64-r7.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r7.ebuild,v 1.6 2009/10/10 16:28:54 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.64-r7.ebuild,v 1.7 2010/06/14 20:21:58 darkside Exp $ +EAPI=3 inherit eutils # Using this ugly hack, since we're making our own versioned copies of chappa @@ -21,7 +22,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/pine/${P/-/}.tar.bz2 LICENSE="PICO" SLOT="0" -KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="ssl ldap kerberos largeterminal pam passfile debug" DEPEND=">=sys-apps/sed-4 @@ -60,9 +61,7 @@ pkg_setup() { maildir_warn } -src_unpack() { - unpack ${A} && cd "${S}" - +src_prepare() { epatch "${FILESDIR}/pine-4.62-spooldir-permissions.patch" # Various fixes and features. @@ -115,7 +114,7 @@ src_unpack() { -i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed" fi - sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \ + sed -e "s:/usr/local/lib/pine.conf:${EPREFIX}/etc/pine.conf:" \ -i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed" sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \ @@ -131,10 +130,10 @@ src_unpack() { src_compile() { local myconf 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:" \ - -e "s:-I\$(SSLINCLUDE):-I/usr/include/openssl:" \ + myconf="${myconf} SSLDIR=${EPREFIX}/usr SSLTYPE=unix SSLCERTS=${EPREFIX}/etc/ssl/certs" + sed -e "s:\$(SSLDIR)/certs:${EPREFIX}/etc/ssl/certs:" \ + -e "s:\$(SSLCERTS):${EPREFIX}/etc/ssl/certs:" \ + -e "s:-I\$(SSLINCLUDE):-I${EPREFIX}/usr/include/openssl:" \ -i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed" else myconf="${myconf} NOSSL" @@ -152,9 +151,9 @@ src_compile() { if use elibc_FreeBSD ; then target=bsf elif use pam ; then - target=lnp + [[ ${CHOST} == *-darwin* ]] && target=oxp || target=lnp else - target=slx + [[ ${CHOST} == *-darwin* ]] && target=osx || target=slx fi ./build ${myconf} ${target} || die "compile problem"