From 789e78f7078d4da610eb36531f3f48e7643c7534 Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Mon, 17 May 2010 13:51:07 +0000 Subject: [PATCH] Version bump to 0.10_beta1. Add tint2conf useflag. Fix dependencies. Patch Makefile to install examples properly. Remove bunled tintwizard.py. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- x11-misc/tint2/ChangeLog | 10 +++- x11-misc/tint2/Manifest | 13 +++-- .../tint2-0.10-beta1-install_examples.patch | 33 +++++++++++ x11-misc/tint2/metadata.xml | 1 + x11-misc/tint2/tint2-0.10_beta1.ebuild | 56 +++++++++++++++++++ 5 files changed, 107 insertions(+), 6 deletions(-) create mode 100644 x11-misc/tint2/files/tint2-0.10-beta1-install_examples.patch create mode 100644 x11-misc/tint2/tint2-0.10_beta1.ebuild 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 + +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 -tint2-0.7.1.ebuild: Remove old version. diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest index a764c7b5e1a4..55128e6eba63 100644 --- a/x11-misc/tint2/Manifest +++ b/x11-misc/tint2/Manifest @@ -1,14 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX tint2-0.10-beta1-install_examples.patch 1008 RMD160 87fcd064f91edd86ff2deef22df1c134fe6464cd SHA1 80ac1ff50cc31b98157a595736914a07399ef1ee SHA256 769e27aca785ced7af19db6c6aeda185e42f76d3dba9ca50bb36516226009ca4 +DIST tint2-0.10-beta1.tar.gz 327879 RMD160 7cf10efe0f9b1504cc53e874890f27613494094c SHA1 55b42b57d0a9cb50b987059383312068dd9026e4 SHA256 1c22711fa69932383930bb5414b4b40fea9e45fac7f4199e5a37acea68853e0a DIST tint2-0.9.tar.gz 206491 RMD160 958a4850857e2b90fea72c48d32ca3d687d6bc74 SHA1 fa69aaa924bb5a85cfa753946c8a6ebed79d73d8 SHA256 5f8b14969c7bd7758f6361faae279e1d0659c9be347a12a072f8cf93854f4703 +EBUILD tint2-0.10_beta1.ebuild 1349 RMD160 7628786ecab34ecf42429617c898630c3aea61ac SHA1 9348c0ea694e3bb63b66ea2bffcd66066db627e9 SHA256 4decddf623990e3887e3bd4099ee45fe47b81288377e0e1897061894e457f75b EBUILD tint2-0.9.ebuild 982 RMD160 918e4642a52a1acbb5feff58e8a3d2f32a69aa2d SHA1 f2c4d4e303f3d29979f871a85f32db633ed4c575 SHA256 a8abcc0a7577bf63f18d8bf0b478bf54a7ef5941fd7de1897a8093faf7b25d6f -MISC ChangeLog 2392 RMD160 657b087889d80f691a16e324b8d3e31588113834 SHA1 440bf4aae65cb270cbd286a60858087426b2bed7 SHA256 f1202b21b0978c656a29bc62293ec37567afcd2fd21131d43efdb8c62cbd56a5 -MISC metadata.xml 740 RMD160 c306657ff2b09324ba42ae7a9cd3f62eb30d2a99 SHA1 59e2c76a7af222d789dfbb83193f8f0dd95f3c66 SHA256 dbbfa2a4691e441c1e4a8cd0b34a68d53ee09b6d034b1077d3309def4dd3b7ec +MISC ChangeLog 2717 RMD160 e19301c193770a2e9c36b9332697dbdf72e6ad90 SHA1 8a48ad9dda097ec2427e8ddd6e386b1515b84578 SHA256 29b496a7e25d528186f915292c8bf0cfce14e193e568ddd21ea1f663cca19a63 +MISC metadata.xml 804 RMD160 7d6f151adfbaf38a4e5ab87b19b6455d8cb73ff5 SHA1 0935f7bdf8331e17c7991dd873d5ff56b4109e65 SHA256 e7add7d68af5c184322356b31abb2dc0f1ed868e193cfeeb526e0a200dc7bda7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvYpdgACgkQixe2jn+ufTgvOwCfWbW3pc9y5IE7GDjm0kkzATs/ -yiMAniMfTSZ9vedVM0uzRkvDRgTDZgyV -=SuDk +iEYEARECAAYFAkvxSdUACgkQixe2jn+ufTg5fACdHJ8Ojs+2EQaEngdq7QBNx74s +71AAn2Ta4CH6OcFUAnvr4mZxVLOT4a/q +=SXc7 -----END PGP SIGNATURE----- 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 @@ Install tint2rc examples Enable battery status plugin + Build/Install tint2conf as well tint2 is a simple panel/taskbar intentionally made for openbox3, 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" +} -- 2.26.2