Made building mb-applet-wireless deterministic, bug #320023

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/x11-wm/matchbox-panel/ChangeLog b/x11-wm/matchbox-panel/ChangeLog
index b340ab93dda66592d184edfc5495970676dbbdd6..b07c2273eb12d8d366d2423b2c18728d58161067 100644 (file)
--- a/x11-wm/matchbox-panel/ChangeLog
+++ b/x11-wm/matchbox-panel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/matchbox-panel
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/ChangeLog,v 1.9 2009/03/14 03:52:35 solar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/ChangeLog,v 1.10 2010/05/18 13:35:48 yvasilev Exp $
+
+*matchbox-panel-0.9.3-r1 (18 May 2010)
+
+  18 May 2010; Yuri Vasilevski <yvasilev@gentoo.org>
+  +matchbox-panel-0.9.3-r1.ebuild, +files/matchbox-panel-0.9.3-wifi.patch:
+  Made building mb-applet-wireless deterministic, bug #320023
 
   14 Mar 2009; <solar@gentoo.org> matchbox-panel-0.9.2.ebuild,
   matchbox-panel-0.9.3.ebuild:

diff --git a/x11-wm/matchbox-panel/Manifest b/x11-wm/matchbox-panel/Manifest
index 18e38d8e4f8febe1bd85a21c549163be4f540d7b..e725568d09ee4859008ff22083abeb62c02ff4c7 100644 (file)
--- a/x11-wm/matchbox-panel/Manifest
+++ b/x11-wm/matchbox-panel/Manifest
@@ -1,7 +1,9 @@
 AUX matchbox-panel-0.9.3-gcc4-no-nested-functions.patch 2077 RMD160 579977819d87c3c825e216d33b05ece979a089e9 SHA1 21d58dfc59e714f49e6195e40c0d7c07d80615fe SHA256 6d6dc5c92c90f5f97a9ce6293f2858d4c43b57392f08a8784a12487788525b9b
+AUX matchbox-panel-0.9.3-wifi.patch 1606 RMD160 6ecc541032367e9f7214aef0098f87bf5f0ce4d5 SHA1 2ca40314936afac88b2954c6b421fc6c389e72fc SHA256 5bdfee3037b7e023a8b3c547d985047c656413a5f69ff3baeddd1891ec01217c
 DIST matchbox-panel-0.9.2.tar.bz2 157604 RMD160 65e5849c04433354cae645af05aff7f6dd9e21e2 SHA1 438830e4f4bd59e953f1c131939a2081c0b6ec95 SHA256 efabe0377c7bd2e82a0b9d648be2213bf5a2af0e8e3fa1f059426f9ebcf35c23
 DIST matchbox-panel-0.9.3.tar.bz2 162477 RMD160 6a91d010c75b3eed1c0b0af79d48e5d41d5a4af2 SHA1 c54a0c1f35fcdc883e529ecdec123977c6325160 SHA256 319b656e2f1f25339d65802a3136f31169141fd54d1ca9131ff4aada62b25ce6
 EBUILD matchbox-panel-0.9.2.ebuild 1057 RMD160 4da2f946436b0e888e008ae31de91162ad0cc97b SHA1 c481e6ed2e30b964600c723e439ace0314228ffe SHA256 7d81026b224ed1414a8e7face050f79a0816fb63f9007ad574ba8f290ca5b9e1
+EBUILD matchbox-panel-0.9.3-r1.ebuild 1371 RMD160 6eeca22159c7d306491ea4a6b70637ad4577cee2 SHA1 1aab3696e393dc7d4d13c6cee74dc503164b5252 SHA256 a60d348c67f88fa49ed4e028dd1a0f179a57074b20e41d3142f82eb8479553ae
 EBUILD matchbox-panel-0.9.3.ebuild 1221 RMD160 11b3152da05cdcf623b7947b402969caf367b0e1 SHA1 27a49c20f729a6dfd00e943018c4d63f0a09f248 SHA256 9783d44531607a7c4964b3c0844c61d604ca8b9f030e157c56236eec92e2070a
-MISC ChangeLog 1485 RMD160 69a3288feeaac1efed1d104c5a9c782a71e7ef47 SHA1 8ec63f5e66ce344dd94d400a5177a619f074e7dc SHA256 2e507e35213181710745d6df00fd08ba772d42004824ef732aa485174004ee62
+MISC ChangeLog 1720 RMD160 0584811d2a69a5cb1c413f50eb138ee349935c20 SHA1 80965f8c489ca0016ae19a0937d16c9315582127 SHA256 aee0443b5c704b843087e1e4ab9836f6638fd50a63082110ad7888f2a618f314
 MISC metadata.xml 431 RMD160 4565658fc749601ee7b28dcaee47d2025162421f SHA1 889be8492dce5ef8b27d91872a5d54b5595ecc74 SHA256 e705b17184c6e17460dc1c547ceec1501a802616e62105367d7375c98a2cc529

diff --git a/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch
new file mode 100644 (file)
index 0000000..d36a2eb
--- /dev/null
+++ b/x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch
@@ -0,0 +1,43 @@
+diff -Naurp matchbox-panel-0.9.3.orig/configure.ac matchbox-panel-0.9.3/configure.ac
+--- matchbox-panel-0.9.3.orig/configure.ac     2006-03-07 18:46:39.000000000 +0000
++++ matchbox-panel-0.9.3/configure.ac  2010-05-18 13:10:59.000000000 +0000
+@@ -56,6 +56,10 @@ AC_ARG_ENABLE(acpi-linux,
+   [  --enable-acpi-linux   Use Linux ACPI rather than APM for battery info],
+      enable_acpi_linux=$enableval, enable_acpi_linux=no )
+ 
++AC_ARG_ENABLE(wireless-tools,
++  [  --enable-wireless-tools   enable building of wifi applet],
++     enable_wireless_tools=$enableval, enable_wireless_tools=no )
++
+ PKG_CHECK_MODULES(LIBMB, libmb >= 1.6,,
+                AC_MSG_ERROR([*** Required Matchbox Library (libmb) 1.6 not installed ***]))
+ 
+@@ -209,17 +213,20 @@ AM_CONDITIONAL(WANT_ACPI, test x$enable_
+ 
+ dnl ------ wireless checks --------------------------------------------------
+ 
+-wifi_enabled=no
+-
+-AC_CHECK_HEADERS(iwlib.h, have_iwlib_h=yes, have_iwlib_h=no)
+-AC_CHECK_LIB(iw, iw_sockets_open, have_libiw=yes, have_libiw=yes)
++if test x$enable_wireless_tools = xyes; then
++  AC_CHECK_HEADERS(iwlib.h, have_iwlib_h=yes, 
++    AC_MSG_ERROR([Unable to find the wireless-tools headers]))
++  AC_CHECK_LIB(iw, iw_sockets_open, have_libiw=yes,
++    AC_MSG_ERROR([Unable to find the wireless-tools library]))
+ 
+-if test x$have_iwlib_h = x"yes" && test x$have_libiw = x"yes"; then
+-      WIRELESS_LIBS="-liw"
+-      wifi_enabled=yes
++  WIRELESS_LIBS="-liw"
++  wifi_enabled=yes
++else
++  WIRELESS_LIBS=""
++  wifi_enabled=no
+ fi
+-AC_SUBST(WIRELESS_LIBS)
+ 
++AC_SUBST(WIRELESS_LIBS)
+ AM_CONDITIONAL(WANT_WIFI, test x$wifi_enabled = x"yes")
+ 
+ 

diff --git a/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild b/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
new file mode 100644 (file)
index 0000000..4d000c7
--- /dev/null
+++ b/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild,v 1.1 2010/05/18 13:35:48 yvasilev Exp $
+
+inherit eutils autotools versionator
+
+DESCRIPTION="The Matchbox Panel"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="acpi debug dnotify lowres nls startup-notification wifi"
+
+DEPEND=">=x11-libs/libmatchbox-1.5
+       startup-notification? ( x11-libs/startup-notification )
+       nls? ( sys-devel/gettext )
+       wifi? ( net-wireless/wireless-tools )"
+
+RDEPEND="${DEPEND}
+       x11-wm/matchbox-common"
+
+src_unpack () {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}/"${P}-gcc4-no-nested-functions.patch
+       epatch "${FILESDIR}/"${P}-wifi.patch
+
+       eautoreconf
+}
+
+src_compile() {
+       econf   $(use_enable debug) \
+               $(use_enable nls) \
+               $(use_enable startup-notification) \
+               $(use_enable dnotify) \
+               $(use_enable acpi acpi-linux) \
+               $(use_enable lowres small-icons) \
+               $(use_enable wifi wireless-tools) \
+               || die "Configuration failed"
+
+       emake || die "Compilation failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "Installation failed"
+
+       dodoc AUTHORS ChangeLog INSTALL NEWS README
+}