diff options
| author |   Don Seiler <rizzo@gentoo.org> | 2004-04-01 03:59:20 +0000 |
|---|---|---|
| committer | Don Seiler <rizzo@gentoo.org> | 2004-04-01 03:59:20 +0000 |
| commit | be83b2c87b727680f2b89842a5feb3bae4e80a0d (patch) | |
| tree | 3275615086f7efdc0c4224f61eb00e10888615a4 | |
| parent | added amd64 to keywords (Manifest recommit) (diff) | |
| download | gentoo-2-be83b2c87b727680f2b89842a5feb3bae4e80a0d.tar.gz gentoo-2-be83b2c87b727680f2b89842a5feb3bae4e80a0d.tar.bz2 gentoo-2-be83b2c87b727680f2b89842a5feb3bae4e80a0d.zip | |
Conditionally applying branding patch
| -rw-r--r-- | net-im/gaim/ChangeLog | 5 | ||||
| -rw-r--r-- | net-im/gaim/gaim-0.75-r11.ebuild | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index a7cdedb4cac5..cbf83c0fdd76 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for net-im/gaim # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.151 2004/04/01 02:42:19 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.152 2004/04/01 03:59:20 rizzo Exp $ 31 Mar 2004; Travis Tilley <lv@gentoo.org> gaim-0.75-r11.ebuild: nls disabled on amd64 since the version of gettext that works is masked -amd64 - see bug #46253 for more information + 31 Mar 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r11.ebuild: + Conditionally applying branding patch depending on gettext version + *gaim-0.75-r11 (24 Mar 2004) 24 Mar 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.75-r11.ebuild, diff --git a/net-im/gaim/gaim-0.75-r11.ebuild b/net-im/gaim/gaim-0.75-r11.ebuild index d7fb1b0957b9..baafa7e8272c 100644 --- a/net-im/gaim/gaim-0.75-r11.ebuild +++ b/net-im/gaim/gaim-0.75-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r11.ebuild,v 1.3 2004/04/01 02:42:19 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r11.ebuild,v 1.4 2004/04/01 03:59:20 rizzo Exp $ inherit flag-o-matic eutils gcc use debug && inherit debug @@ -55,11 +55,13 @@ src_unpack() { epatch ${FILESDIR}/gaim-0.75-yahoo-security.diff epatch ${FILESDIR}/gaim-0.76cvs-yahoo-misc-fixes-1.diff - # put in gentoo branding - sed "s/GAIM_VERSION/${PV}/; s/GENTOO_EBUILD_VERSION/${PV}-gentoo-${PR%r0}/" \ - ${FILESDIR}/gaim-gentoo-branding.patch \ - > ${WORKDIR}/gaim-gentoo-branding.patch - epatch ${WORKDIR}/gaim-gentoo-branding.patch + has_version '>=sys-devel/gettext-0.12.1' && { + # put in gentoo branding + sed "s/GAIM_VERSION/${PV}/; s/GENTOO_EBUILD_VERSION/${PV}-gentoo-${PR%r0}/" \ + ${FILESDIR}/gaim-gentoo-branding.patch \ + > ${WORKDIR}/gaim-gentoo-branding.patch + epatch ${WORKDIR}/gaim-gentoo-branding.patch + } use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch use gnome && epatch ${FILESDIR}/gaim-0.74-gnome-url-handler.patch @@ -102,7 +104,7 @@ src_compile() { econf ${myconf} || die "Configuration failed" emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed" - sed -i -e 's:mkinstalldirs =.*:mkinstalldirs = \$\(MKINSTALLDIRS\):' po/Makefile + has_version '>=sys-devel/gettext-0.12.1' && sed -i -e 's:mkinstalldirs =.*:mkinstalldirs = \$\(MKINSTALLDIRS\):' po/Makefile } src_install() { |