From: Diego Elio Pettenò Date: Thu, 4 Jan 2007 14:18:40 +0000 (+0000) Subject: Fix broken autotools handling. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c4c4b6bf33be053683498d2b7b0d0b3a9378ff0a;p=gentoo.git Fix broken autotools handling. Package-Manager: portage-2.1.2_rc4-r5 --- diff --git a/app-pda/multisync/ChangeLog b/app-pda/multisync/ChangeLog index 7d7ddf580ec7..33d6c1e43b1f 100644 --- a/app-pda/multisync/ChangeLog +++ b/app-pda/multisync/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-pda/multisync -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.37 2006/12/02 17:54:02 peper Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/ChangeLog,v 1.38 2007/01/04 14:18:40 flameeyes Exp $ + + 04 Jan 2007; Diego Pettenò + multisync-0.83_pre20050414-r4.ebuild: + Fix broken autotools handling. 02 Dec 2006; Piotr Jaroszyński multisync-0.83_pre20050414-r4.ebuild: diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest index 72b93e0903dc..1d880d6594ca 100644 --- a/app-pda/multisync/Manifest +++ b/app-pda/multisync/Manifest @@ -10,14 +10,14 @@ MD5 e1a658a1c5b7926e4f64119c14b71024 files/multisync-gcc4.patch 4578 RMD160 071dfdcb731f81ebf64b6589392f5fa4dea944d3 files/multisync-gcc4.patch 4578 SHA256 6e5e34e14709276b72f4efff6ec8aa622d5d5727fc0010673ab24a9b65ce0922 files/multisync-gcc4.patch 4578 DIST multisync-20050414.tar.gz 3505577 RMD160 51f19f41ebc67483020006639bb5ad1041988f0b SHA1 e3828836fb860e8838692811b1dd1348645fe7b3 SHA256 ae42b89b813ce6536eafd5a8249d43c8e47ace0bf44a9077d937d8d1afaeb49c -EBUILD multisync-0.83_pre20050414-r4.ebuild 3780 RMD160 17fbe04eca9b08518e70568679aa3f59caf0d39c SHA1 73b9d2b0f16cef049ceede14cce19c58f266c78f SHA256 1c4bfa105ae1d62043bc91a6fee84d6aaf001d9cdc7b0213364be53ecf739c86 -MD5 351638a7c6a6ffd01c74d48037243de8 multisync-0.83_pre20050414-r4.ebuild 3780 -RMD160 17fbe04eca9b08518e70568679aa3f59caf0d39c multisync-0.83_pre20050414-r4.ebuild 3780 -SHA256 1c4bfa105ae1d62043bc91a6fee84d6aaf001d9cdc7b0213364be53ecf739c86 multisync-0.83_pre20050414-r4.ebuild 3780 -MISC ChangeLog 6387 RMD160 710f96cde822fd62c50aa070528ad4a86d8d057f SHA1 167eb62275d4bc89d6d4a6791560942eea6a72bb SHA256 72f6ddfaac34421ed1e5751fc1ec06f5eccf6120be0009ffed4e5963dfce292e -MD5 636765bcf1302dc3eb981d120a6152c8 ChangeLog 6387 -RMD160 710f96cde822fd62c50aa070528ad4a86d8d057f ChangeLog 6387 -SHA256 72f6ddfaac34421ed1e5751fc1ec06f5eccf6120be0009ffed4e5963dfce292e ChangeLog 6387 +EBUILD multisync-0.83_pre20050414-r4.ebuild 3657 RMD160 a4db728eec34b4e24af099714d05518ba01d63e6 SHA1 b316c9f55dd9ead681af37cc2cf6e9b778ef3338 SHA256 24f826cf7cdfa22565c7c7843be4a927900e90a3d0b1f1976d86023a6a375642 +MD5 e72d0526f74d48670446a7c296177cc8 multisync-0.83_pre20050414-r4.ebuild 3657 +RMD160 a4db728eec34b4e24af099714d05518ba01d63e6 multisync-0.83_pre20050414-r4.ebuild 3657 +SHA256 24f826cf7cdfa22565c7c7843be4a927900e90a3d0b1f1976d86023a6a375642 multisync-0.83_pre20050414-r4.ebuild 3657 +MISC ChangeLog 6518 RMD160 7e9d3de9435fb2fcc65ead55c6fad2a49e9ff336 SHA1 6da85a64f279ed8fe81c1f2eaa565d5c34cbe21a SHA256 94dcf029d74873cee04d0fe192366cccba1c9ef02046a6a46ae904e35a7560c5 +MD5 3c17d28976f3da967a636a317eb4ee7d ChangeLog 6518 +RMD160 7e9d3de9435fb2fcc65ead55c6fad2a49e9ff336 ChangeLog 6518 +SHA256 94dcf029d74873cee04d0fe192366cccba1c9ef02046a6a46ae904e35a7560c5 ChangeLog 6518 MISC metadata.xml 450 RMD160 cb27bb1e32585a1eea51391b3e46a4906535bdc7 SHA1 a1146f664689f77798110e735a651ce105c5c65e SHA256 7bd44367e407f89392bf88f1e9de93e92b1eeeff4dc82e1901437ec1daa06ad0 MD5 4eb51641834063e986569d108f657719 metadata.xml 450 RMD160 cb27bb1e32585a1eea51391b3e46a4906535bdc7 metadata.xml 450 @@ -26,9 +26,9 @@ MD5 73b0a5be9a9c16a57f1740dd79c86dc6 files/digest-multisync-0.83_pre20050414-r4 RMD160 da4a2fef9908409be374351421ec0ee6c7785b92 files/digest-multisync-0.83_pre20050414-r4 259 SHA256 bd2225040ecaa5307a5a1164716bd0c96c2d5019f957decfd83bed108d9952e5 files/digest-multisync-0.83_pre20050414-r4 259 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFcb3HppoStNGKGywRAuRiAJ9LK07rCrOIuJds9MMPYqcNFzYQnwCdEEyT -CXUTpcnwBtnwhedv+E70Jc4= -=IxJ+ +iD8DBQFFnQzHAiZjviIA2XgRAv/GAKDERerYa3FMjpEjVPWfUyOsOoq1KgCeOS8k +DDBORh+/SE6QUKWyCIP1/tE= +=E95Y -----END PGP SIGNATURE----- diff --git a/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild b/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild index 3369cc781107..22ab6be1cb1c 100644 --- a/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild +++ b/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild,v 1.7 2006/12/02 17:54:02 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r4.ebuild,v 1.8 2007/01/04 14:18:40 flameeyes Exp $ -WANT_AUTOMAKE="1.7" +WANT_AUTOCONF="latest" +WANT_AUTOMAKE="latest" inherit versionator kde-functions eutils multilib autotools @@ -16,16 +17,16 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" IUSE="evo irmc nokia6600 ldap bluetooth pda kdepim arts kdeenablefinal gnokii" -# evo - evolution plugin -# irmc - bluetooth/irmc/irda plugin ( local ) -# pda - opie plugin ( local ) -# nokia6600 - support for Nokia 6600 ( local ) -# ldap - ldap plugin - experimental -# kdepim - sync with the kdepim app -# arts - potentially required for kdepim. -# gnokii - gnokii plugin - -DEPEND=">=gnome-base/libbonobo-2.2 +# evo - evolution plugin +# irmc - bluetooth/irmc/irda plugin ( local ) +# pda - opie plugin ( local ) +# nokia6600 - support for Nokia 6600 ( local ) +# ldap - ldap plugin - experimental +# kdepim - sync with the kdepim app +# arts - potentially required for kdepim. +# gnokii - gnokii plugin + +RDEPEND=">=gnome-base/libbonobo-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libgnome-2.2 >=dev-libs/glib-2 @@ -36,8 +37,8 @@ DEPEND=">=gnome-base/libbonobo-2.2 evo? ( mail-client/evolution ) irmc? ( >=net-wireless/irda-utils-0.9.15 >=dev-libs/openobex-1 - bluetooth? ( >=net-wireless/bluez-libs-2.7 - >=net-wireless/bluez-utils-2.7 ) ) + bluetooth? ( >=net-wireless/bluez-libs-2.7 + >=net-wireless/bluez-utils-2.7 ) ) pda? ( >=net-misc/curl-7.10.5 app-pda/pilot-link ) kdepim? ( || ( kde-base/kaddressbook kde-base/kdepim ) @@ -47,6 +48,9 @@ DEPEND=">=gnome-base/libbonobo-2.2 gnokii? ( app-mobilephone/gnokii dev-libs/libvformat ) nokia6600? ( >=dev-libs/libwbxml-0.9.0 )" +DEPEND="${RDEPEND} + sys-devel/gettext" + S="${WORKDIR}/${PN}" make_plugin_list() { @@ -63,12 +67,12 @@ make_plugin_list() { # find major evoversion=$(get_major_version ${evoversion}) - [[ ${evoversion} -eq 2 ]] && PLUGINS="${PLUGINS} evolution2_sync" - [[ ${evoversion} -eq 1 ]] && PLUGINS="${PLUGINS} evolution_sync" + [[ ${evoversion} -eq 2 ]] && PLUGINS="${PLUGINS} evolution2_sync" + [[ ${evoversion} -eq 1 ]] && PLUGINS="${PLUGINS} evolution_sync" fi - use irmc && PLUGINS="${PLUGINS} irmc_sync" - use pda && PLUGINS="${PLUGINS} opie_sync palm_sync" - use ldap && PLUGINS="${PLUGINS} ldap_plugin" + use irmc && PLUGINS="${PLUGINS} irmc_sync" + use pda && PLUGINS="${PLUGINS} opie_sync palm_sync" + use ldap && PLUGINS="${PLUGINS} ldap_plugin" use kdepim && PLUGINS="${PLUGINS} kdepim_plugin" use gnokii && PLUGINS="${PLUGINS} gnokii_sync" } @@ -78,14 +82,13 @@ src_unpack() { epatch "${FILESDIR}/${PN}-gcc4.patch" epatch "${FILESDIR}/${P}-evo2.patch" + + cd "${S}" + cp /usr/share/gettext/config.rpath "${S}" + AT_M4DIR="plugins/opie_sync/macros" eautoreconf } run_compile() { - aclocal || die "failed aclocal" - libtoolize --copy --force || die "libtoolize failed!" - autoheader || die "Failed during autoheader!" - automake --add-missing --gnu || die "Failed during automake!" - autoconf || die "Failed during autoconf!" econf CPPFLAGS="${myInc} ${CPPFLAGS}" ${myConf} || die "Failed during econf!" make || die "Failed during make!" } @@ -95,7 +98,7 @@ src_compile() { einfo "Building Multisync with these plugins:" for plugin_dir in ${PLUGINS}; do - einfo " ${plugin_dir}" + einfo " ${plugin_dir}" done cd "${S}"