Version bump. Remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 18 insertions, 22 deletions

diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog
index 6e993e72aab4..d02805c3ea6c 100644
--- a/app-admin/conky/ChangeLog
+++ b/app-admin/conky/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/conky
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.142 2010/09/30 20:30:29 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.143 2010/10/06 16:35:57 billie Exp $
+
+*conky-1.8.1 (06 Oct 2010)
+
+  06 Oct 2010; Daniel Pielmeier <billie@gentoo.org> -conky-1.8.0-r2.ebuild,
+  +conky-1.8.1.ebuild:
+  Version bump. Remove old.
 
   30 Sep 2010; Brent Baude <ranger@gentoo.org> conky-1.8.0-r1.ebuild:
   stable ppc64, bug 328161
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 4f7ab1ae9ec7..8f4da97b10fa 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,8 +4,9 @@ AUX conky-1.8.0-if-existing.patch 827 RMD160 f04dd3c6423239118b28fb3d6e2a97ddc2a
 AUX conky-1.8.0-ncurses.patch 4359 RMD160 deb00ff8338881bf97a8ed26aeb6cdb3d53c0a07 SHA1 13dd57185c5ab8118cf2ca9c7e86222b9dc4e166 SHA256 9ac58ffcebe10447ac0255a5e7c569d1f22ddb3f6b1a1b8b0854e55d781c6f59
 DIST conky-1.7.2.tar.bz2 585099 RMD160 6d419c7bdeded5890c4c99cdef884bc0a79a50cb SHA1 3f4e5cc13651fbf94892b079d447a8549818809e SHA256 b3c0a1b0ff90579d48df542a6070adbe67d3926d6d0c66ee12b52b2d5a2c675c
 DIST conky-1.8.0.tar.bz2 610545 RMD160 5ea6accf73e1d41ebe8390722a53ae50e0c23df8 SHA1 eef214c2917ea5666d24f03128b12d00fa313b58 SHA256 badb3824a9655eee90281939df8bdb3ca95cf8bab03269b3b3775bfea2ed0a51
+DIST conky-1.8.1.tar.bz2 612481 RMD160 f3203131e2d8f3756eb29f5c5a9034b9c269fdc6 SHA1 9581419b1a53a8a7e37b0291cd4e55ab166d221a SHA256 f85a278f2869596b1fd68b6d26d58c93af8dcc39d5186bbcfd587d4c545e5e43
 EBUILD conky-1.7.2-r2.ebuild 4115 RMD160 919d049392827b928c262962d13a319fb1b539e9 SHA1 026757ee426bd25a82ff0bef2cccb323d30eafd2 SHA256 6bea285b3344a9888f0b0207d8c3c836252570dcca3e55595e9df88301fe16f1
 EBUILD conky-1.8.0-r1.ebuild 3964 RMD160 14b2a611c63f3d6b3699aa6e76993b9400c93de4 SHA1 aa61f3fbd6538b72521735d6ea226d06ca69f82a SHA256 6057738f8f1185513fc9687538bb31c9fb4ad142073c548de4feeccfd3eaf681
-EBUILD conky-1.8.0-r2.ebuild 4079 RMD160 3436ff2c35f2c2b22312ad88c884c54dc543bf70 SHA1 0578cf03fac7e477910b39109c52c50a49a3ed66 SHA256 849d437feaf17da6ca76adefa96c027da81ee6e42ccfcd8d8629a86ee6462819
-MISC ChangeLog 21982 RMD160 331a8f935158164fc728534517b1da1bec65b327 SHA1 2d167dd6add0696c2005b205723a1c6a5cb455ba SHA256 d578bb7a505ba408574f4308ea009b6743371f5746e2be2c9511058eaf095c0e
+EBUILD conky-1.8.1.ebuild 3756 RMD160 31ac53fb31128468575d247eb6a60bb325c8a49b SHA1 ff453027e2a6f3240a6f95f351a0d6b5054233ab SHA256 7e46a1343df5e1c50b04c16bb7a1f46e2df9f863425fded0696b1b96e32c3d5a
+MISC ChangeLog 22138 RMD160 d82520a0a3622c89c29e1218ab13d1fb361c73ef SHA1 6c0147f652cf7b4ad1c147c0609c108a90c9d8ee SHA256 4a4a461100df6b1f6f38b726027aeb54b6d43493ba1f4923d915e4c5d6175d1f
 MISC metadata.xml 2154 RMD160 911d61ea1b3a10bf4c49fafba1b82b067ee0eee3 SHA1 dac481d15b6279f6d573cb8c76aa38267a9186d7 SHA256 a2ab7e0c213f854ed36387d6ca1702a77a77842d9d96d3b97351d48e0472d9f9
diff --git a/app-admin/conky/conky-1.8.0-r2.ebuild b/app-admin/conky/conky-1.8.1.ebuild
index f4601d598486..0d6b33eef79b 100644
--- a/app-admin/conky/conky-1.8.0-r2.ebuild
+++ b/app-admin/conky/conky-1.8.1.ebuild
@@ -1,10 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r2.ebuild,v 1.3 2010/08/13 19:30:33 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1.ebuild,v 1.1 2010/10/06 16:35:57 billie Exp $
 
-EAPI="2"
-
-inherit autotools eutils
+EAPI=2
 
 DESCRIPTION="An advanced, highly configurable system monitor for X"
 HOMEPAGE="http://conky.sourceforge.net/"
@@ -52,14 +50,6 @@ DEPEND="
 	dev-util/pkgconfig
 	"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ncurses.patch" \
-		"${FILESDIR}/${P}-audacious-2.3.patch" \
-		"${FILESDIR}/${P}-if-existing.patch" \
-		"${FILESDIR}/${P}-ibm-x.patch"
-	eautoreconf
-}
-
 src_configure() {
 	local myconf
 
@@ -98,22 +88,21 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog AUTHORS TODO || die "dodoc failed"
-	dohtml doc/docs.html doc/config_settings.html doc/variables.html \
-		|| die "dohtml failed"
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog AUTHORS TODO || die
+	dohtml doc/docs.html doc/config_settings.html doc/variables.html || die
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die "doins failed"
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim || die
 
 		insinto /usr/share/vim/vimfiles/syntax
-		doins "${S}"/extras/vim/syntax/conkyrc.vim|| die "doins failed"
+		doins "${S}"/extras/vim/syntax/conkyrc.vim || die
 	fi
 
 	if use nano-syntax; then
 		insinto /usr/share/nano/
-		doins "${S}"/extras/nano/conky.nanorc|| die "doins failed"
+		doins "${S}"/extras/nano/conky.nanorc || die
 	fi
 }