From 041bfa1443c7699b59ab528be0f0978bd474f13d Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 21 Feb 2011 17:52:35 +0000 Subject: configure enabled HAL support if --enable-usb --enable-network OR --enable-pilotlinktest are forced, dropping them as it will result in them being enabled (as wanted) without breaking HAL support configure handling (bug #355859 by Markos Chandras). Package-Manager: portage-2.1.9.40/cvs/Linux x86_64 --- app-pda/gnome-pilot/ChangeLog | 10 ++++++++-- app-pda/gnome-pilot/Manifest | 10 +++++----- app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild | 7 ++----- 3 files changed, 15 insertions(+), 12 deletions(-) (limited to 'app-pda') diff --git a/app-pda/gnome-pilot/ChangeLog b/app-pda/gnome-pilot/ChangeLog index 54be796e3dec..9508bf0673d6 100644 --- a/app-pda/gnome-pilot/ChangeLog +++ b/app-pda/gnome-pilot/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-pda/gnome-pilot -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.64 2010/12/08 16:38:33 pacho Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/ChangeLog,v 1.65 2011/02/21 17:52:35 pacho Exp $ + + 21 Feb 2011; Pacho Ramos gnome-pilot-2.32.0.ebuild: + configure enabled HAL support if --enable-usb --enable-network OR + --enable-pilotlinktest are forced, dropping them as it will result in them + being enabled (as wanted) without breaking HAL support configure handling + (bug #355859 by Markos Chandras). 08 Dec 2010; Pacho Ramos gnome-pilot-2.32.0.ebuild: Needs gnome-panel with bonobo support. diff --git a/app-pda/gnome-pilot/Manifest b/app-pda/gnome-pilot/Manifest index e496f013e235..d962229b4758 100644 --- a/app-pda/gnome-pilot/Manifest +++ b/app-pda/gnome-pilot/Manifest @@ -6,13 +6,13 @@ AUX gnome-pilot-2.0.17-invisible-applet.patch 3837 RMD160 bd7197d499c9d6159aedb9 DIST gnome-pilot-2.0.17.tar.bz2 837105 RMD160 bbd3f94a1e9edb99a10d698272ae0c7bb48dd643 SHA1 2d56b0b642293967de3ee6a93d2ae67c2562e367 SHA256 ef157162c6963289855493d07de4956b43753909082299bb59791c8a8436211a DIST gnome-pilot-2.32.0.tar.bz2 989505 RMD160 14b0243daaea647edd824ded57524c8c09dc6bb6 SHA1 3599c5ec8e7f187392739cf337de055272bb8e6f SHA256 2b62b1c3578f51c9eceaed4cb49c841ae700a172787a8bcdc04768c59cb26bbf EBUILD gnome-pilot-2.0.17-r1.ebuild 1778 RMD160 990ce865814d46defb037e59b3ee4fc835c2f236 SHA1 e674f0b139daf23e88478eb96e9452d38777529c SHA256 96c44bc7598f7725d06869ee1e49caa80ed9d2e7c9be2b1741ffa57ce72c0a5f -EBUILD gnome-pilot-2.32.0.ebuild 1452 RMD160 cdd05309922c5d9ab28c14ea4147a1dd84785543 SHA1 a55edf1c8c861a1323fd9d2f850927148949e160 SHA256 06f30375637c63e20685c5e0be78dda700f60f4a2220c75d8fd1a367d5af23c9 -MISC ChangeLog 14527 RMD160 69ca06ae2c30e3226e2f6c947b6f4faccc21170a SHA1 91da2d488b958744b8b53235e78e5971d85d994f SHA256 8d39ac2037a42c6342a836c9d790524fca399c011d9b6bd648e7ec1cde4cf2a1 +EBUILD gnome-pilot-2.32.0.ebuild 1393 RMD160 88e9458457a0055bd25fb2a33f61167971090fbe SHA1 ca17e5754a0cf0a2154e5ed37bbbed6d8ac80483 SHA256 7daf954b8625eb6dfed55704d07e638a547f6c125febfe6c2216595a973f8296 +MISC ChangeLog 14858 RMD160 aaa7fd544dad125fbdc6c4c575861ef108c4075f SHA1 63b859103aea1a9838a3a8449e0e3500c07f1383 SHA256 7293397b2d89af79c118ae3f524880048b6c381874257d10230aeeaf346a4278 MISC metadata.xml 175 RMD160 5a758a9c6be5886bcabe17412a27ddb9c4c1a091 SHA1 5f39f2aee5dc458e1f1184425ff00a600cfbeb93 SHA256 ad69c13297c0e440519a25f99fdcefd579e75f58d652bb174055ae0c827b8543 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkz/tI4ACgkQCaWpQKGI+9SQ5gCfZNVi/jQvJPzRAJtQ7V6KWTxX -8a0AoIgHfSnYWtiAmcMTbQuTyDUU3o36 -=0q2P +iEYEARECAAYFAk1ipmkACgkQCaWpQKGI+9TnmwCaAl8lgRaA2FH0l5PEuWi2GIwB +df0An3cytZaiFCDd4kPXeIHSZbHiOKYx +=9mZz -----END PGP SIGNATURE----- diff --git a/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild b/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild index ad051420ef80..63e44fe3212b 100644 --- a/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild +++ b/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild,v 1.2 2010/12/08 16:38:33 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-pda/gnome-pilot/gnome-pilot-2.32.0.ebuild,v 1.3 2011/02/21 17:52:35 pacho Exp $ EAPI="3" G2CONF_DEBUG="no" @@ -36,9 +36,6 @@ DEPEND="${RDEPEND} pkg_setup() { DOCS="AUTHORS COPYING* ChangeLog README NEWS" G2CONF="${G2CONF} - --enable-usb - --enable-network - --enable-pilotlinktest --disable-static $(use_enable eds eds-conduits) $(use_with hal)" -- cgit v1.2.3-65-gdbad