From d6c8355da9c9c15e3268267720e7f9c82d71e281 Mon Sep 17 00:00:00 2001 From: "John N. Laliberte" Date: Wed, 15 Mar 2006 00:43:31 +0000 Subject: [PATCH] fix for new gnome2.eclass. remove ${D}, add gnome2_omf_fix. misc: move G2CONF into pkg_setup. Package-Manager: portage-2.1_pre6 --- mail-client/mail-notification/ChangeLog | 7 ++++- mail-client/mail-notification/Manifest | 18 ++++++------ .../files/digest-mail-notification-2.0 | 2 ++ .../mail-notification-2.0.ebuild | 28 +++++++++++-------- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog index 3c2f5733298c..9a9cf06108d7 100644 --- a/mail-client/mail-notification/ChangeLog +++ b/mail-client/mail-notification/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-client/mail-notification # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.26 2006/02/19 21:59:18 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.27 2006/03/15 00:43:31 allanonjl Exp $ + + 14 Mar 2006; John N. Laliberte + mail-notification-2.0.ebuild: + fix for new gnome2.eclass. remove ${D}, add gnome2_omf_fix. misc: move + G2CONF into pkg_setup. 19 Feb 2006; Michael Hanselmann mail-notification-2.0.ebuild: diff --git a/mail-client/mail-notification/Manifest b/mail-client/mail-notification/Manifest index c2867a924f33..3ccff78cc9ee 100644 --- a/mail-client/mail-notification/Manifest +++ b/mail-client/mail-notification/Manifest @@ -1,6 +1,6 @@ -MD5 9414d5d2f1bff08ddc3bf598683f2324 ChangeLog 5067 -RMD160 541139c24b9fd188e921c2e35f50f40cfbcc8b13 ChangeLog 5067 -SHA256 3268d07ef99414fb8b6b52a54f132c5eb42fcd74d1d71d11f634ee83de0d54fd ChangeLog 5067 +MD5 11b1a3f05201099dd3335959faa09f1f ChangeLog 5257 +RMD160 ec43bbe2cf7e93bb22bd171a0bf6db1797697e18 ChangeLog 5257 +SHA256 6317a38c23be10c160a57d082670f4c5c566412d17bf5f399ddd7abdf0406c46 ChangeLog 5257 MD5 4f3f62c7c6d7b58791bba1c52b9dcc52 files/digest-mail-notification-0.8.1 75 RMD160 8b78eab849b15135c34ced1d79db5ed62879acfc files/digest-mail-notification-0.8.1 75 SHA256 dfa76ffa3b4f494e8269af1d99ba4623d711b701002c27b97654ecfed53f7d22 files/digest-mail-notification-0.8.1 75 @@ -10,9 +10,9 @@ SHA256 9d361de5a5f4f1d2f4516a6f0ed08f0264ad4b4f99e2e4b47a076971394643aa files/di MD5 a5717a3f9a4857a66a2884232fd6f42c files/digest-mail-notification-1.1 73 RMD160 0737eb023e9910c9abddd991d8b629729fbb4134 files/digest-mail-notification-1.1 73 SHA256 d3dbfab3df45f97a47a46f5c15b3a397ff2d2925cf2387c81e733a040631dfdf files/digest-mail-notification-1.1 73 -MD5 08760188e6900a0b64683d8f277f53eb files/digest-mail-notification-2.0 73 -RMD160 c0b10cabc47c8b41b0d96deefa94af9a63a6819d files/digest-mail-notification-2.0 73 -SHA256 89e52caf8121a999b33d784cd6fb727b65c9b650e166770ecf4ba391bbfbae7a files/digest-mail-notification-2.0 73 +MD5 64a2395b0758024bebcbb2470a7bc400 files/digest-mail-notification-2.0 265 +RMD160 693730ae88ded72897c887d9e30baf6fa6f14583 files/digest-mail-notification-2.0 265 +SHA256 2e96b899d2160281c03d1153727686fe6ba2e432fb05be2514ae51a3d5b597b3 files/digest-mail-notification-2.0 265 MD5 9b632ffa3d886c3829752ea656adf8f1 files/mail-notification-2.0-buildfix.diff 281 RMD160 49db75ab313415284ad4658c7b34cc42eb63deaf files/mail-notification-2.0-buildfix.diff 281 SHA256 e48536498bdb7daf1e375de2bab7675941ff7cd044868d7e561f5b4f5c4810ca files/mail-notification-2.0-buildfix.diff 281 @@ -31,9 +31,9 @@ SHA256 abc2ab321f9c4837865832fa15b68f0715f22b27129dcb5caf5678c01f28e45b mail-not MD5 4ec34f3718248e51520bb199155a10aa mail-notification-1.1.ebuild 1814 RMD160 f624800bafed0197af056f47bed8486c14e6df24 mail-notification-1.1.ebuild 1814 SHA256 fed80ef505695252856a8c64d44e79799ca7b3fa714d4c08fd52fc84b90cd072 mail-notification-1.1.ebuild 1814 -MD5 b2bd44399387cb52d84077c21387a52b mail-notification-2.0.ebuild 2324 -RMD160 47d73ce82c86495dea7593f6968f08a964dcd44e mail-notification-2.0.ebuild 2324 -SHA256 d8600dd01207500b1d1348ad865a6a5cd2f35a1f5df243ca9cfcdd303fdcea8a mail-notification-2.0.ebuild 2324 +MD5 0ed614c88b6d5dfcdda4498f6c067c81 mail-notification-2.0.ebuild 2366 +RMD160 125abf775414bb0a39b70e7bce6be79fab442f0a mail-notification-2.0.ebuild 2366 +SHA256 c0a214d26442532fcf6d684d0692e524cd52f3f8744050b79931c60c94139927 mail-notification-2.0.ebuild 2366 MD5 5d240c2111a6535d744ec8bbc7cc692c metadata.xml 249 RMD160 dce0c80c556a885e8059693e236acc50c67e7163 metadata.xml 249 SHA256 e7a2ee2e040e05b0780ea52daab475449bd2e93e9aaef741b65a7eb9cf33b4c5 metadata.xml 249 diff --git a/mail-client/mail-notification/files/digest-mail-notification-2.0 b/mail-client/mail-notification/files/digest-mail-notification-2.0 index 60ec71f64aec..ec8e9131383e 100644 --- a/mail-client/mail-notification/files/digest-mail-notification-2.0 +++ b/mail-client/mail-notification/files/digest-mail-notification-2.0 @@ -1 +1,3 @@ MD5 56ef7401aba1cb27d881fb0f33a3248d mail-notification-2.0.tar.gz 869151 +RMD160 0fb3adc3331f0699ca6fb01f3c63f360aa79a7fb mail-notification-2.0.tar.gz 869151 +SHA256 e4ec2fe27b3d399a6289857ef5a33e564bfe641a829f597e9dac753ae643339b mail-notification-2.0.tar.gz 869151 diff --git a/mail-client/mail-notification/mail-notification-2.0.ebuild b/mail-client/mail-notification/mail-notification-2.0.ebuild index dd15965ea9b1..86251795d43b 100644 --- a/mail-client/mail-notification/mail-notification-2.0.ebuild +++ b/mail-client/mail-notification/mail-notification-2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-2.0.ebuild,v 1.4 2006/02/19 21:59:18 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-2.0.ebuild,v 1.5 2006/03/15 00:43:31 allanonjl Exp $ inherit eutils gnome2 multilib flag-o-matic @@ -33,16 +33,18 @@ DEPEND=">=x11-libs/gtk+-2.6 evolution? ( >=mail-client/evolution-2.4 ) sylpheed? ( virtual/sylpheed )" -G2CONF="${G2CONF} $(use_enable ssl)" -G2CONF="${G2CONF} $(use_enable sasl)" -G2CONF="${G2CONF} $(use_enable ipv6)" -# ssl, sasl and ipv6 requires either pop3 or imap, else they will be disabled -G2CONF="${G2CONF} $(use_enable imap)" -G2CONF="${G2CONF} $(use_enable pop pop3)" -G2CONF="${G2CONF} $(use_enable gmail)" -G2CONF="${G2CONF} $(use_enable evolution)" -G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-2.4/" -G2CONF="${G2CONF} $(use_enable sylpheed)" +pkg_setup() { + G2CONF="${G2CONF} $(use_enable ssl)" + G2CONF="${G2CONF} $(use_enable sasl)" + G2CONF="${G2CONF} $(use_enable ipv6)" + # ssl, sasl and ipv6 requires either pop3 or imap, else they will be disabled + G2CONF="${G2CONF} $(use_enable imap)" + G2CONF="${G2CONF} $(use_enable pop pop3)" + G2CONF="${G2CONF} $(use_enable gmail)" + G2CONF="${G2CONF} $(use_enable evolution)" + G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-2.4/" + G2CONF="${G2CONF} $(use_enable sylpheed)" +} src_unpack() { unpack ${A} @@ -51,6 +53,8 @@ src_unpack() { epatch ${FILESDIR}/${P}-evolution-2.4.diff epatch ${FILESDIR}/${P}-buildfix.diff epatch ${FILESDIR}/${P}-gmail-properties-fix.diff + + gnome2_omf_fix } src_compile() { @@ -59,7 +63,7 @@ src_compile() { } src_install() { - gnome2_src_install evolution_plugindir="${D}/usr/$(get_libdir)/evolution/2.4/plugins" + gnome2_src_install evolution_plugindir="/usr/$(get_libdir)/evolution/2.4/plugins" } pkg_postinst() { -- 2.26.2