summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-08-19 14:20:00 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-08-19 14:20:00 +0000
commit18b818da596595acd2d14e5cc1ffb292f9090f3f (patch)
tree6e247e787d784db899c51231620501a0182b7e91 /app-dicts
parentVersion bump, new features: http://releases.xfce.org/feeds/project/xfce4-dev-... (diff)
downloadgentoo-2-18b818da596595acd2d14e5cc1ffb292f9090f3f.tar.gz
gentoo-2-18b818da596595acd2d14e5cc1ffb292f9090f3f.tar.bz2
gentoo-2-18b818da596595acd2d14e5cc1ffb292f9090f3f.zip
Migrate to EAPI 2 in order to get rid of built_with_use.
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'app-dicts')
-rw-r--r--app-dicts/stardict/ChangeLog6
-rw-r--r--app-dicts/stardict/stardict-3.0.1-r2.ebuild22
2 files changed, 12 insertions, 16 deletions
diff --git a/app-dicts/stardict/ChangeLog b/app-dicts/stardict/ChangeLog
index efab4d5b964f..b76b65bd7d52 100644
--- a/app-dicts/stardict/ChangeLog
+++ b/app-dicts/stardict/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-dicts/stardict
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.53 2009/07/24 17:28:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/ChangeLog,v 1.54 2009/08/19 14:20:00 betelgeuse Exp $
+
+ 19 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+ stardict-3.0.1-r2.ebuild:
+ Migrate to EAPI 2 in order to get rid of built_with_use.
24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
stardict-3.0.1-r2.ebuild, +files/stardict-3.0.1-gcc44.patch:
diff --git a/app-dicts/stardict/stardict-3.0.1-r2.ebuild b/app-dicts/stardict/stardict-3.0.1-r2.ebuild
index 6ef9d3f4931a..d73fe709be02 100644
--- a/app-dicts/stardict/stardict-3.0.1-r2.ebuild
+++ b/app-dicts/stardict/stardict-3.0.1-r2.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1-r2.ebuild,v 1.3 2009/07/24 17:28:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/stardict/stardict-3.0.1-r2.ebuild,v 1.4 2009/08/19 14:20:00 betelgeuse Exp $
+
+EAPI="2"
inherit gnome2 eutils autotools
@@ -22,6 +24,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
DEP="gnome? ( >=gnome-base/libbonobo-2.2.0
>=gnome-base/libgnome-2.2.0
+ pronounce? ( >=gnome-base/libgnome-2.2.0[esd] )
>=gnome-base/libgnomeui-2.2.0
>=gnome-base/gconf-2
>=gnome-base/orbit-2.6
@@ -39,18 +42,7 @@ DEPEND="${DEP}
>=dev-util/intltool-0.22
dev-util/pkgconfig"
-pkg_setup() {
- if (use gnome && use pronounce && ! built_with_use gnome-base/libgnome esd); then
- ewarn 'Note, being built with USE="gnome" stardict uses gnome_sound_play()'
- ewarn 'to play RealPeopleTTS sounds, which plays sounds only in case'
- ewarn 'gnome-base/libgnome was built with USE="esd".'
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
epatch "${FILESDIR}"/${P}-configure.in-EST.diff
epatch "${FILESDIR}"/${P}-gconf-m4.diff
epatch "${FILESDIR}"/${P}-gcc43.patch
@@ -65,7 +57,7 @@ src_unpack() {
gnome2_omf_fix
}
-src_compile() {
+src_configure() {
export PKG_CONFIG=$(type -P pkg-config)
# Festival plugin crashes, bug 188684. Disable for now.
G2CONF="$(use_enable gnome gnome-support)
@@ -76,7 +68,7 @@ src_compile() {
--disable-festival
--disable-advertisement
--disable-updateinfo"
- gnome2_src_compile
+ gnome2_src_configure
}
src_install() {