Version bump.

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

3 files changed, 28 insertions, 18 deletions

diff --git a/app-cdr/cdcover/ChangeLog b/app-cdr/cdcover/ChangeLog
index ae928d854590..d0e072aa2b45 100644
--- a/app-cdr/cdcover/ChangeLog
+++ b/app-cdr/cdcover/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/cdcover
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdcover/ChangeLog,v 1.2 2010/12/27 22:15:17 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdcover/ChangeLog,v 1.3 2011/02/11 19:58:58 ssuominen Exp $
+
+*cdcover-0.7.4 (11 Feb 2011)
+
+  11 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> +cdcover-0.7.4.ebuild,
+  +files/cdcover-0.7.4-Makefile.patch:
+  Version bump.
 
   27 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   cdcover-0.7.3.ebuild:
diff --git a/app-cdr/cdcover/cdcover-0.7.3.ebuild b/app-cdr/cdcover/cdcover-0.7.4.ebuild
index 3d5fd76f37c7..d3e2008cad62 100644
--- a/app-cdr/cdcover/cdcover-0.7.3.ebuild
+++ b/app-cdr/cdcover/cdcover-0.7.4.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdcover/cdcover-0.7.3.ebuild,v 1.3 2010/12/27 22:15:17 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdcover/cdcover-0.7.4.ebuild,v 1.1 2011/02/11 19:58:58 ssuominen Exp $
 
 EAPI=2
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="tk"
+
+PYTHON_DEPEND=2
+PYTHON_USE_WITH=tk
 
 inherit eutils python
 
@@ -18,7 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="cddb"
 
 RDEPEND="cddb? ( dev-python/cddb-py )
-	app-text/ggv
 	media-sound/cd-discid"
 DEPEND=""
 
@@ -30,18 +30,23 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-install_all_images.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
 }
 
 src_compile() {
-	emake prefix="${D}/usr" target="/usr" || die "emake failed."
+	emake prefix="${D}"/usr target=/usr || die
 }
 
 src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" \
-		install || die "emake install failed."
+	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die
+
 	python_convert_shebangs -r 2 "${D}"
-	newicon share/images/document-save.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
+
+	make_desktop_entry ${PN} ${PN}
+
+	insinto /usr/share/doc/${PF}/pdf
+	doins doc/cdcover.pdf
+
 	prepalldocs
 }
diff --git a/app-cdr/cdcover/files/cdcover-0.7.3-install_all_images.patch b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
index 62c87f1d2274..c1026bf23503 100644
--- a/app-cdr/cdcover/files/cdcover-0.7.3-install_all_images.patch
+++ b/app-cdr/cdcover/files/cdcover-0.7.4-Makefile.patch
@@ -1,14 +1,13 @@
-diff -ur cdcover.orig/Makefile cdcover/Makefile
---- cdcover.orig/Makefile	2008-05-14 21:16:55.000000000 +0300
-+++ cdcover/Makefile	2008-06-07 12:17:32.000000000 +0300
+--- Makefile
++++ Makefile
 @@ -9,8 +9,8 @@
  IMAGES=./share/images
  TEMPLATES=./share/templates
  
 -DOCFILES=BUGS COPYING INSTALL README VERSION
 -IMAGEFILES=autonum.gif cddb.gif exit.gif gv.gif logo.gif nocddb.gif ps.gif
-+DOCFILES=BUGS README VERSION
-+IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-print-preview.png document-save.gif document-save.png logo.gif nocddb.gif view-sort-ascending.gif view-sort-ascending.png
++DOCFILES=README VERSION
++IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
  TEMPLATEFILES=CD-Classic.pst CD-Modern.pst CD-Tracktime.pst CD-TwoColumns.pst DVD-Classic.pst
  
  INSTALL=install -D