Add blocker to run-mailcap - bug #251181. Respect CFLAGS - bug #427380. Fix QA warnings

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 95 insertions, 24 deletions

diff --git a/net-mail/metamail/ChangeLog b/net-mail/metamail/ChangeLog
index e1d31872d071..636118f1cd6c 100644
--- a/net-mail/metamail/ChangeLog
+++ b/net-mail/metamail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/metamail
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/ChangeLog,v 1.46 2011/12/19 20:33:25 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/ChangeLog,v 1.47 2012/08/07 12:13:30 eras Exp $
+
+*metamail-2.7.53.3-r1 (07 Aug 2012)
+
+  07 Aug 2012; Eray Aslan <eras@gentoo.org> +metamail-2.7.53.3-r1.ebuild:
+  Add blocker to run-mailcap - bug #251181. Respect CFLAGS - bug #427380. Fix QA
+  warnings
 
   19 Dec 2011; Eray Aslan <eras@gentoo.org> -metamail-2.7.45.3-r1.ebuild:
   remove old
@@ -170,4 +176,3 @@
 
   Initial checkin of this package.  
   Ebuild originally created by Alexander Holler <holler@ahsoftware.de>
-
diff --git a/net-mail/metamail/Manifest b/net-mail/metamail/Manifest
index 4d2c9a62ff88..edc327e53202 100644
--- a/net-mail/metamail/Manifest
+++ b/net-mail/metamail/Manifest
@@ -1,27 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 RMD160 36717abc5bb938a03d143f82c8870e376e4fb426 SHA1 811d0c31cc6be6dbbba0e35a21c0d6c9eda61e5f SHA256 cd5363d62d3f277c5d13694b364177230976c2abca508d8adbcaf1d4d520fc3a
-AUX metamail-2.7.53.3-glibc-2.10.patch 718 RMD160 a0167f5cc06796e26d47467d68ca3eef6ebc7872 SHA1 71f5ddb786ad9fec7ff0c4d86c6910ebdcc4c763 SHA256 0601ebad8d25aea2a24cd8debe36f6f4dae14b5a2e2508efc116449c2d562af3
-DIST metamail_2.7-53.diff.gz 322363 RMD160 8d8878463288f6bac0016fc101230208386961f9 SHA1 678a6efadd9fccc8e4c4d0b5c012aa05434241ff SHA256 43c14331ded498ea0b5adb2367bb18ddd879f161dccb89e879952110a5f151b4
-DIST mm2.7.tar.Z 262881 RMD160 ae322cad0653140cbe7f0148ce48757df98c26b0 SHA1 8f213baec9b17c05bcb066f616977a561757d7a6 SHA256 9c0281bdce32a7d3e61c1e3c703a748acb5d216d082a718efa316f68b9808a96
-EBUILD metamail-2.7.53.3.ebuild 1245 RMD160 9d576e1b6a4c758e02df1f61c30af642bb90cd20 SHA1 4cac7dfef548e474ace4c97cda2714f99004883d SHA256 2b458258e7b221b0395c1806dbcad9644785c204e6eca79d5501e89483ef27e2
-MISC ChangeLog 6184 RMD160 45676069f002c6abb1dd97adb0882b2a0f9a9604 SHA1 00b1c6d3344c33a478a8d752d2a083f4bd48e6b0 SHA256 e30cc3d945901da919774685a60c7180830579b1600e04050185e70bd14c7a3d
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+AUX metamail-2.7.45.3-CVE-2006-0709.patch 1900 SHA256 cd5363d62d3f277c5d13694b364177230976c2abca508d8adbcaf1d4d520fc3a SHA512 41e527767582c55ebce32ff91db0510af402a35119ce680e84cdc032701f25faee336cee303ca8891b4d870a91991fd1c4ccb455042032d4337ae247a3a3dfa1 WHIRLPOOL 3c5b13c3b188f426c94e4e10e4a7474a0f64a2696920e29b3c38b2eed4cc7de319d86581dfea34dedeca086df7893770fe8e050642484e43061dfa0f32b1839c
+AUX metamail-2.7.53.3-glibc-2.10.patch 718 SHA256 0601ebad8d25aea2a24cd8debe36f6f4dae14b5a2e2508efc116449c2d562af3 SHA512 077ad34f5d7664ef9824b623c17d9828b64aa63045f854b4b65567a35bf6fd1d5753d6d3186e3a7d6b63c2854f23cb566911c6bc4dc0904ad7d035229b2543e4 WHIRLPOOL d2fb22baabb0929a86597740e357d1967d7202d0d13a6c4c2aee6c23fdd88cf0e04f35045b0f918bc88fd36c529a85738beb26b2e8c4e960615bab25924eac24
+DIST metamail_2.7-53.diff.gz 322363 SHA256 43c14331ded498ea0b5adb2367bb18ddd879f161dccb89e879952110a5f151b4 SHA512 cb5351308f1ad479e1560446f7f540165ff165d7306a5592a8286edd643301608ff9ace01456d4b0d03d27b9b838b61f08412b15d6b3aa99b95e2ab484e884ed WHIRLPOOL 592d37044bdbaac0a1e67243ef7f16b2ce38b3e49cab7e72673ee921ad52370bf5fbf3ebb60c03a0422933948a09767874e678ffd62b41f8254ef0fce4287b1f
+DIST mm2.7.tar.Z 262881 SHA256 9c0281bdce32a7d3e61c1e3c703a748acb5d216d082a718efa316f68b9808a96 SHA512 9cd2619ca83594ca7be94453270b6a9ef01f5a496fd361bb76f16fc575f549ab450efa1d480c3d4b0b172f245d9c3276f99ba1ae4e3ae4bb6618df9d8131f77e WHIRLPOOL fedf0b51fda7d6ab384770c7d9553fcebe4ebe6abbb8e0dfb944360727e0a725ac3ab25f4a03307f66f71958489f235121bddc625f20bd5323c3620feb387019
+EBUILD metamail-2.7.53.3-r1.ebuild 1677 SHA256 d8b305a4ac06166d32bb6a2d145b0786504710024aa54ee2a7d5e6350e36c152 SHA512 dab51749d042c01651248ba275029a96c81fa5744a85910380be2c31233a61cd633d9a1a9694ee30cc1e69140e7d3fb7fe70f4ec7ba94a0d8706d0c2028627f1 WHIRLPOOL fced69d0de33a0a6004e58fd7df9e50765d314410323c554ed12ed0557d72d929e89b578a3d078531de442899361dd65d37d8b0c7b1b61a3281464537d9b5502
+EBUILD metamail-2.7.53.3.ebuild 1245 SHA256 2b458258e7b221b0395c1806dbcad9644785c204e6eca79d5501e89483ef27e2 SHA512 96920456631bac8d2eae7985e6d176f13866040d9b3303e5b54bd640f913a64ae65907bee0b87736de50bf42edeabd106cefc636643f0bb19aa6c5166c0492e6 WHIRLPOOL 4d82797163a7ab952c53852426742eba8f633abe3cc8b4e402ab941e56b68dd296f9d1ac348d34102db5a10f18b12339e13773852beb8a186096175b2d61c2a8
+MISC ChangeLog 6387 SHA256 f3a1fcddb3f0bc0b48361cbabbb387e09a5761f57850c5477a519d7999199a05 SHA512 ba24f3461c58c35f8d0a1e96f72ca47393e39e162b64f7a47e9fb6b69abc481adcb8933315eb0330c68da2ef9cf8f2212125053ccff221f86249fbb65806ab25 WHIRLPOOL 0577750b235e2e07177ad941b9ec38a517319cbee6aa8bce0e7ef7bbc353acd1fd058420ae78ca40acf25764078c09389c85634f5afeb76e4a4920d2f1b1985b
+MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO75+pAAoJEHfx8XVYajsfTjcP/iayRKhZcP/6n3TKaSzB0tcU
-gIcWzSfaN74USuOrS5SIe7AVZX03hKemhoEF/4Cq5fMa7zeSJDTuUFvrpy47sJ6N
-J80/phvcNyK07I+EQw08ekR73pgnuh7u2AKz9GzzS3foUGKXf2iMiY88PnTVmhpL
-5jEJto0fNUh91UvOlT8ulYeJz2rBX+90tCv+4cPJlfJ57ukda76atYTnwcqEflZy
-ZdtuCM9V2n43WQAp3xisi3GowFiN/Md1oiusGw2YPn5n+mPHS6kxFQ+a5oN2Ncxg
-Pl0DOpfvsPWyBA517zq28Sm8W4GIcGtBU4SE+fqLNdDVkUw/xllMmUYF0FreAbGS
-J3HLA26jepv44ITot5b8RqRq8TjqKqj7sQ2tr0jTSzc7x37u+N3Se4FQl7gr/2zE
-XjXj60Hx8J1ilDSjsB1DWA0pGenES13yZGM8rMwk76OweoixtiX5o8OdOsipn5vY
-4rGuj2RCKWgtXRIapJZFyclCInoG4v3rycRkunhpZDzkZDPUMc6T+5Grwh3pJl8L
-6hul2aPV5UbtlL3MaGexMLiGA864hdN0qbGUNMgETyttpUjR/w/Z3Ea7lJO7KXJt
-Sq4fcIp2jasr/jlOgrdneFVePx/2+HHYTHpSp9JsnrtIsqMntroFTGISP9NIcQri
-ayoeMvBLHtheKhQfYWNG
-=TIj+
+iQIcBAEBCAAGBQJQIQZ5AAoJEHfx8XVYajsfZCoP/A8l6Fr5KOVTN3+n8d4Trh5T
+RqZ6D5H58faFVz0BsCf3SXZStIKXatPQ1P1dpJ9Y1M6pcOm7ZeLJjCx6JMwNd8Ad
+89VFJsCV9QqWIrr0YiGaDSgrDMmCnzd+ODR4hmGinfD6+/szmxyaR95xNVSH04po
+8LX5hYv1Flmq+t0P0QuV8Ih3+9p/RcjqNt8DMbApxhFFtApMHWVtDkc75ouXxNPr
+5WUPDp7tiyUk3Hkm+DsjMRm4E1IHg1OjWkD1dhdneFzAY3ydaE61SUhj+0NdUwYJ
+rdIpjYz8fEExceTFvEIZ14CBPRlTdXhb0s/FKNTL22M/xOfKCWegGY/ELkWn4171
+Jvntveq/rMYEoCBw/bb1mL4EG7+SxXZvRN+WPFJZN3yn+TGB564LRu9Ezpb6mzRo
+Y9gsGuTBkc5biNUVfoLVsCovKza6lAhBiglUL1bdgFDlhUkWm0EzDAWLOEq6uoTt
+F5/wRTXG0qxRilhfxgETz0knGTwihO3RlWpR4VNaaZi0jd0X33Nz5Bu4zMeKCmtp
+DImnk6FoNjQMxoGrh9nD/aQr5aTBjDZ/uer5exOsT+zdBxfgtXkgt6U4NzK3HjOk
+mjkZc9pjWVe/ulvXn2nWIjHgbTkg1f7du5DleSGfTXxgxoI/A9YlkPyXbMNMRUZI
+Bt/ZUxYUvClfLt+ehswr
+=MF1Q
 -----END PGP SIGNATURE-----
diff --git a/net-mail/metamail/metamail-2.7.53.3-r1.ebuild b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
new file mode 100644
index 000000000000..a510815fd256
--- /dev/null
+++ b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/metamail/metamail-2.7.53.3-r1.ebuild,v 1.1 2012/08/07 12:13:30 eras Exp $
+
+EAPI=4
+
+WANT_AUTOCONF="2.5"
+
+inherit eutils versionator autotools
+
+MY_PV=$(get_version_component_range 1-2)
+DEB_PV=${MY_PV}-$(get_version_component_range 3)
+
+DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
+HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
+SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
+	mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-libs/ncurses
+	app-arch/sharutils
+	net-mail/mailbase"
+RDEPEND="app-misc/mime-types
+	sys-apps/debianutils
+	!app-misc/run-mailcap"
+
+S=${WORKDIR}/mm${MY_PV}/src
+
+src_prepare() {
+	epatch "${WORKDIR}"/metamail_${DEB_PV}.diff
+	epatch "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+
+	# respect CFLAGS
+	sed -i -e 's/CFLAGS/LIBS/' \
+		"${S}"/src/{metamail,richmail}/Makefile.am || die
+
+	# add missing include - QA
+	sed -i -e '/config.h/a #include <string.h>' \
+		"${S}"/src/metamail/shared.c || die
+
+	eautoreconf
+	chmod +x "${S}"/configure
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc CREDITS README
+	rm man/mmencode.1
+	doman man/* debian/mimencode.1 debian/mimeit.1
+
+	use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
+}