add configure switch for hal/dbus. submitted patch upstream, #318722 (gnome)

(Portage version: 2.0.51.22-r3)

5 files changed, 135 insertions, 20 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index ccbd4fa34aa5..9df4162694c1 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.136 2005/10/11 15:20:25 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.137 2005/10/12 23:58:36 allanonjl Exp $
+
+*gnome-applets-2.12.1-r1 (12 Oct 2005)
+
+  12 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gnome-applets-2.12.1-hal-switch.patch,
+  +gnome-applets-2.12.1-r1.ebuild:
+  add configure switch for hal/dbus.  submitted patch upstream, #318722 (gnome)
 
   11 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnome-applets-2.12.1.ebuild:
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 880492730126..faf64f7527b1 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 07b667c293f3469c7bc2028175decd73 ChangeLog 18407
-MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
-MD5 90c7825724b0c78966d8bbf5f401e9b8 files/digest-gnome-applets-2.10.0 74
-MD5 fa49e6f2df38c7035ec9671ffbc030de files/digest-gnome-applets-2.10.1 74
-MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1 74
-MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73
-MD5 ebcb8c6d8a9406b441de3e591d350960 files/gnome-applets-2.10.1-fbsd.patch 1494
 MD5 859be0a7d42bbee51904ab93885199b9 gnome-applets-1.4.0.5.ebuild 1037
-MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
 MD5 f0f21c699a4e71e179115f815c3c80fa gnome-applets-2.10.1.ebuild 1741
-MD5 6624f3e55d16f759d7cf4079187427ec gnome-applets-2.12.1.ebuild 1818
+MD5 f7e7e4f9e9c57cb847852b38b4c0e531 gnome-applets-2.10.0.ebuild 1639
 MD5 b5c7329982e8397e6f95455994ecec06 gnome-applets-2.6.2.ebuild 1570
+MD5 6624f3e55d16f759d7cf4079187427ec gnome-applets-2.12.1.ebuild 1818
+MD5 5b9fa82aaf7c2d065600383baf5c5f80 gnome-applets-2.12.1-r1.ebuild 1966
+MD5 e05eed4b956e6de67aef4fd2c1eb4a1c ChangeLog 18667
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDS9hUKRy60XGEcJIRAjFvAJ9VjHh4DtJHaIukQE2X4V0abyT6JACcDIVB
-W29IF5BJ5fUHYqQ8/aieQSQ=
-=AVhc
------END PGP SIGNATURE-----
+MD5 347176fa1d21ab752ac65c462d6d59c9 files/digest-gnome-applets-2.6.2 73
+MD5 90c7825724b0c78966d8bbf5f401e9b8 files/digest-gnome-applets-2.10.0 74
+MD5 fa49e6f2df38c7035ec9671ffbc030de files/digest-gnome-applets-2.10.1 74
+MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1 74
+MD5 94a972f1942603b7060203bcddeab736 files/digest-gnome-applets-2.12.1-r1 74
+MD5 f7ba655004c33f5a85ce78bba4b818f4 files/gnome-applets-2.12.1-hal-switch.patch 772
+MD5 ebcb8c6d8a9406b441de3e591d350960 files/gnome-applets-2.10.1-fbsd.patch 1494
+MD5 e8861003d9c73bcf26b9df775ec65fbe files/digest-gnome-applets-1.4.0.5 75
diff --git a/gnome-base/gnome-applets/files/digest-gnome-applets-2.12.1-r1 b/gnome-base/gnome-applets/files/digest-gnome-applets-2.12.1-r1
new file mode 100644
index 000000000000..720dd9250fd2
--- /dev/null
+++ b/gnome-base/gnome-applets/files/digest-gnome-applets-2.12.1-r1
@@ -0,0 +1 @@
+MD5 06dd0b634d7092fa8af2ce302f68f912 gnome-applets-2.12.1.tar.bz2 5369404
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.12.1-hal-switch.patch b/gnome-base/gnome-applets/files/gnome-applets-2.12.1-hal-switch.patch
new file mode 100644
index 000000000000..71d1633d5e4c
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.12.1-hal-switch.patch
@@ -0,0 +1,29 @@
+--- gnome-applets-2.12.1/configure.in	2005-10-03 22:16:56.000000000 -0400
++++ gnome-applets-2.12.1.new/configure.in	2005-10-11 12:54:02.000000000 -0400
+@@ -363,15 +363,23 @@
+ 
+ HAL_CFLAGS=
+ HAL_LIBS=
+-PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
++AC_ARG_WITH(hal,[  --without-hal       build without hal support])
++
++if test "x$with_hal" != xno; then
++
++ PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
+ 		  HAVE_HAL="yes",
+ 		  HAVE_HAL="no")
+ 
+-if test "x$HAVE_HAL" = "xyes"; then
++ if test "x$HAVE_HAL" = "xyes"; then
+ 	AC_DEFINE(HAVE_HAL, 1, [HAL available])
+ 	AC_MSG_RESULT(available)
+-else
++ else
+ 	AC_MSG_RESULT(no)
++ fi
++ 
++else
++	AC_MSG_WARN(["Hal support disabled"])
+ fi
+ 
+ AC_SUBST(HAL_CFLAGS)
diff --git a/gnome-base/gnome-applets/gnome-applets-2.12.1-r1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.12.1-r1.ebuild
new file mode 100644
index 000000000000..7ae12c04149a
--- /dev/null
+++ b/gnome-base/gnome-applets/gnome-applets-2.12.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.12.1-r1.ebuild,v 1.1 2005/10/12 23:58:36 allanonjl Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Applets for the Gnome2 Desktop and Panel"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acpi apm hal ipv6"
+
+RDEPEND=">=x11-libs/gtk+-2.5
+	>=dev-libs/glib-2.5
+	>=gnome-base/libgnome-2.8
+	>=gnome-base/libgnomeui-2.8
+	>=gnome-base/gnome-vfs-2.8
+	>=gnome-base/gconf-2.8
+	>=gnome-base/gnome-panel-2.9.4
+	>=gnome-base/libgtop-2.11.92
+	>=gnome-base/libglade-2.4
+	>=gnome-base/gail-1.1
+	>=x11-libs/libxklavier-1.13
+	>=x11-libs/libwnck-2.9.3
+	>=app-admin/system-tools-backends-1.1.3
+	>=gnome-base/gnome-desktop-2.11.1
+	hal? ( >=sys-apps/hal-0.5.3
+		>=sys-apps/dbus-0.34 )
+	>=media-libs/gstreamer-0.8.2
+	>=gnome-extra/gucharmap-1.4
+	apm? ( sys-apps/apmd )
+	acpi? ( sys-power/acpid )"
+
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28
+	>=app-text/scrollkeeper-0.1.4
+	>=app-text/gnome-doc-utils-0.3.2"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+USE_DESTDIR="1"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+
+pkg_setup() {
+	G2CONF="--disable-scrollkeeper \
+		--enable-flags \
+		$(use_enable ipv6)
+		$(use_with hal)"
+
+	if ! use apm && ! use acpi; then
+		G2CONF="${G2CONF} --disable-battstat"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# add hal configure switch
+	epatch ${FILESDIR}/${P}-hal-switch.patch
+
+	autoconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	for applet in \
+	accessx-status battstat charpick cpufreq drivemount geyes gkb-new  \
+	gswitchit gtik gweather mini-commander mixer modemlights multiload \
+	null_applet stickynotes trashapplet; do
+
+		docinto ${applet}
+
+		for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+			[ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+		done
+
+	done
+}