Revision bump, fixes bug 343963, thanks to Andrew Brouwers <abrouwers@gmail.com>. Remove old ebuilds.

(Portage version: 2.2.0_alpha3/cvs/Linux x86_64)

4 files changed, 45 insertions, 55 deletions

diff --git a/x11-misc/tint2/ChangeLog b/x11-misc/tint2/ChangeLog
index 9039a6940f5d..9c5b1170f53e 100644
--- a/x11-misc/tint2/ChangeLog
+++ b/x11-misc/tint2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/tint2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/ChangeLog,v 1.21 2010/08/20 07:42:30 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/ChangeLog,v 1.22 2010/11/03 17:13:20 idl0r Exp $
+
+*tint2-0.11-r1 (03 Nov 2010)
+
+  03 Nov 2010; Christian Ruppert <idl0r@gentoo.org> -tint2-0.9.ebuild,
+  -tint2-0.10.ebuild, +tint2-0.11-r1.ebuild, +files/battery_segfault.patch:
+  Revision bump, fixes bug 343963, thanks to Andrew Brouwers
+  <abrouwers@gmail.com>. Remove old ebuilds.
 
   20 Aug 2010; Christian Faulhammer <fauli@gentoo.org> tint2-0.11.ebuild:
   stable x86, bug 333149
diff --git a/x11-misc/tint2/files/battery_segfault.patch b/x11-misc/tint2/files/battery_segfault.patch
new file mode 100644
index 000000000000..3f933e2f5223
--- /dev/null
+++ b/x11-misc/tint2/files/battery_segfault.patch
@@ -0,0 +1,20 @@
+Index: battery.c
+===================================================================
+--- src/battery/battery.c	(revision 575)
++++ src/battery/battery.c	(revision 576)
+@@ -194,8 +194,14 @@
+ 		}
+ 		g_free(path2);
+ 	}
++
++	path_current_now = g_build_filename(battery_dir, "power_now", NULL);
++	if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
++		g_free(path_current_now);
++		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
++	}
++
+ 	if (path_energy_now && path_energy_full) {
+-		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
+ 		path_status = g_build_filename(battery_dir, "status", NULL);
+ 
+ 		// check file
diff --git a/x11-misc/tint2/tint2-0.10.ebuild b/x11-misc/tint2/tint2-0.11-r1.ebuild
index 3ba9e03b4c32..a89d66735b23 100644
--- a/x11-misc/tint2/tint2-0.10.ebuild
+++ b/x11-misc/tint2/tint2-0.11-r1.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.10.ebuild,v 1.1 2010/05/30 19:09:25 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.11-r1.ebuild,v 1.1 2010/11/03 17:13:20 idl0r Exp $
 
 EAPI="3"
 
+inherit cmake-utils eutils
+
 MY_P="${PN}-${PV/_/-}"
 
 DESCRIPTION="A lightweight panel/taskbar"
 HOMEPAGE="http://code.google.com/p/tint2/"
-SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.gz"
+SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,28 +27,32 @@ COMMON_DEPEND="dev-libs/glib:2
 	x11-libs/libXrender
 	x11-libs/libXrandr
 	media-libs/imlib2[X]"
-# autoconf >= 2.61 for --docdir, bug 296890
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
-	x11-proto/xineramaproto
-	>=sys-devel/autoconf-2.61"
+	x11-proto/xineramaproto"
 RDEPEND="${COMMON_DEPEND}
 	tint2conf? ( x11-misc/tintwizard )"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	sed -i -e 's:python /usr/bin/tintwizard.py:tintwizard:' src/tint2conf/main.c || die
+	epatch "${FILESDIR}/battery_segfault.patch" # bug 343963
 }
 
 src_configure() {
-	econf --docdir=/usr/share/doc/${PF} \
-		$(use_enable battery) \
-		$(use_enable examples) \
-		$(use_enable tint2conf)
+	local mycmakeargs=(
+		$(cmake-utils_use_enable battery BATTERY)
+		$(cmake-utils_use_enable examples EXAMPLES)
+		$(cmake-utils_use_enable tint2conf TINT2CONF)
+
+		# bug 296890
+		"-DDOCDIR=/usr/share/doc/${PF}"
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	cmake-utils_src_install
 	rm -f "${D}/usr/bin/tintwizard.py"
 }
diff --git a/x11-misc/tint2/tint2-0.9.ebuild b/x11-misc/tint2/tint2-0.9.ebuild
deleted file mode 100644
index e6e4c2edf895..000000000000
--- a/x11-misc/tint2/tint2-0.9.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.9.ebuild,v 1.4 2010/04/10 08:43:01 hwoarang Exp $
-
-EAPI="2"
-
-MY_P="${PN}-${PV/_rc/-rc}"
-
-DESCRIPTION="A lightweight panel/taskbar"
-HOMEPAGE="http://code.google.com/p/tint2/"
-SRC_URI="http://tint2.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="battery examples"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/pango
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libXdamage
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	media-libs/imlib2[X]"
-# autoconf >= 2.61 for --docdir, bug 296890
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	x11-proto/xineramaproto
-	>=sys-devel/autoconf-2.61"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	econf --docdir=/usr/share/doc/${PF} \
-		$(use_enable battery) \
-		$(use_enable examples)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}