solve make install failure on SMP machines; add metadata.xml

diff --git a/net-misc/lrzsz/ChangeLog b/net-misc/lrzsz/ChangeLog
index b6fedfead1fea1e673db7d6d4b0f7478988ccfcc..153bb90a7150044eb62a5d406442af3cd17d33fe 100644 (file)
--- a/net-misc/lrzsz/ChangeLog
+++ b/net-misc/lrzsz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/lrzsz
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lrzsz/ChangeLog,v 1.14 2004/11/15 06:52:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lrzsz/ChangeLog,v 1.15 2004/11/19 18:08:39 mrness Exp $
+
+  19 Nov 2004; Alin Nastac <mrness@gentoo.org> +metadata.xml,
+  +files/lrzsz-makefile-smp.patch, lrzsz-0.12.20-r1.ebuild:
+  Solve install failure on SMP machines (see #70931). Add metadata.xml.
 
   14 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
   lrzsz-0.12.20-r1.ebuild:

diff --git a/net-misc/lrzsz/Manifest b/net-misc/lrzsz/Manifest
index cdd0ebf09cdf2c98a9e30e97489cee07b263dcd7..772e724e2dd100fbe2d3bde0c6f08092e2615bb4 100644 (file)
--- a/net-misc/lrzsz/Manifest
+++ b/net-misc/lrzsz/Manifest
@@ -1,3 +1,15 @@
-MD5 8b5184c82c75d97c114410b883da384e ChangeLog 1913
-MD5 737a019082cf146698d85e91009d8c09 lrzsz-0.12.20-r1.ebuild 1013
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6e378a4945f34bbfae3a547ea6097f12 ChangeLog 2105
+MD5 ce0a12e26f2e9c277050c7214c74d8b1 lrzsz-0.12.20-r1.ebuild 1086
+MD5 29d92f71b5132598910e225de4e85f93 metadata.xml 364
 MD5 f80a86c7ba2802ef0504f62f182bc046 files/digest-lrzsz-0.12.20-r1 65
+MD5 bd12dbf8699043e8c2bbe12c154d4b47 files/lrzsz-makefile-smp.patch 4310
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBnjayjtv59x0+BrURApmRAKD4byaUzL/ziTSuUPWMYHm8pSDiPgCdFQTG
+oHplzp9bMjDxkt1cz514wV0=
+=UeJa
+-----END PGP SIGNATURE-----

diff --git a/net-misc/lrzsz/files/lrzsz-makefile-smp.patch b/net-misc/lrzsz/files/lrzsz-makefile-smp.patch
new file mode 100644 (file)
index 0000000..5ec2417
--- /dev/null
+++ b/net-misc/lrzsz/files/lrzsz-makefile-smp.patch
@@ -0,0 +1,80 @@
+diff -Nru lrzsz-0.12.20.orig/src/Makefile.am lrzsz-0.12.20/src/Makefile.am
+--- lrzsz-0.12.20.orig/src/Makefile.am 1998-12-28 10:38:47.000000000 +0200
++++ lrzsz-0.12.20/src/Makefile.am      2004-11-19 12:34:16.766260535 +0200
+@@ -15,21 +15,21 @@
+ DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\"
+ 
+ install-exec-local:
+-      rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
+-      rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` 
+-      rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` 
+-      rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` 
+-#     rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`
+-#     ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
+-#             $(bindir)/`echo lrzszbug |sed -e '$(transform)'` 
++      rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
++      rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` 
++      rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` 
++      rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` 
++#     rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`; \
++#             ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
++#                     $(bindir)/`echo lrzszbug |sed -e '$(transform)'` 
+ 
+ uninstall-local:
+       rm -f $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
+diff -Nru lrzsz-0.12.20.orig/src/Makefile.in lrzsz-0.12.20/src/Makefile.in
+--- lrzsz-0.12.20.orig/src/Makefile.in 1998-12-30 18:31:46.000000000 +0200
++++ lrzsz-0.12.20/src/Makefile.in      2004-11-19 12:33:45.294953025 +0200
+@@ -369,21 +369,21 @@
+ 
+ 
+ install-exec-local:
+-      rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
+-      rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` 
+-      rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` 
+-      rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`
+-      ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
+-              $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` 
+-#     rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`
+-#     ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
+-#             $(bindir)/`echo lrzszbug |sed -e '$(transform)'` 
++      rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
++      rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` 
++      rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` 
++      rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`; \
++              ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
++                      $(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` 
++#     rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`; \
++#             ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
++#                     $(bindir)/`echo lrzszbug |sed -e '$(transform)'` 
+ 
+ uninstall-local:
+       rm -f $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 

diff --git a/net-misc/lrzsz/lrzsz-0.12.20-r1.ebuild b/net-misc/lrzsz/lrzsz-0.12.20-r1.ebuild
index ec379bc6310b9be89ff4187ce5abaafa12c66942..14e4f50c0d6332652a1cab37b2744e535828b467 100644 (file)
--- a/net-misc/lrzsz/lrzsz-0.12.20-r1.ebuild
+++ b/net-misc/lrzsz/lrzsz-0.12.20-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/lrzsz/lrzsz-0.12.20-r1.ebuild,v 1.18 2004/11/15 06:52:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/lrzsz/lrzsz-0.12.20-r1.ebuild,v 1.19 2004/11/19 18:08:39 mrness Exp $
 
 inherit flag-o-matic
 
-DESCRIPTION="communication package providing the X, Y, and ZMODEM file transfer protocols"
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
 HOMEPAGE="http://www.ohse.de/uwe/software/lrzsz.html"
 SRC_URI="http://www.ohse.de/uwe/releases/${P}.tar.gz"
 
@@ -15,6 +15,11 @@ IUSE="nls"
 
 DEPEND=""
 
+src_unpack() {
+       unpack ${A}
+       epatch ${FILESDIR}/${PN}-makefile-smp.patch
+}
+
 src_compile() {
        append-flags -Wstrict-prototypes
        econf $(use_enable nls) || die

diff --git a/net-misc/lrzsz/metadata.xml b/net-misc/lrzsz/metadata.xml
new file mode 100644 (file)
index 0000000..c82ce5e
--- /dev/null
+++ b/net-misc/lrzsz/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-dialup</herd>
+<maintainer>
+  <email>mrness@gentoo.org</email>
+  <name>Alin Nastac</name>
+</maintainer>
+<longdescription>Communication package providing the X, Y, and ZMODEM file transfer protocols</longdescription>
+</pkgmetadata>