Fix help file location - bug #424437

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

3 files changed, 100 insertions, 14 deletions

diff --git a/mail-client/mailx/ChangeLog b/mail-client/mailx/ChangeLog
index 3f27d4199eae..f83d43c35c73 100644
--- a/mail-client/mailx/ChangeLog
+++ b/mail-client/mailx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mailx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.73 2012/07/03 20:00:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/ChangeLog,v 1.74 2012/07/11 10:26:38 eras Exp $
+
+*mailx-8.1.2.20050715-r6 (11 Jul 2012)
+
+  11 Jul 2012; Eray Aslan <eras@gentoo.org> +mailx-8.1.2.20050715-r6.ebuild:
+  Fix help file location - bug #424437
 
   03 Jul 2012; Jeroen Roovers <jer@gentoo.org> mailx-8.1.2.20050715-r5.ebuild:
   Stable for HPPA (bug #419011).
diff --git a/mail-client/mailx/Manifest b/mail-client/mailx/Manifest
index a94cb9383c2d..f886798d81d1 100644
--- a/mail-client/mailx/Manifest
+++ b/mail-client/mailx/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX mailx-8.1.2.20050715-nostrip.patch 668 RMD160 86080719a66d0889f6fa6458ab65e72b670b3ce8 SHA1 0c04fadebc81b1ced09256421d9cc8a5b1b31cd3 SHA256 0636586473c198918e8db1d1ebfc006d3312935959532f8c2742b882da5e391e
-AUX mailx-8.1.2.20050715-offsetof.patch 1566 RMD160 1c6e36cd7607550ef7616d17a4ca2a1223f7a85b SHA1 640f93913ea9d517d9ae6233450c069cdb970eee SHA256 be6bf29554e6f695492e2c9dd3a8e6d6e19a4e375982c7478941c61f992dfe4b
-DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 RMD160 bf116b8e7d1207b37d0f9451771f0f318880aff2 SHA1 f8b54d1c6fff315444f5342481fad9d5cf9b52c0 SHA256 2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3
-DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 RMD160 9fdf63d616f2240141bf06dc1fbf6457ddd5fc1c SHA1 23e2ddef1bbd0df85d7ecbecc5fd62f90eb9a4a4 SHA256 5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3
-EBUILD mailx-8.1.2.20050715-r1.ebuild 1481 RMD160 7f63289831b15b23b3aacaf1351a9be37cabb1cf SHA1 09ddbb32616d3b20b0a7ac54b7a639f8fd077561 SHA256 35c7149e175bcc4a2e837d6d371450c6d167fd22c3ad6d31e67fe8c57efcdbb1
-EBUILD mailx-8.1.2.20050715-r3.ebuild 1566 RMD160 4d16d58e9fc7a394d4b97b320c5b10d378bde963 SHA1 c4d286bec9de08d647fc71dc00738639fa8ec480 SHA256 1cd74038b3c0d6f29a7dccaeab163f02c9ba8a76e58d7db3e214f0ed7644769c
-EBUILD mailx-8.1.2.20050715-r5.ebuild 1698 RMD160 f0d85bad8d9e20bfe29aedd850b53e6db98a7397 SHA1 ee77534836047b9c46f16e08e5badbe4f4213bd5 SHA256 2464b9d75336a44c0caf752aa97f6d5cf288dbfa2410f04b42fce5a189eab242
-MISC ChangeLog 12335 RMD160 35060226e5cd5d2a69b448538abd435847eb18fc SHA1 533300d7782675dad75c383b68eb6313978e1c78 SHA256 9a0931ce012a0df52ed5555de0181608a8033aafa92ddd322018aec5f246bf18
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+AUX mailx-8.1.2.20050715-nostrip.patch 668 SHA256 0636586473c198918e8db1d1ebfc006d3312935959532f8c2742b882da5e391e SHA512 abdf016ed925c8f8388eb03cba64a601b2b72e3c53fcdadefa5c220bf7008325f38004d1ed3fe0a938ea82f8a9167352c235ff2536c7b5b100f63ac36f25db2c WHIRLPOOL 768f187dc859bb5409452859f114df6881c32cee1ab98df622db66636bdc9982e63e99d7c1955a114afb3019974b2478ad6502d841ba384434e2c4b439e9618e
+AUX mailx-8.1.2.20050715-offsetof.patch 1566 SHA256 be6bf29554e6f695492e2c9dd3a8e6d6e19a4e375982c7478941c61f992dfe4b SHA512 f6c865cfe32d75d2ce2cf3538822db3c22edc09038ba72f7e25001bfda9b4b2c320e03f91622b316a268cfbdc1f57780ffe199dd8da8c78fbcfe93daf9972aea WHIRLPOOL 3589532bf8a43f95c6ca3c94338e1227e3462754b748e9333a21ccd3b40ca1785befc770aa84bcd84f343701a5aa63009bf68f8d909fa08012745f7a87c32749
+DIST mailx_8.1.2-0.20050715cvs-1.diff.gz 36758 SHA256 2fb891f912624766d0bef765d69cec75ad3334dda1aa58659f3c3c1d0579c2c3 SHA512 6506261f24d5a022fd9cee596a78488a279a0b39b7281cdad9c3e52b5c7f6c2506a1b24970c28cf7b4ffa4ce2d71fec650f42d22959b53aeca0f160b2885b2fe WHIRLPOOL f265880c7b318b4353b182f3e7923315bca5b42d1d1770232cba39d6e92b362acb13c6ca05330c43523ed9c8e55d5602ad71cef579d08f506476c5b107ecaab3
+DIST mailx_8.1.2-0.20050715cvs.orig.tar.gz 94664 SHA256 5c578a8c573b4430358d4f6523f8acd8b2c5039579d907c88ec09dab13b226d3 SHA512 1c1d991a0e522b2e78a49b9c78eed80b1f6d4f68ca0427ef720ebe77a3a2881bcd3d63967ab04f5d6f75fbf2212e260e4a841152f8a69d300c46acd90bb48d68 WHIRLPOOL d21dcdfa16a8d5ac8a750618b1319688781542d348397b7616d4efef660c2bc25dd0cd923fddadc772dc08a25dabc114179014e659ce3fe6cf4afc1a98fe2048
+EBUILD mailx-8.1.2.20050715-r1.ebuild 1481 SHA256 35c7149e175bcc4a2e837d6d371450c6d167fd22c3ad6d31e67fe8c57efcdbb1 SHA512 ffddfa285c6e934dcb8c404efebeb676d91a637072ec683c1891b0f389a58ffa76ffdb4eba3e9f792f4cf0e90f7ee02b8de2cf784e2763b2569a20eb4551c856 WHIRLPOOL 88f7ddde456c3d55047af4b3fb71361a72c7fe2256d0cd37184a4139924684e3b0fb1becc156be8cdf52ae0dea49abdcafe8cfe11abfb350c68753f9ef18063e
+EBUILD mailx-8.1.2.20050715-r3.ebuild 1566 SHA256 1cd74038b3c0d6f29a7dccaeab163f02c9ba8a76e58d7db3e214f0ed7644769c SHA512 c05d0bfc4bc8254658b82bc8e75ea0088b1d3bb5b700502c86902ed0170a5e1f044501d8fa9aeefa4af3dcde0d66cb0e9e84160e1e1bd2fedfb423b2ec84cffc WHIRLPOOL 679110405dd193672643f19936dd6f9f6ad9d5eb730970f6c0ad036b50dae8cc7f6b76a11d556ef67e3c4c4d031d0cf0d180f8861c7c32c5822d9fce557dc77a
+EBUILD mailx-8.1.2.20050715-r5.ebuild 1698 SHA256 2464b9d75336a44c0caf752aa97f6d5cf288dbfa2410f04b42fce5a189eab242 SHA512 4f75b3c0b44726176e33849ce919ddf21c1e0ea40e4857f97ef27c6cf69d039361c9d6410b958979e0f94bb75b5b8c008e0c10ec46dbea084e767a50f583da21 WHIRLPOOL 292d52cca17c67b0d4863cc5bb674d8db5e0d001b87be2f351e3ea48837701fb2bf6baebd6a951f78747616c28303dff45b0799e7809945dfcf245d814c36db5
+EBUILD mailx-8.1.2.20050715-r6.ebuild 1732 SHA256 9c5ced4b7a58d0a80dfb6e629e94de529fd7c5e02b3b56a419f19d9fe5f19a56 SHA512 1e8274f3e90a0711f4bf412d35644e2e0b273a5e2898479b8eda461849cb6ad5984e7c4ffc2edf86714611f1923d78383428e363d72165f4bcbb578447f58abd WHIRLPOOL 5bf54b6f82b985cbb14bcd00607c6b6df0c9fd2d8d10490fa84149abf816f06d70940ea4d975de84c03f587cb10d751ba73ca264d7aba438769b040cca1836ff
+MISC ChangeLog 12493 SHA256 9352e1423f5c19bc91f11ef3917fee0f235eb0a1b612cbef7bec72ef1b70c541 SHA512 c109f1d7eb81a34de450f61eeeb7b59cc311cfa7efeb5e6374557c76a77d4b9ed5d326551527948238c4c845de1f8758a36c317526c891291d913f122e462e18 WHIRLPOOL a8706145a8591fc624899d864987b7bad7cae70bc45569e2867ce5b43e4ff5de17de0a105eff21818ed88c655065b9870e818c1ee454accdecd152d59b26ce5c
+MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/zT0gACgkQVWmRsqeSphNZ/gCfR6bOwxnrPU1A0C9lkl2f+BtX
-N2gAnjN/F79O6sRrgFrPzXyvMuDta+KT
-=MeVe
+iQIcBAEBCAAGBQJP/VTkAAoJEHfx8XVYajsfhYcP/R0ZUvMVR9H+IJmDOpxNcfPv
+UoGRD+/jhZFyEnQCrKQjFHJS/x8OmUx9wFggtdT3CwpC+FeSXv6+2/zVRBb4KcRm
+ZbBO6+1ErA4LxedokSY/NaZ5IF17ZQcCvYkGN1bSfktKhZISIX/t9Z+LbR0XpgRr
+8anRBSV0IEYlVPzkiJb+1H6dTmoQZdodPEMxj0BETHqAxVbjxQ36Gxcnwaof/JMN
+CQKog/R2UzM0Yn2B4R2PX7L+7Nc3D3TxkAuSS/I93MrtW9hJCW5yRDAD/sb4hIi5
+4jBgK//KJowE0fZvCSc/jphJGqY6OrG4lfS0Kjs+BAG0hJFLeiboa3lPyrV05tDq
+il0JV07GUeDuw66PTlCR5MnZJqHs3TidoystwZN4Q5pj27bwwucYhBV1AzQefnMC
+yEZQlPwwjyC/J4UdzX44R3grWg2qsrw10ToscJKOd9L1N00GlWWA3lxF2Cn/mizx
+pYVr8j+W7Hc0cGjkmlISEjrKWBvD/i61qGISfivL3wA2HaDIp1DvHofN8gwHmBGz
++aatG28knoSDfPfRsJ0I88KNtBXfl3VXPs3+wwf5LIov9GafO6lC236BqFwpLZHe
+EdTHL7nQkgnNwb3zE8v9SLpG4DOrG4ZFoyycCyNZb+ecueoDN/w0GFyR246PDYnm
+54U9EgdhgQo67rE7cWwA
+=G2kZ
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
new file mode 100644
index 000000000000..5dccc42f7b72
--- /dev/null
+++ b/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mailx/mailx-8.1.2.20050715-r6.ebuild,v 1.1 2012/07/11 10:26:38 eras Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MX_MAJ_VER=${PV%.*}
+MX_MIN_VER=${PV##*.}
+MY_PV=${MX_MAJ_VER}-0.${MX_MIN_VER}cvs
+S=${WORKDIR}/${PN}-${MY_PV}.orig/
+debian_patch=${PN}_${MY_PV}-1.diff.gz
+
+DESCRIPTION="The /bin/mail program, which is used to send mail via shell scripts"
+HOMEPAGE="http://www.debian.org/"
+SRC_URI="mirror://gentoo/mailx_${MY_PV}.orig.tar.gz
+	mirror://gentoo/${debian_patch}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=">=net-libs/liblockfile-1.03
+	virtual/mta
+	mail-client/mailx-support"
+
+RDEPEND="${DEPEND}
+	!mail-client/nail
+	!net-mail/mailutils"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${DISTDIR}/${debian_patch}"
+	epatch "${FILESDIR}/${P}-nostrip.patch"
+	sed -i -e "s: -O2: \$(EXTRAFLAGS):g" Makefile
+	epatch "${FILESDIR}/${P}-offsetof.patch"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) EXTRAFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/bin /bin /usr/share/man/man1 /etc
+
+	insinto /usr/bin
+	insopts -m 755
+	doins mail || die
+
+	doman mail.1
+
+	dosym mail /usr/bin/Mail
+	dosym mail /usr/bin/mailx
+	dosym mail.1 /usr/share/man/man1/Mail.1
+
+	insinto /usr/share/mailx/
+	doins misc/mail.help misc/mail.tildehelp || die
+	insinto /etc
+	insopts -m 644
+	doins misc/mail.rc || die
+
+	# compatibility link
+	dosym /usr/bin/mail /bin/mail || die
+}
+
+pkg_postinst() {
+	elog "mail command now lives in /usr/bin."
+	elog "Please adjust your scripts."
+}