From e44ee85723d8beccf938a8ff5762616a48130df1 Mon Sep 17 00:00:00 2001 From: Sascha Lucas Date: Tue, 7 Sep 2010 20:09:30 +0200 Subject: sync with main portage tree --- net-mail/topal/ChangeLog | 16 ++++++- net-mail/topal/Manifest | 21 +++------ net-mail/topal/files/64-Makefile.patch | 3 +- net-mail/topal/files/72-Makefile.patch | 79 ++++++++++++++++++++++++++++++++++ net-mail/topal/topal-64.ebuild | 4 +- net-mail/topal/topal-72.ebuild | 41 ++++++++++++++++++ 6 files changed, 145 insertions(+), 19 deletions(-) create mode 100644 net-mail/topal/files/72-Makefile.patch create mode 100644 net-mail/topal/topal-72.ebuild (limited to 'net-mail/topal') diff --git a/net-mail/topal/ChangeLog b/net-mail/topal/ChangeLog index cde3ecc..a4d613a 100644 --- a/net-mail/topal/ChangeLog +++ b/net-mail/topal/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-mail/topal -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/ChangeLog,v 1.2 2009/04/26 06:40:02 tove Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/ChangeLog,v 1.5 2010/03/05 12:03:53 tove Exp $ + +*topal-72 (05 Mar 2010) + + 05 Mar 2010; Torsten Veller files/64-Makefile.patch, + +topal-72.ebuild, +files/72-Makefile.patch: + Version bump. Thanks to Peter Gantner (#306981) + + 07 Nov 2009; Mounir Lamouri topal-64.ebuild: + Keywording for ppc, bug 267299 + + 15 May 2009; Markus Meier topal-64.ebuild: + add ~amd64, bug #267299 26 Apr 2009; Torsten Veller topal-64.ebuild: Use virtual/ada instead of virtual/gnat (#267299) diff --git a/net-mail/topal/Manifest b/net-mail/topal/Manifest index 459bba9..c058ef5 100644 --- a/net-mail/topal/Manifest +++ b/net-mail/topal/Manifest @@ -1,15 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 64-Makefile.patch 2257 RMD160 0652cdee0aab52844a34e5df06fc7691eb830e67 SHA1 6e16885eb61227e4dfa0496f29df54c0cf7febc2 SHA256 2fb606d11c9dca6cc782e43c620002fbe1c7de9528d70cbd490d45a73eb53cfe +AUX 64-Makefile.patch 2267 RMD160 60348219f8849e3719bf2678da4858c8f8d48dea SHA1 5fb4a4a6d7c08c29324436d1711b5d7151168205 SHA256 8623312f3eea1fa5ad3a41cd434dbe30cee9011eb3ccbdf459692a5d74e4f9a8 +AUX 72-Makefile.patch 2481 RMD160 83f4c210459a581e6e8f10e99ee2d38ee4511dde SHA1 704cc8c8cd9905bb8602fdef2b5d56e5127cd848 SHA256 c824acdda60194bf885733663a6255e03197597cb411f89eecf63cc37ce7baba DIST topal-package-64.tgz 170401 RMD160 69e5bdd0b2956fc4ead3815304d7e4def4f99292 SHA1 e2939bcff099e8d32e30dc1eef025f9b29b1053a SHA256 e44b879a8e8d96d5f0cad9e2b68056ba05fe4267a6f4d2d50325164be3f48cd5 -EBUILD topal-64.ebuild 1054 RMD160 35b914d582b7ab74588e9f14738a160103f29fa8 SHA1 c780428da2356499123d2f84776301de14512a77 SHA256 7ee608d228474d2b7d6c65bfdf0bd41c949350c0d9687adcd2d7b3a71aa84653 -MISC ChangeLog 537 RMD160 bfc88556e2f3466897ad1aa468f5bd311bc34661 SHA1 e6ae4d24d2dd066f7fea474a2aac6192aad06338 SHA256 60143df1d689d720fc7eee17756fc9b330648177e62240f3191c50e7a1c21a74 -MISC metadata.xml 539 RMD160 44b5e2c5cbdb0635d1f3e751079ece4c24fd5701 SHA1 730f36ed565f50554dce3153150a7b8fd088f553 SHA256 0462df752380e8177b0e04c032885543f419c8bd78d9e596cc3bd885c5231b4b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkn0AdUACgkQV3J2n04EauxWfwCfZC4PPS+sKyzc9FBItiwWfPfM -qtMAoIPtl0JHgRgyGRjJOM1BS4Yu81K4 -=D37q ------END PGP SIGNATURE----- +DIST topal-package-72.tgz 186728 RMD160 80a5493a91fe19f2b92a3e56810035b890cab1fb SHA1 1c05595d6b00db179539620d997c27ef4cf42fd3 SHA256 ccef20b3add7add640931b6de284e90815dade6ddc171b20d35f8d9b3487db52 +EBUILD topal-64.ebuild 1069 RMD160 5f9134dd9152d1b063e6c690788c390ded11c92c SHA1 1a41b0a2d57fd85e0d47b99c779687680982c3fb SHA256 5a83c6fabc3b600b55a0a213f41bcdde45cb85275cf4589c3748c3a4b6bf0983 +EBUILD topal-72.ebuild 1115 RMD160 6672851aa47332f11cd21e7fda7467a7c4ba52c0 SHA1 1014b3854caa4b9b647bd2baed5c03979ac1a7a1 SHA256 80ac5ec2d461ea781438a40a7a1f7f0d70bb57dcf4aeac1703a0c50e470abece +MISC ChangeLog 926 RMD160 d5258700e7a36be0d48081279dad1f3aee3925c6 SHA1 91110f11602de744ed5a57151e0829f5241726d9 SHA256 a2ac300661fcccf731fde23ff6f3441b6aea37530186c3c7a7fc6a993a786a24 +MISC metadata.xml 525 RMD160 9a080da8a52fec2d0c4d714929394f9b6b4766a4 SHA1 59d2e01301a195391739c6f6c3e9a302a86ac45a SHA256 934a0ef2cfdb2ee20e5656852ba86ddae8216f221949be31a4c87091499f6fcb diff --git a/net-mail/topal/files/64-Makefile.patch b/net-mail/topal/files/64-Makefile.patch index 694a065..834b75b 100644 --- a/net-mail/topal/files/64-Makefile.patch +++ b/net-mail/topal/files/64-Makefile.patch @@ -20,12 +20,13 @@ diff -Naur topal-64.orig/MIME-tool/Makefile topal-64/MIME-tool/Makefile diff -Naur topal-64.orig/Makefile topal-64/Makefile --- topal-64.orig/Makefile 2008-10-24 12:16:45.000000000 +0200 +++ topal-64/Makefile 2009-04-22 09:37:18.000000000 +0200 -@@ -36,26 +36,28 @@ +@@ -36,26 +36,29 @@ INSTALLPATHDOC ?= $(INSTALLPATH)/share/doc/topal INSTALLPATHPATCHES ?= $(INSTALLPATH)/share/topal/patches +CC=gcc +CFLAGS=-Wall -O2 ++LDFLAGS= + # The default action. all: topal mime-tool README.txt diff --git a/net-mail/topal/files/72-Makefile.patch b/net-mail/topal/files/72-Makefile.patch new file mode 100644 index 0000000..e787370 --- /dev/null +++ b/net-mail/topal/files/72-Makefile.patch @@ -0,0 +1,79 @@ +diff -uraN topal-72-orig/MIME-tool/Makefile topal-72/MIME-tool/Makefile +--- topal-72-orig/MIME-tool/Makefile 2010-02-25 21:28:39.000000000 +0100 ++++ topal-72/MIME-tool/Makefile 2010-03-04 13:24:53.691055969 +0100 +@@ -1,10 +1,14 @@ + .PHONY: all clean realclean distrib + ++CC=gcc ++CFLAGS=-Wall -O2 ++LDFLAGS= ++ ++ + all: mime-tool + + mime-tool: mime.c +- gcc -Wall -O2 -o mime-tool mime.c +- -strip mime-tool ++ $(CC) $(CFLAGS) $(LDFLAGS) -o mime-tool mime.c + + realclean: clean + -rm mime-tool +diff -uraN topal-72-orig/Makefile topal-72/Makefile +--- topal-72-orig/Makefile 2010-02-25 21:28:39.000000000 +0100 ++++ topal-72/Makefile 2010-03-04 13:44:58.220101516 +0100 +@@ -15,6 +15,10 @@ + + .PHONY: all clean realclean distclean package install distrib all2 FORCE + ++CC=gcc ++CFLAGS=-Wall -O2 ++LDFLAGS= ++ + RELEASECODE=$(shell grep '^
' README.html | tail -1 | sed 's/.* release //; sx.*$$xx') + BUILDDATE=$(shell date '+%Y-%m-%dT%H%M%S%Z') + +@@ -42,20 +46,19 @@ + all2: package distrib + + ada-readline-c.o: ada-readline-c.c +- gcc -c -Wall -O2 $(TOPALDEBUG) ada-readline-c.c ++ $(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-readline-c.c + + ada-echo-c.o: ada-echo-c.c +- gcc -c -Wall -O2 $(TOPALDEBUG) ada-echo-c.c ++ $(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-echo-c.c + + externals-c.o: externals-c.c +- gcc -c -Wall -O2 $(TOPALDEBUG) externals-c.c ++ $(CC) -c $(CFLAGS) $(TOPALDEBUG) externals-c.c + + mime-tool: +- make -C MIME-tool ++ $(MAKE) -C MIME-tool + + topal: $(TOPALDEPS) +- gnatmake -gnatwa -gnato -O2 $(TOPALDEBUG) topal +- -strip topal ++ gnatmake -gnatwa -gnato -O2 $(TOPALDEBUG) topal -largs $(LDFLAGS) + + topal.gz: topal + gzip -c9 topal > topal.gz +@@ -85,13 +88,13 @@ + README.txt: README.html + lynx -dont_wrap_pre -underscore -nolist -dump README.html > README.txt + +-install: all ++install: + install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES) +- install -m 755 -s topal $(INSTALLPATHBIN) +- install -m 644 README.html README.txt COPYING $(INSTALLPATHDOC) ++ install -m 755 topal $(INSTALLPATHBIN) ++ install -m 644 README.txt $(INSTALLPATHDOC) + install -m 644 topal.man $(INSTALLPATHMAN)/man1/topal.1 +- install -m 644 pine-*.patch alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES) +- install -m 755 -s MIME-tool/mime-tool $(INSTALLPATHBIN) ++ install -m 644 alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES) ++ install -m 755 MIME-tool/mime-tool $(INSTALLPATHBIN) + install -m 644 MIME-tool/mime-tool.man $(INSTALLPATHMAN)/man1/mime-tool.1 + + clean: diff --git a/net-mail/topal/topal-64.ebuild b/net-mail/topal/topal-64.ebuild index 74174cd..a1d7f49 100644 --- a/net-mail/topal/topal-64.ebuild +++ b/net-mail/topal/topal-64.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/topal-64.ebuild,v 1.2 2009/04/26 06:40:02 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/topal-64.ebuild,v 1.4 2009/11/07 22:18:37 volkmar Exp $ EAPI=2 @@ -12,7 +12,7 @@ SRC_URI="http://homepage.ntlworld.com/phil.brooke/topal/rel-${PV}/topal-package- LICENSE="GPL-3" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="" DEPEND="virtual/ada" diff --git a/net-mail/topal/topal-72.ebuild b/net-mail/topal/topal-72.ebuild new file mode 100644 index 0000000..43907f5 --- /dev/null +++ b/net-mail/topal/topal-72.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/topal-72.ebuild,v 1.1 2010/03/05 12:03:53 tove Exp $ + +EAPI=2 + +inherit toolchain-funcs eutils + +DESCRIPTION="Topal is a 'glue' program that links GnuPG and Pine/Alpine." +HOMEPAGE="http://homepage.ntlworld.com/phil.brooke/topal/" +SRC_URI="http://homepage.ntlworld.com/phil.brooke/topal/rel-${PV}/topal-package-${PV}.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=">=app-crypt/gnupg-2.0.7-r1 + || ( net-mail/metamail app-misc/run-mailcap ) + || ( app-text/dos2unix app-text/hd2u ) + sys-libs/ncurses + sys-libs/readline" +DEPEND="${RDEPEND} + virtual/ada" + +src_prepare() { + rm "${S}"/MIME-tool/mime-tool || die + epatch "${FILESDIR}"/${PV}-Makefile.patch +} + +src_compile() { + emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "make failed" +} + +src_install() { + emake install \ + INSTALLPATH="${D}"/usr \ + INSTALLPATHDOC="${D}"/usr/share/doc/${PF} \ + || die "make install failed" + dohtml "${S}"/README.html || die +} -- cgit v1.2.3-65-gdbad