Version bump to 0.10_beta1. Add tint2conf useflag. Fix dependencies. Patch Makefile to install examples properly. Remove bunled tintwizard.py.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 99 insertions, 1 deletions

diff --git a/x11-misc/tint2/ChangeLog b/x11-misc/tint2/ChangeLog
index 9bee52f467cb..8696276609be 100644
--- a/x11-misc/tint2/ChangeLog
+++ b/x11-misc/tint2/ChangeLog
@@ -1,6 +1,14 @@
 # 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.15 2010/04/28 21:17:01 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/ChangeLog,v 1.16 2010/05/17 13:51:07 idl0r Exp $
+
+*tint2-0.10_beta1 (17 May 2010)
+
+  17 May 2010; Christian Ruppert <idl0r@gentoo.org>
+  +tint2-0.10_beta1.ebuild, +files/tint2-0.10-beta1-install_examples.patch,
+  metadata.xml:
+  Version bump to 0.10_beta1. Add tint2conf useflag. Fix dependencies. Patch
+  Makefile to install examples properly. Remove bunled tintwizard.py.
 
   28 Apr 2010; Christian Ruppert <idl0r@gentoo.org> -tint2-0.7.1.ebuild:
   Remove old version.
diff --git a/x11-misc/tint2/files/tint2-0.10-beta1-install_examples.patch b/x11-misc/tint2/files/tint2-0.10-beta1-install_examples.patch
new file mode 100644
index 000000000000..22685e2489ee
--- /dev/null
+++ b/x11-misc/tint2/files/tint2-0.10-beta1-install_examples.patch
@@ -0,0 +1,33 @@
+Index: sample/Makefile.am
+===================================================================
+--- sample/Makefile.am	(revision 459)
++++ sample/Makefile.am	(working copy)
+@@ -4,12 +4,22 @@
+ 
+ if INSTALL_EXAMPLES
+ examplesdir = $(docdir)/examples
+-dist_examples_DATA = default.tint2rc \
+-					 vertical_icon_only.tint2rc \
+-					 rounded_multi_desktop.tint2rc \
+-					 black_single_desktop.tint2rc \
+-					 horizontal_icon_only.tint2rc \
+-					 white_single_desktop.tint2rc
++dist_examples_DATA = icon_and_text_1.tint2rc \
++					 icon_and_text_2.tint2rc \
++					 icon_and_text_3.tint2rc \
++					 icon_and_text_4.tint2rc \
++					 icon_only_1.tint2rc \
++					 icon_only_2.tint2rc \
++					 icon_only_3.tint2rc \
++					 icon_only_4.tint2rc \
++					 icon_only_6.tint2rc \
++					 icon_only_7.tint2rc \
++					 text_only_1.tint2rc \
++					 text_only_2.tint2rc \
++					 text_only_3.tint2rc \
++					 text_only_4.tint2rc \
++					 text_only_5.tint2rc \
++					 text_only_6.tint2rc
+ else
+ examplesdir =
+ dist_examples_DATA =
diff --git a/x11-misc/tint2/metadata.xml b/x11-misc/tint2/metadata.xml
index 77c03d318810..20067c80456c 100644
--- a/x11-misc/tint2/metadata.xml
+++ b/x11-misc/tint2/metadata.xml
@@ -9,6 +9,7 @@
 	<use>
 		<flag name="examples">Install tint2rc examples</flag>
 		<flag name="battery">Enable battery status plugin</flag>
+		<flag name="tint2conf">Build/Install tint2conf as well</flag>
 	</use>
 	<longdescription lang="en">
 		tint2 is a simple panel/taskbar intentionally made for <pkg>openbox</pkg>3, but should also work with other window managers.
diff --git a/x11-misc/tint2/tint2-0.10_beta1.ebuild b/x11-misc/tint2/tint2-0.10_beta1.ebuild
new file mode 100644
index 000000000000..0c2f8f7ccae1
--- /dev/null
+++ b/x11-misc/tint2/tint2-0.10_beta1.ebuild
@@ -0,0 +1,56 @@
+# 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_beta1.ebuild,v 1.1 2010/05/17 13:51:07 idl0r Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="battery examples tint2conf"
+
+COMMON_DEPEND="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
+	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"
+RDEPEND="${COMMON_DEPEND}
+	tint2conf? ( x11-misc/tintwizard )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${MY_P}-install_examples.patch"
+	sed -i -e 's:python /usr/bin/tintwizard.py:tintwizard:' src/tint2conf/main.c || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF} \
+		$(use_enable battery) \
+		$(use_enable examples) \
+		$(use_enable tint2conf)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm -f "${D}/usr/bin/tintwizard.py"
+}