sed/echo must die(). Drop ineffective sed script. Add dev-lang/perl dependency (bug...

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/sys-apps/ucspi-ssl/ChangeLog b/sys-apps/ucspi-ssl/ChangeLog
index 60f6dab9ae470a19077c59ccc9385ec4777fbbd2..4621687c42d8803553717331bf8877c23890d42e 100644 (file)
--- a/sys-apps/ucspi-ssl/ChangeLog
+++ b/sys-apps/ucspi-ssl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/ucspi-ssl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.38 2015/04/20 01:00:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.39 2015/04/20 05:30:23 jer Exp $
+
+  20 Apr 2015; Jeroen Roovers <jer@gentoo.org> ucspi-ssl-0.94-r1.ebuild,
+  -files/ucspi-ssl-0.94-verbose.patch:
+  sed/echo must die(). Drop ineffective sed script. Add dev-lang/perl
+  dependency (bug #547156).
 
   20 Apr 2015; Ian Delaney <idella4@gentoo.org> ucspi-ssl-0.94-r1.ebuild:
   drop use of patch, add sed stmnt from patch supplied by maintainer in

diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index d1d47e79a85677b2e1b0119f2d9e5001245da85b..b6e76051ebc99e54d95bb5cb9766a97c0ec11567 100644 (file)
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ucspi-ssl-0.94-verbose.patch 460 SHA256 bb00c25dff3f110c59eefe9a9d498e49d9786d24bf0a6fc4544b10a85887ff3b SHA512 a0d7c42f80d767206a71fd29e2b6962fca9a4c896a44642b4f3750a8a12a83dca5261980360083f8ba19085e8129a37cffe9a89d294309fa110902cf269a9855 WHIRLPOOL cb4301a38bdd8b26591ba4867d587a96c7af68d67f6dd32445442f91e32983a8dd3a3ae57b2c8f06b80d3bff4de89a5f0341a06834f74674a5a5cff203fefc16
 DIST ucspi-ssl-0.70-ucspitls-0.1.patch 11967 SHA256 90ac703776f7b34949621a24d24e301d97d85cd0f1942eec463dcdb687ec31d9 SHA512 90f8eb66d85c0f72ee1529b3a54e469a7fd6ae99299f9b893c876dd88f3007823363c9922a8527b71ad2273909d065642f79bafd72308720312081e5da272b4e WHIRLPOOL 4951faf06370a44247473eae0ea3907898217495bd0cf044f6c5e04461e5dc19a85f66dae1f24b39338af359b9a12edb8d8b26892855935c1ba25d128e5f3861
 DIST ucspi-ssl-0.70.tar.gz 85111 SHA256 8834aaa83a6862457c853818ce829291285043a553d4466671c05663bc580cf5 SHA512 fe2b7d3af8d40dedf07b644638f2d44f6780ae0a7d0b783ac11046738b862c7fa9fcd719ac11424f9c5ffd5de9bb0814ad2ef993c9cfa649dcc49aeacb2e948d WHIRLPOOL 1dad668519acddeea371585863e54e79f0f6c9889453169c52a56fc8036f48239847f9187db91bb7c5359962781a568f89cc3713305a296df87285110bdf5559
 DIST ucspi-ssl-0.94.tgz 112640 SHA256 343c0281269d88650823eb053fe80bf34b81f52c12b895f27534706b983a23b4 SHA512 a2b7fcea0da4c99a02cd0cf9402d59e55309a65031232e8afc9f29134be268c2e385840f5616c2046649a3f421563f1abcb707a8a8e93c7d29e7aef4a368b604 WHIRLPOOL 1ef3f5b447810eab97532b7fabaf94c56ddd0818a51f1149ec31ad2265c8899e90c3cf5c497a1c3570fc83918576abca2103132db3a494181ea2a872590fadb2
 EBUILD ucspi-ssl-0.70-r1.ebuild 1383 SHA256 5d3c9220600351f671ae025400006341efad20e767b09ba2a7f9cfd288b19558 SHA512 c9b48a4ba97d34e3f6b6e4181f240d58717dd6628ff9a8c749ba95c7a1dd44f98bbee4a4254461e665c951c06447cf3ed3164fdae4bcb81c5d26fea185223288 WHIRLPOOL 8b0ea924edfc7468b11f5e3c3408812c4979914fa770ed8f5a123c624c7ebd6a33224fcf639af2318e204518dbe0bdf14d53c364d003fa04818eaeb2973d3c93
-EBUILD ucspi-ssl-0.94-r1.ebuild 1276 SHA256 c72199cfbacdf783fd554cebe9a2e4a1d84944c1d77774e2401c63e13d9551f3 SHA512 5ebb198ed513b1db60bb8d0978fd00d604d64fafba60770bc214092b16e570576ca6f3ec686d3833c58cff04c5b403e0255d1f66daefe34058393c327eaef121 WHIRLPOOL e44db41e7344247f89bac191f96dbae20367d41c2ab2bb8bade3ff5a756fdfd35f5c494b383c430e269e7c633d6b7c1c3d12c9c23010115f1490c173c7a8de2f
+EBUILD ucspi-ssl-0.94-r1.ebuild 1346 SHA256 571a12205e06cb3e9bfee03637be88db986111ce92e6f162422e351ce45427c5 SHA512 0687177b562103b22890b9a57dca77a7f7870452dbb0fe025749184797c521653580336e0b8d7b1f5a190b9a3ccece96104712307c2085be165d7aeca0e4cb26 WHIRLPOOL e62ef86128a8b01ee51b3a968de6bac18a3204a8a1b9018b86fa303f307d6844dbefea8358bc9ff7bb174e9aecc46c83ddfd8ca73191350a330b52f30956b07e
 EBUILD ucspi-ssl-0.94.ebuild 1198 SHA256 f2b602a767ecb79e85eca2be5324e25013dec9c959d7326a1cb80415ca3785ef SHA512 dab203530fe4ecb8f4d104cbd88b67213a906a1e47f1c95f825d0c2b94a378c55780934bb3529bdfe1dfa7b7e6f23f99c784546a30ae073145368ae533cfe0ba WHIRLPOOL 669362014c5c04acc03125a9579de6731d44f1daad306df8daee74b8141cd5f660a0dcf2ce5c8f3d93d15b97a64ccbcb9e82e7b412ebc0ffe6fbf6e6d5e82510
-MISC ChangeLog 4877 SHA256 6af8a5595170acd2967a2cbfd63e40b67f0b0950c56d1d54ce3fbd56eb11c477 SHA512 ce21ce856512fe8139eeda45d138e56825bda3350ed518fd04de6e9223e65f5d4962f020356e4e7f67e00c6660f6b069a0419fcdaaf01fa6773f21060f05b88d WHIRLPOOL ad986c056891aee196fdd73b908a670a74c675780bc90c79d1da253a2c5950d0b274cffa5aa374beee4aebb1974a9196a2ea9b99683a6fc3aae5a041ede0cecd
+MISC ChangeLog 5084 SHA256 9a8854e0e68bcda9c76578ea00f8efe2f922901e67a3812fbc46ac6bce7c0b66 SHA512 6ff079365caca4bcf50e732d1aa09821276f208eb96fe6bc9acd95447670999db4b16ae5ddb2c12599bd0983fbf6a9ea178994406284b72f26d7012594f74103 WHIRLPOOL ea46b03e5e57ce71a3c57e59042f7b2386572a9064d32d196043836f4e16c970110a1d749544ee87f758b9853c42ba4990382e0f260b5b3b3e84c4ebeec7610d
 MISC metadata.xml 680 SHA256 07fbbd7adef595778c3f32fe4b39e6c096bc938ffcffaf8262a74a7eb0f07156 SHA512 89709a7f9d86a274d7825690c26fc347cc716f0fcd816c51d66f69c4a1f5a7dd23dc92794773d78e325825fd023c363f259f112a0cd79027c3e0a3f016017aee WHIRLPOOL cd5d2f626ffd0a1d56093ee54dfdcb840830c1b3d4d3d60fa43cc0b1def4ceab8221cfe0a7eccfdf52a4107caf97a1f58451808cbfc0321852fa173f7da21ad5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlU0T78ACgkQso7CE7gHKw0pYgCffsm3rWnue8uv+AL/zGWPRo61
-t/MAoK8miesyrh0G91TY9NrnTkpmDKyo
-=xeAV
+iEYEAREIAAYFAlU0jvAACgkQVWmRsqeSphNQugCffeVPyKTqqBsTFxocXyk2qlA0
+Cv0AnRGoVnEQtKTmR54C2Dogj4SfJcx4
+=JvJq
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.94-verbose.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.94-verbose.patch
deleted file mode 100644 (file)
index 680c7b5..0000000
--- a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.94-verbose.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=546992#c10
---- a/print-cc.sh
-+++ b/print-cc.sh
-@@ -45,4 +45,5 @@ case "$cc:$systype" in
- esac
- 
- cat warn-auto.sh
-+echo echo "$cc" "$gccssl" '-c ${1+"$@"}'
- echo exec "$cc" "$gccssl" '-c ${1+"$@"}'
---- a/print-ld.sh
-+++ b/print-ld.sh
-@@ -3,4 +3,5 @@ systype="`cat systype`"
- 
- cat warn-auto.sh
- echo 'main="$1"; shift'
-+echo echo "$ld" '-o "$main" "$main".o ${1+"$@"}'
- echo exec "$ld" '-o "$main" "$main".o ${1+"$@"}'
-

diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
index 63ca7cece1690220ea67e8de465ab1b06777ebe7..cbdc301cb81f609e094858c6e816d6825afa0a2d 100644 (file)
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild,v 1.2 2015/04/20 01:00:32 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild,v 1.3 2015/04/20 05:30:23 jer Exp $
 
 EAPI=5
 
@@ -15,24 +15,29 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="perl"
 
-DEPEND=">=dev-libs/openssl-0.9.6g:="
-RDEPEND="${DEPEND}
-       sys-apps/ucspi-tcp"
+DEPEND="
+       >=dev-libs/openssl-0.9.6g:=
+       perl? ( dev-lang/perl:= )
+"
+RDEPEND="
+       ${DEPEND}
+       sys-apps/ucspi-tcp
+"
 
 S="${WORKDIR}"/host/superscript.com/net/${P}/src
 
 src_prepare() {
        ht_fix_all
-       sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh
-       sed -i -e 's:auto:gcc:' conf-cc conf-ld
-       sed -i -e 's:-m64::' conf-ld
+       sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
+       sed -i -e 's:auto:gcc:' conf-cc || die
+       sed -i -e 's:-m64::' conf-ld || die
 
        qmail_set_cc
 
-       echo "/usr/bin" > conf-tcpbin
-       echo "/usr/" > home
-       echo "/usr/share/ca-certificates/" > conf-cadir
-       echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile
+       echo "/usr/bin" > conf-tcpbin || die
+       echo "/usr/" > home || die
+       echo "/usr/share/ca-certificates/" > conf-cadir || die
+       echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
 }
 
 src_compile() {