Remove old version. Dependency fix, bug 434654.

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

4 files changed, 26 insertions, 64 deletions

diff --git a/x11-misc/tint2/ChangeLog b/x11-misc/tint2/ChangeLog
index badd4751e1e6..4149ff6725a9 100644
--- a/x11-misc/tint2/ChangeLog
+++ b/x11-misc/tint2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/tint2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/ChangeLog,v 1.25 2012/05/05 04:53:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/ChangeLog,v 1.26 2012/09/11 17:38:41 idl0r Exp $
+
+  11 Sep 2012; Christian Ruppert <idl0r@gentoo.org> -tint2-0.11.ebuild,
+  tint2-0.11-r1.ebuild:
+  Remove old version. Dependency fix, bug 434654.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> tint2-0.11.ebuild,
   tint2-0.11-r1.ebuild:
@@ -120,4 +124,3 @@
   07 Jun 2009; Christian Ruppert <idl0r@gentoo.org> +tint2-0.7_beta2.ebuild,
   +metadata.xml:
   New ebuild for bug 225733.
-
diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest
index 11cd2ce8c88f..9baeffd10cd1 100644
--- a/x11-misc/tint2/Manifest
+++ b/x11-misc/tint2/Manifest
@@ -1,6 +1,19 @@
-AUX battery_segfault.patch 660 RMD160 37d6551e7f90bca55edd41815eec6bb62b94ec07 SHA1 ea5c85348c24f80f471528b9b7f4fd7723493193 SHA256 725b414ddbaa05a27a723ac899b85c9ed21ad572bda31dd18706b92b25bab844
-DIST tint2-0.11.tar.bz2 91716 RMD160 f094e81aec1fae98a88e8392c4c9e6b5fecb6120 SHA1 9752255529673dabf13e7437afd1cd0b39d9c92b SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d
-EBUILD tint2-0.11-r1.ebuild 1293 RMD160 6c0dd49ba96eaeceb3adadd02347be489c96e9b4 SHA1 aedb184333a1330037c9596129dee3a91e27fc74 SHA256 bc834d51bd8fd58d3b98f524216b4ec0ef2c13c55a6a7ee5d54002b07bc72188
-EBUILD tint2-0.11.ebuild 1206 RMD160 9a398f623c2af1379a036828b2368002f6b04876 SHA1 7ebbe1956e4576af559df6ace78ef238b10db813 SHA256 781c66ba4c37d51bdd476cd9b2de80f4190ecca5fa2047c5576b64440563df1d
-MISC ChangeLog 4132 RMD160 25e81cbe204ac88eec71ce3b24ed06ce39d864ae SHA1 ad8e598b0f8588d1419aa78971138db38f3139c0 SHA256 c326ee963b096a7c8861c2c9087516973dcfe15daad4c2d1fac284514405f57a
-MISC metadata.xml 859 RMD160 57a98eec913bb3df88127938c3bb6ccb8f0e54e1 SHA1 a0d9e07871cb665034ba3fef4a1dcbf0b09a74a5 SHA256 b97d244723c95e83f1e36f23c36cfd66f90412640a90f8fea4da8b0d3b68f4d9
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX battery_segfault.patch 660 SHA256 725b414ddbaa05a27a723ac899b85c9ed21ad572bda31dd18706b92b25bab844 SHA512 2d56f4eeda038618ddaba8bc9f766566f3dc911b217d89bab98d09d00dc10baaf301afac579cc309e80c3a8eafb65911560018f3ddd571679027598a930b7f30 WHIRLPOOL 09ed06c24bf904bb929efd1ee1338a4c8451316efc3f9f9f33fdbf452ee710b759e41184a5d97ac53952d2baf29bec4d87cbb72282022fd01e628d90b27e3f62
+DIST tint2-0.11.tar.bz2 91716 SHA256 fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d
+EBUILD tint2-0.11-r1.ebuild 1295 SHA256 d23bf038e7a2cf674772c2fdd2ef16385d15454532b326ba90c95c4b3069e4b3 SHA512 c1d2f5b9764bef84c40a87fa763f17cf31db6d6200a524e5e4d07486bbd5e55f7492f6d2fdbef08df192dfda4968477fbc141545ad836cdc75c53de2deb8bb04 WHIRLPOOL 017f753e928b9be636c74d382df9814cae9722aec9feefa67756d1539e3d479817c40fe654236871eca6d5dee7877f22273c4d471c4b3edaa1338611dd745989
+MISC ChangeLog 4277 SHA256 bdc824409fb81c7c3dc69eb610cc20f5362efe1d26faa3b3a73be86af7b0585f SHA512 8337e52b5b6d3c660a08d91612e30b4089da1a27e58f7d55b323c90a14fbc47c146583b6354b0dd1d69d693e71a5b41444ec2e50e43baf85282b44684c9be95f WHIRLPOOL be9585c9d19f0d3253449e6391fdee3f6a6c6e99b6a6d883ad9283c83c989e1d98481d94bd2f3411af99a95bea958582a8f86a621885d062e4e62b76e1f04151
+MISC metadata.xml 859 SHA256 b97d244723c95e83f1e36f23c36cfd66f90412640a90f8fea4da8b0d3b68f4d9 SHA512 eda042fdeb99577f244c3a224115d98f78abfad7e11395b96b6dfb4abf08363bffde8193e6eb4bbb6a85da512a6ea44fa4d959ffe90cd9accb8bdb24d7c6f837 WHIRLPOOL 3e982a06088aed6cc109dc9717761d05cd97e84651d3d042e3a5d72cbffeb582de95a5e792b6c69387b11ac14d3d1d8f1e759e86ad846291ae08fe60d3b40968
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQT3cqAAoJEMOx0zmdw4Z1xMgH/0SBROG1uuhJyg6x1luAO1rn
+gX+XwwXdlad/2GQhNtqgxxMDNCGzvy9T4wzTJaWqg4HT11xstOK7i4tHOBxSrxO7
+tms51QM//0e2TTI6RvzLOzJHzz/xc4XjxtT8ngWAZ69ibAR4UvlD3OT89t5jVrWV
+z/0eJX+bOOC2MdpTGsWfeGLOKMm0lYDqVdLzrVjCwXXLIZvAPAroHZ79XlIAicVW
+EY8rRNnAXVgx310PDbr4hLFOWyV9g0FOrR+Av54AvgE2ET9K98o//vNsk5NK5NKu
+mwHQ/RGngDKHEoKFdUeLLSanQHw81gdEC7ysnNUGMJbOuHNYIVk5MdAovzTtOAM=
+=4Jez
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/tint2/tint2-0.11-r1.ebuild b/x11-misc/tint2/tint2-0.11-r1.ebuild
index e78801d7a463..508cbbb35942 100644
--- a/x11-misc/tint2/tint2-0.11-r1.ebuild
+++ b/x11-misc/tint2/tint2-0.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.11-r1.ebuild,v 1.4 2012/05/05 04:53:44 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.11-r1.ebuild,v 1.5 2012/09/11 17:38:41 idl0r Exp $
 
 EAPI="3"
 
@@ -19,7 +19,7 @@ IUSE="battery examples tint2conf"
 
 COMMON_DEPEND="dev-libs/glib:2
 	x11-libs/cairo
-	x11-libs/pango
+	x11-libs/pango[X]
 	x11-libs/libX11
 	x11-libs/libXinerama
 	x11-libs/libXdamage
diff --git a/x11-misc/tint2/tint2-0.11.ebuild b/x11-misc/tint2/tint2-0.11.ebuild
deleted file mode 100644
index 6b58ac1503d8..000000000000
--- a/x11-misc/tint2/tint2-0.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/tint2/tint2-0.11.ebuild,v 1.5 2012/05/05 04:53:44 jdhore Exp $
-
-EAPI="3"
-
-inherit cmake-utils
-
-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.bz2"
-
-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]"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	x11-proto/xineramaproto"
-RDEPEND="${COMMON_DEPEND}
-	tint2conf? ( x11-misc/tintwizard )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	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() {
-	cmake-utils_src_install
-	rm -f "${D}/usr/bin/tintwizard.py"
-}