diff options
| -rw-r--r-- | x11-wm/matchbox-panel/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-wm/matchbox-panel/files/matchbox-panel-0.9.3-wifi.patch | 43 | ||||
| -rw-r--r-- | x11-wm/matchbox-panel/matchbox-panel-0.9.3-r1.ebuild | 51 |
3 files changed, 102 insertions, 2 deletions
diff --git a/x11-wm/matchbox-panel/ChangeLog b/x11-wm/matchbox-panel/ChangeLog index b340ab93dda6..b07c2273eb12 100644 --- 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/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 index 000000000000..d36a2eb8df0a --- /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 index 000000000000..4d000c71ceac --- /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 +} |