sed usage fix for Makefile. Provided by Marcin D. Mikielewicz <perry at csk.pl> in bug #133707.

(Portage version: 2.1.2_rc1-r6)

6 files changed, 119 insertions, 6 deletions

diff --git a/mail-client/pinepgp/ChangeLog b/mail-client/pinepgp/ChangeLog
index 01dd0ad40f17..f44e7a632ca1 100644
--- a/mail-client/pinepgp/ChangeLog
+++ b/mail-client/pinepgp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/pinepgp
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/ChangeLog,v 1.5 2005/06/05 11:52:19 hansmi Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/ChangeLog,v 1.6 2006/11/17 01:06:22 ticho Exp $
+
+  17 Nov 2006; Andrej Kacian <ticho@gentoo.org>
+  +files/pinepgp-0.18.0-makefile-sed-fix.patch, pinepgp-0.18.0.ebuild,
+  pinepgp-0.18.0-r1.ebuild:
+  sed usage fix for Makefile. Provided by Marcin D. Mikielewicz <perry at
+  csk.pl> in bug #133707.
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   pinepgp-0.18.0-r1.ebuild:
diff --git a/mail-client/pinepgp/files/digest-pinepgp-0.18.0 b/mail-client/pinepgp/files/digest-pinepgp-0.18.0
index 06060898d77e..452c6abcc74e 100644
--- a/mail-client/pinepgp/files/digest-pinepgp-0.18.0
+++ b/mail-client/pinepgp/files/digest-pinepgp-0.18.0
@@ -1 +1,3 @@
 MD5 b87eaea3c74429e8e83f68b1ed337120 pinepgp-0.18.0.tar.gz 38103
+RMD160 1990bdc56460cbafe8b62cffaf5520038fe910ce pinepgp-0.18.0.tar.gz 38103
+SHA256 2917ed5734b2c2e70cd8d944537cb0280f7cdfa34fcd64121f41bb4c37c7d6d9 pinepgp-0.18.0.tar.gz 38103
diff --git a/mail-client/pinepgp/files/digest-pinepgp-0.18.0-r1 b/mail-client/pinepgp/files/digest-pinepgp-0.18.0-r1
index 06060898d77e..452c6abcc74e 100644
--- a/mail-client/pinepgp/files/digest-pinepgp-0.18.0-r1
+++ b/mail-client/pinepgp/files/digest-pinepgp-0.18.0-r1
@@ -1 +1,3 @@
 MD5 b87eaea3c74429e8e83f68b1ed337120 pinepgp-0.18.0.tar.gz 38103
+RMD160 1990bdc56460cbafe8b62cffaf5520038fe910ce pinepgp-0.18.0.tar.gz 38103
+SHA256 2917ed5734b2c2e70cd8d944537cb0280f7cdfa34fcd64121f41bb4c37c7d6d9 pinepgp-0.18.0.tar.gz 38103
diff --git a/mail-client/pinepgp/files/pinepgp-0.18.0-makefile-sed-fix.patch b/mail-client/pinepgp/files/pinepgp-0.18.0-makefile-sed-fix.patch
new file mode 100644
index 000000000000..fe9f8d55a0dc
--- /dev/null
+++ b/mail-client/pinepgp/files/pinepgp-0.18.0-makefile-sed-fix.patch
@@ -0,0 +1,87 @@
+diff -Naur pinepgp-0.18.0-orig/Makefile.in pinepgp-0.18.0/Makefile.in
+--- pinepgp-0.18.0-orig/Makefile.in	2002-05-03 15:30:07.000000000 +0200
++++ pinepgp-0.18.0/Makefile.in	2006-11-16 00:30:27.000000000 +0100
+@@ -44,52 +44,52 @@
+ all:	$(SOURCES) $(BUILD_FILTERS)
+ 
+ $(SOURCES):	$(SOURCES:%=%.in)
+-	$(CAT) $(@).in | $(SED) -e 's%\@SED\@%$(SED)%;\
+-		s%\@CAT\@%$(CAT)%;\
+-		s%\@RM\@%$(RM)%;\
+-		s%\@MKTEMP\@%$(MKTEMP)%;\
+-		s%\@BASH\@%$(BASH)%;\
+-		s%\@bindir\@%$(bindir)%;\
+-		s%\@tmpdir\@%$(tmpdir)%' > $(@)
++	$(CAT) $(@).in | $(SED) -e 's%\@SED\@%$(SED)%'\
++		-e 's%\@CAT\@%$(CAT)%'\
++		-e 's%\@RM\@%$(RM)%'\
++		-e 's%\@MKTEMP\@%$(MKTEMP)%'\
++		-e 's%\@BASH\@%$(BASH)%'\
++		-e 's%\@bindir\@%$(bindir)%'\
++		-e 's%\@tmpdir\@%$(tmpdir)%' > $(@)
+ 	chmod 755 $(@)
+ 
+ pinegpg:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename=GnuPG%;\
+-		s%^ces=.*%ces="$(GPG) -at -s"%;\
+-		s%^cee=.*%cee="$(GPG) -at -e"%;\
+-		s%^cese=.*%cese="$(GPG) -at -se"%;\
+-		s%^cec=.*%cec="\$(GPG)"%;\
+-		s%^cefp=.*%cefp=gpg%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename=GnuPG%'\
++		-e 's%^ces=.*%ces="$(GPG) -at -s"%'\
++		-e 's%^cee=.*%cee="$(GPG) -at -e"%'\
++		-e 's%^cese=.*%cese="$(GPG) -at -se"%'\
++		-e 's%^cec=.*%cec="\$(GPG)"%'\
++		-e 's%^cefp=.*%cefp=gpg%' > $(@).c
+ 	$(CPP) -DGPG $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp26x:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 2.6.x"%;\
+-		s%^ces=.*%ces="\$(PGP) -fat -s"%;\
+-		s%^cee=.*%cee="\$(PGP) -fat -e"%;\
+-		s%^cese=.*%cese="\$(PGP) -fat -se"%;\
+-		s%^cec=.*%cec="\$(PGP) -f"%;\
+-		s%^cefp=.*%cefp=pgp26x%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 2.6.x"%'\
++		-e 's%^ces=.*%ces="\$(PGP) -fat -s"%'\
++		-e 's%^cee=.*%cee="\$(PGP) -fat -e"%'\
++		-e 's%^cese=.*%cese="\$(PGP) -fat -se"%'\
++		-e 's%^cec=.*%cec="\$(PGP) -f"%'\
++		-e 's%^cefp=.*%cefp=pgp26x%' > $(@).c
+ 	$(CPP) -DPGP26X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp5x:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 5.x"%;\
+-		s%^ces=.*%ces="$(PGP5S) -fat"%;\
+-		s%^cee=.*%cee="$(PGP5E) -fat"%;\
+-		s%^cese=.*%cese="$(PGP5E) -fat -s"%;\
+-		s%^cec=.*%cec="$(PGP5V) -f"%;\
+-		s%^cefp=.*%cefp=pgp26x%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 5.x"%'\
++		-e 's%^ces=.*%ces="$(PGP5S) -fat"%'\
++		-e 's%^cee=.*%cee="$(PGP5E) -fat"%'\
++		-e 's%^cese=.*%cese="$(PGP5E) -fat -s"%'\
++		-e 's%^cec=.*%cec="$(PGP5V) -f"%'\
++		-e 's%^cefp=.*%cefp=pgp26x%' > $(@).c
+ 	$(CPP) -DPGP5X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
+ pinepgp65x:	pinegpgp
+-	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 6.5.x"%;\
+-		s%^ces=.*%ces="\$(PGP6) -fat -s -u $$USER"%;\
+-		s%^cee=.*%cee="\$(PGP6) -fat -e -u $$USER"%;\
+-		s%^cese=.*%cese="\$(PGP6) -fat -se -u $$USER"%;\
+-		s%^cec=.*%cec="\$(PGP6) -f -u $$USER"%;\
+-		s%^cefp=.*%cefp=pgp65x%' > $(@).c
++	$(CAT) pinegpgp | $(SED) -e 's%^cename=.*%cename="PGP 6.5.x"%'\
++		-e 's%^ces=.*%ces="\$(PGP6) -fat -s -u $$USER"%'\
++		-e 's%^cee=.*%cee="\$(PGP6) -fat -e -u $$USER"%'\
++		-e 's%^cese=.*%cese="\$(PGP6) -fat -se -u $$USER"%'\
++		-e 's%^cec=.*%cec="\$(PGP6) -f -u $$USER"%'\
++		-e 's%^cefp=.*%cefp=pgp65x%' > $(@).c
+ 	$(CPP) -DPGP65X $(BUILD_FLAGS) $(@).c | $(GREP) -v "^# .* .*" > $(@)
+ 	chmod 755 $(@)
+ 
diff --git a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
index a9a94f94e684..96f0d04a79b8 100644
--- a/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
+++ b/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild,v 1.6 2005/06/05 11:52:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild,v 1.7 2006/11/17 01:06:22 ticho Exp $
+
+inherit eutils
 
 DESCRIPTION="Use GPG/PGP with Pine"
 HOMEPAGE="http://www.megaloman.com/~hany/software/pinepgp/"
@@ -12,6 +14,12 @@ IUSE=""
 
 DEPEND="mail-client/pine app-crypt/gnupg"
 
+src_unpack()	{
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile-sed-fix.patch
+}
+
 src_compile()	{
 	econf || die "configure problem"
 	emake || die "compile problem"
diff --git a/mail-client/pinepgp/pinepgp-0.18.0.ebuild b/mail-client/pinepgp/pinepgp-0.18.0.ebuild
index 65303a5cd5c1..85b35a81a7e0 100644
--- a/mail-client/pinepgp/pinepgp-0.18.0.ebuild
+++ b/mail-client/pinepgp/pinepgp-0.18.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0.ebuild,v 1.4 2004/07/14 16:26:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pinepgp/pinepgp-0.18.0.ebuild,v 1.5 2006/11/17 01:06:22 ticho Exp $
+
+inherit eutils
 
 DESCRIPTION="Use GPG/PGP with Pine"
 HOMEPAGE="http://www.megaloman.com/~hany/software/pinepgp/"
@@ -12,6 +14,12 @@ IUSE=""
 
 DEPEND="mail-client/pine app-crypt/gnupg"
 
+src_unpack()	{
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile-sed-fix.patch
+}
+
 src_compile()	{
 	econf || die "configure problem"
 	emake || die "compile problem"