[patch] cvs diff -u ~/patches/amanda-3.3.3.patch

amanda-3.3.3.patch (text/plain), 5.80 KB, created by Ian Delaney (RETIRED) on 2013-08-23 15:17:13 UTC

Index: Manifest
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/Manifest,v
retrieving revision 1.122
diff -u -B -u -r1.122 Manifest
--- Manifest	9 Apr 2013 16:28:05 -0000	1.122
+++ Manifest	23 Aug 2013 15:14:26 -0000
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX amanda-2.6.0_p2-coreutils.patch 246 SHA256 8bc95f294247b85e0b8ffbbb94198fb829c5f26ce999f397ad09ebe64a118f53 SHA512 b1de359808290baf403b9fd995263d15a7f624157ce7a6c30b0f71b3b983f3c53574b6ee8a3ae03c14f4b3a4b16b81499f904a92fd2a2212502f4a10816c8905 WHIRLPOOL 55f2a749d1dc8124f48a38a35f5c0b10125da09655ca51b735ae29dcfbf6c72ef5cf3185ea225a0c35ce177c3eeb94c8470eeaf4200b03f84125246c8756585c
 AUX amanda-2.6.0_p2-syslocpath.patch 965 SHA256 70f19629852cb02876bac21a119acc30b94822126f5828d4e453af1ae47bc398 SHA512 f8f0e001b253d8493d4b779fbab795fed9f92ddba69c895462dc4d9be9b4edd5f08d4f6177d4c852a2c18cf260413809e34c023c8dd499c367100076ca1833c5 WHIRLPOOL 086bfebdd50e1968564697bd754d4b85a59ae889fb0faa40f6dd3e0169bcfe9adbfb2cbdda97abb182ec2ac13660f0b7c3f029379c3094791e7eb1372c0579fe
 AUX amanda-2.6.0p2-amcrypt-ossl-asym-race-fix.patch 2713 SHA256 4ef8b55a79f1dc7ccd604bf308afbe3949baf55f9eab9ef2556f9c0f4f48a6e8 SHA512 09689435fcf38901be86b365af12bb8d8a86c22e10383593850a69f2e0ae259bb14ac5d7c310037710c8e2c4bd5bae5982eea5f1d7970e6b3483389ac648a52c WHIRLPOOL c6bb0dabe7704a198873390d084f0d903f6e5b2e722add1184a6182e12172de7ac29c2168a91b96041b9bd8c1813b90a396840aa4e190c6eb83b117ca1d197be
@@ -38,13 +35,6 @@
 EBUILD amanda-3.2.3.ebuild 15728 SHA256 1fbbdfb6969019c2218ed27fe92f285a972621ada2b13aa261c50df4bb00e954 SHA512 7729963bf8da8e3eec74c14779fffc203d774a4f74b5479a524bc4db64154530eae51faf7ae66c2edea3a3dc6fb24a1cd228860d225a5b0da015ff4529810b43 WHIRLPOOL 40bde63d876e7e66f96406a8b2e9c2f2a16ec3c3e4b609e69fc17c654022fc7dfc21aa0d691728079f46d21b20daa2ea8c3b2f8c1c7d57f63de932c560dd30d2
 EBUILD amanda-3.3.0.ebuild 15728 SHA256 a8c5f56cc8149b5f3060897dfdb48264f6acc4feacaae3aefa9cdba6560d1313 SHA512 4882623dfd173467785327d5f1bf155733fc90247353e69a8f2f003554f7383424e3adbdba7832ae47f81ef9bdafa85d441fcd6f3e8a011398e4e2f899c5bdfd WHIRLPOOL 2df3bc37e7336f47a967c135f47513ef55d3b559d20df441d598992ce014e5ace1eb704f9b66ec6d6f08f7d3c692a47b46d16e646ab5cf3668ef98d3ae6868f6
 EBUILD amanda-3.3.1.ebuild 15870 SHA256 3b8f3617cffbb69f1b9fe8f02e80c506d05d29c4e411246974671fc9fb624cd8 SHA512 c4ce61ed5ac365faffec9c388e5fd59d15cd537960e03301533476415686638700a60533f532425b90cb066f4ffafceee869a62ef6e48b525dc611ad14bdcd9a WHIRLPOOL 11e19009702143862c74689095f988a502e9c51e72edc76fd34c80d903eae73eb78e080c7c96f5d58099bbba6a2e8d1464c36a6d296e2086cbfa02a981edfd73
-EBUILD amanda-3.3.3.ebuild 15722 SHA256 f2ec15566a579657af5449a21b226cf51194291ee43b82e56eeba6f6344f07a3 SHA512 c7abe42c58325ac191ce168c8f2a8be4ffcf3c3cbe8c43bbb94b2d14e7123235a2b6915534f9d796f9cc28fea528d3e6b9e685a2d56b505c638a1b30f0eed343 WHIRLPOOL 67b4da0523edf1c4301199df2cfd9ede203418053e402c17991ecc328117f0147a50b4c6c12f351a2e54fcbd89a562541594ff026d4a8dfaed3251653508d24e
+EBUILD amanda-3.3.3.ebuild 15647 SHA256 f15dad03577e529873e99f446ecc60329ef04f0b17bd46d0ad705717e8fa5ec9 SHA512 a2b76196c09daffb6c4854dbeea6554e4da65e0d050c7e178e7c2db6df4361a78352e916ca6b82703fb8aeabe933e7b00d9345411218a7448eb0526667ce5b15 WHIRLPOOL 3991fafceefd13f0104bd2330dc8e5ae300e1ae89407fe0b33c87c6908c59afa45f1e194dd2a0c3709f8ba823e45ef10a60a46c070c23b70bddbe0d880cbe73b
 MISC ChangeLog 26288 SHA256 63c07b5af3acea34941d7afc4d76c470e8e1c5659e0b2a77272b108f163b2b84 SHA512 1f423cf3ba8e8e303dc67e9add6b038f987972e407246e7042e7d9031226d1cf360f2f664c510afe18c77ca4e79e61d1e60d34f94dac83bee30bda269aaede86 WHIRLPOOL c840b3b6cfdc0f9d0a7b0842c75eaf6aea9c8be5466300c1bbd65ba504cb837bfe5d4804585ec7c76687a16c9ab8c2ae556fde03b50f5b1564ed85f799f762ca
 MISC metadata.xml 904 SHA256 e34f457d1324539ee8ffd5809595b46d0abee676bb57ac7710ee013e88c39efd SHA512 f8091d6baa53cb516243780f91a69146fb924d821a7fe345105ea3a9cc5798e91fbd025ed7a395a64b6a880b7cb3cd8aac8c5542eb7d2e8e96455c3bbfd2eb68 WHIRLPOOL f3972796629a1d64f27e0f45d903af78616c5303fdec66995e6757eb3ecf3db40b5d149b53ba02fe64a8c7b817f042064e207c669b1e8334bd5d800480b6fa1a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlFkT1YACgkQfaj9zK3JFuWM3wCeNTMkiDkn+AQVPjHvJbEA9das
-2sEAn3G/ehSyd6suzlupTSIImw5eCxEi
-=pBmU
------END PGP SIGNATURE-----
Index: amanda-3.3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v
retrieving revision 1.3
diff -u -B -u -r1.3 amanda-3.3.3.ebuild
--- amanda-3.3.3.ebuild	9 Apr 2013 16:27:35 -0000	1.3
+++ amanda-3.3.3.ebuild	23 Aug 2013 15:14:27 -0000
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-backup/amanda/amanda-3.3.3.ebuild,v 1.3 2013/04/09 16:27:35 lxnay Exp $
 
-EAPI=3
+EAPI=5
 inherit autotools eutils perl-module user systemd
 
-MY_P="${P/_}"
 DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
 HOMEPAGE="http://www.amanda.org/"
 SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
@@ -46,8 +45,6 @@
 
 IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
 
-S="${WORKDIR}/${MY_P}"
-
 MYFILESDIR="${T}/files"
 ENVDIR="/etc/env.d"
 ENVDFILE="97amanda"
@@ -302,8 +299,7 @@
 	source ${TMPENVFILE}
 
 	einfo "Doing stock install"
-	# parallel make install b0rked
-	emake -j1 DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 
 	# Build the envdir file
 	# Don't forget this..
@@ -407,7 +403,7 @@
 }
 
 pkg_postinst() {
-	[ ! -f "${TMPENVFILE}" -a "$EMERGE_FROM" == "binary" ] && \
+	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
 		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
 	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
 	source "${TMPENVFILE}"