From 61778984b855a39e4ae79536278e69874b2bb1d1 Mon Sep 17 00:00:00 2001 From: John Mylchreest Date: Thu, 13 Oct 2005 13:50:06 +0000 Subject: [PATCH] Fixing bug #99199 Package-Manager: portage-2.0.53_rc5 --- app-pda/multisync/Manifest | 14 ++++++++++++-- .../multisync/multisync-0.83_pre20050414-r2.ebuild | 13 +++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app-pda/multisync/Manifest b/app-pda/multisync/Manifest index 0e85c724e76e..0f9a499ed3f6 100644 --- a/app-pda/multisync/Manifest +++ b/app-pda/multisync/Manifest @@ -1,4 +1,14 @@ -MD5 4eb51641834063e986569d108f657719 metadata.xml 450 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 4dec3b6bdb75511c5e40faf947e34c64 ChangeLog 4496 -MD5 3d03d24959fcf3935815734eb25a4d5a multisync-0.83_pre20050414-r2.ebuild 3159 MD5 c668aca6eec704faa03632e0588bbe3e files/digest-multisync-0.83_pre20050414-r2 71 +MD5 4eb51641834063e986569d108f657719 metadata.xml 450 +MD5 5c17651a20b5d5bc8dfe7aeb641ec1f2 multisync-0.83_pre20050414-r2.ebuild 3329 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDTmTbz7mlh8wQzGMRAk8aAJ0WF5eukOtYLkId05QFYtXLRJ327QCeIttZ +j41EOFEp2GP6zHZhbWn5tg4= +=i8x6 +-----END PGP SIGNATURE----- diff --git a/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild b/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild index 3f507079b815..4c7b2df775c9 100644 --- a/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild +++ b/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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-r2.ebuild,v 1.5 2005/09/28 13:05:58 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/multisync/multisync-0.83_pre20050414-r2.ebuild,v 1.6 2005/10/13 13:50:06 johnm Exp $ inherit versionator kde-functions @@ -14,12 +14,13 @@ SRC_URI="mirror://gentoo/${PN}-${CVS_VERSION}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 amd64 ppc" -IUSE="evo irmc ldap bluetooth pda kdepim" +IUSE="evo irmc ldap bluetooth pda kdepim arts kdeenablefinal" # evo - evolution plugin # irmc - bluetooth/irmc/irda plugin ( local ) # pda - opie plugin ( local ) # ldap - ldap plugin - experimental # kdepim - sync with the kdepim app +# arts - potentially required for kdepim. DEPEND=">=gnome-base/libbonobo-2.2 >=gnome-base/libgnomeui-2.2 @@ -36,7 +37,8 @@ DEPEND=">=gnome-base/libbonobo-2.2 >=net-wireless/bluez-utils-2.7 ) ) pda? ( >=net-misc/curl-7.10.5 app-pda/pilot-link ) - kdepim? ( || ( kde-base/kdepim-meta kde-base/kdepim ) ) + kdepim? ( || ( kde-base/kdepim-meta kde-base/kdepim ) + arts? ( kde-base/arts ) ) ldap? ( >=net-nds/openldap-2.0.27 >=dev-libs/cyrus-sasl-2.1.4 )" @@ -69,7 +71,7 @@ run_compile() { autoheader || die "Failed during autoheader!" automake --add-missing --gnu || die "Failed during automake!" autoconf || die "Failed during autoconf!" - econf CPPFLAGS="${myInc} ${CPPFLAGS}" || die "Failed during econf!" + econf CPPFLAGS="${myInc} ${CPPFLAGS}" ${myConf} || die "Failed during econf!" make || die "Failed during make!" } @@ -86,7 +88,10 @@ src_compile() { set-qtdir 3 set-kdedir 3 myInc="-I${KDEDIR}/include ${myInc}" + myConf="$(use_with arts) + $(use_enable kdeenablefinal final)" fi + use pda && myInc="-I/usr/include/libpisock ${myInc}" run_compile; for plugin_dir in ${PLUGINS}; do -- 2.26.2