From 23f0fd3dc6e0989cffd82c50ee28411e46d289b4 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Sun, 14 Aug 2011 04:36:55 +0000 Subject: [PATCH] USE=static-libs support, bug 378769 Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64 --- dev-libs/gmime/ChangeLog | 5 ++++- dev-libs/gmime/Manifest | 20 +++++++++++++++----- dev-libs/gmime/gmime-2.4.25.ebuild | 22 ++++++++++++---------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dev-libs/gmime/ChangeLog b/dev-libs/gmime/ChangeLog index 8f0f55dba565..ab89160f0433 100644 --- a/dev-libs/gmime/ChangeLog +++ b/dev-libs/gmime/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/gmime # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.155 2011/08/13 16:46:58 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/ChangeLog,v 1.156 2011/08/14 04:36:55 nirbheek Exp $ + + 14 Aug 2011; Nirbheek Chauhan gmime-2.4.25.ebuild: + USE=static-libs support, bug 378769 13 Aug 2011; Raúl Porcel gmime-2.4.24.ebuild: alpha/ia64/sparc stable wrt #369909 diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest index eb84c5eb4420..63ebe56bace2 100644 --- a/dev-libs/gmime/Manifest +++ b/dev-libs/gmime/Manifest @@ -13,13 +13,23 @@ EBUILD gmime-2.2.26.ebuild 2231 RMD160 a25b8a9aaeb8ead4746a752dbd063a3bf279033d EBUILD gmime-2.2.27.ebuild 2219 RMD160 a988e83af5bdddd242e3a3cea05b1c2956d10890 SHA1 acacf7089231d98d749abaeb1fd7e1d947b42a54 SHA256 1362d2b979848b8b9eb4138406dcba1031978a28cccd37c6914e7ec0ace3aae5 EBUILD gmime-2.4.22.ebuild 2471 RMD160 b9818b25caf18fa637a9ed5306212954d93d5be1 SHA1 f75b5b7a9e104c910f57ce24bbd7657311354d85 SHA256 e5608f5093b3dd3c766f4a9fbea3876c393a91320a682822494d701052ebd65e EBUILD gmime-2.4.24.ebuild 2467 RMD160 90e612675eccd14b0eb67d3cf6783ab9a8d4f6c2 SHA1 fdace036599c5840014f4fe34d644a7a58b080c4 SHA256 a3ce37c359ddd5b901a62672f4b6f1effa05698eaacb7d7b42fbf0f98834a137 -EBUILD gmime-2.4.25.ebuild 2371 RMD160 dd56bfee0bda3be50f0039609c5fcaf3bc21181f SHA1 c99451818b584c346f69b46ab07651db6a1708dc SHA256 1876f9131a6ae0d16406ecea222c661b75ff54a7440cacf16695fb5c5afe392d -MISC ChangeLog 22396 RMD160 09c1e371f38847732a9ae6761061578a224603a6 SHA1 f7a6d05688e7bb4fa63b154aceb3dbd3de0524e1 SHA256 474325cd935ce514a5cd99c970deca751b877bf6559fbe22a3af827809ad5ca1 +EBUILD gmime-2.4.25.ebuild 2449 RMD160 0723398e91aca693005a4a084e586f61fab50b4d SHA1 1950b8ff45a5cb9bb2bc75b640e9d977681fb2fd SHA256 7bf9b290d552e721805255679f368ba487f24f0666829d013dc966e0831c5b8b +MISC ChangeLog 22511 RMD160 f241ba38e121adea6e48b63b615af0a791e79e36 SHA1 826a23045b388572dde6be687bf7889b4a72be4a SHA256 506f4347922329b70c575fdb382797dc7ddb7428acadb5e54c4434f5acc95bcb MISC metadata.xml 180 RMD160 2aa394e2e4d9898608b2c58ce6db543d7677d3ae SHA1 82aae8bdb49fa61e2fcbb48de7c1f8e1342e8ae0 SHA256 e5c6804ed9ff8173cc88618d3443a09c85599a23c1eca85c5c6609b6de351f21 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GqogACgkQuQc30/atMkA/BgCfZhi6VT8NiikLK/DJzfUsVG1V -ZckAoJ8TuJwzagILrIJs9Y+0tK5CH1Wy -=Y+16 +iQIcBAEBAgAGBQJOR1DsAAoJEO/kOhxWD91kvr4P/R6Sah5k529l7wdYvNP+RMzz +oHW6Nh/sEtsx4ECVUM57rGd+iN+ZE2A0dsTGS87KiOT2GTz1mY5wTteHeiUpSwmu +LB2gv7Evu0NCLt5eXKyrBp1cLjd2lBTe/+Tkr/oj/6QTq0JP9X6I2RqnQxEQpkoU +qmg7bCFS75XEsKpfIWdac5HBSIuQHe1YEQ0j/kS5Mo9FG79o98egOdDQJbI2S53x +wN+xVbUNyoXPjGge6iro7HXrN2cOWe750/CbaGZgPTUOV7zeAI5tQHBC2xC4K3hP +nsOe3Vke5eXNij0pxao4aq76U0EsgTPkEfSFBLyo+P27yWQEIErWi8hfjeFn0rVR +v3w2DZcGfRykk53zj1+kA5kc+MWE+nFBv/DVxMV7XD12xCpwe3G/ImfKQMAMxFTC +LMN35PsyV60NMDWlPFP7MfU0tOeqNvelEy2ICN373cEwDrdgeirOEfdbE1xabByH +56fhg46SEHc1XOl298gGuLNOKXh18IFkWNm03iiOjPEBekV7PzpLW1+IGrxJwJDG +YJLW3Dc55+daXmTDrKemijH59+kyfKxXzU4YC0DnqTcn4h9mTwPXvEqn7gCD/2z9 +c1zywv23L5gnciogI+k341LPvx8QVClER5UeJVhgxK3hjaEEv7UCy4UN6gAfUMAk +FsKqEKo2W2EjqnLHCexK +=xwjm -----END PGP SIGNATURE----- diff --git a/dev-libs/gmime/gmime-2.4.25.ebuild b/dev-libs/gmime/gmime-2.4.25.ebuild index 68843f77d969..d0c33a3add41 100644 --- a/dev-libs/gmime/gmime-2.4.25.ebuild +++ b/dev-libs/gmime/gmime-2.4.25.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.25.ebuild,v 1.1 2011/06/11 15:17:27 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/gmime/gmime-2.4.25.ebuild,v 1.2 2011/08/14 04:36:55 nirbheek Exp $ EAPI="4" GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" inherit gnome2 eutils mono libtool @@ -13,7 +14,7 @@ HOMEPAGE="http://spruce.sourceforge.net/gmime/" SLOT="2.4" LICENSE="LGPL-2.1" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="doc mono" +IUSE="doc mono static-libs" RDEPEND=">=dev-libs/glib-2.12:2 sys-libs/zlib @@ -29,7 +30,10 @@ DEPEND="${RDEPEND} pkg_setup() { DOCS="AUTHORS ChangeLog NEWS PORTING README TODO" - G2CONF="${G2CONF} $(use_enable mono) --enable-cryptography" + G2CONF="${G2CONF} + --enable-cryptography + $(use_enable mono) + $(use_enable static-libs static)" } src_prepare() { @@ -57,15 +61,15 @@ src_prepare() { } src_compile() { - MONO_PATH="${S}" emake + MONO_PATH="${S}" gnome2_src_compile if use doc; then emake -C docs/tutorial html fi } src_install() { - emake GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \ - DESTDIR="${D}" install + GACUTIL_FLAGS="/root '${ED}/usr/$(get_libdir)' /gacdir '${EPREFIX}/usr/$(get_libdir)' /package ${PN}" \ + gnome2_src_install if use doc ; then # we don't use docinto/dodoc, because we don't want html doc gzipped @@ -73,10 +77,8 @@ src_install() { doins docs/tutorial/html/* fi - dodoc $DOCS - # rename these two, so they don't conflict with app-arch/sharutils # (bug #70392) Ticho, 2004-11-10 - mv "${ED}/usr/bin/uuencode" "${ED}/usr/bin/gmime-uuencode-${SLOT}" - mv "${ED}/usr/bin/uudecode" "${ED}/usr/bin/gmime-uudecode-${SLOT}" + mv "${ED}/usr/bin/uuencode" "${ED}/usr/bin/gmime-uuencode-${SLOT}" || die + mv "${ED}/usr/bin/uudecode" "${ED}/usr/bin/gmime-uudecode-${SLOT}" || die } -- 2.26.2