Fix eapi-2 migration (bug 269193), whitespace.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

4 files changed, 18 insertions, 26 deletions

diff --git a/x11-misc/qcomicbook/ChangeLog b/x11-misc/qcomicbook/ChangeLog
index 937e12c4c0da..2d3a5264ff5f 100644
--- a/x11-misc/qcomicbook/ChangeLog
+++ b/x11-misc/qcomicbook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/qcomicbook
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/ChangeLog,v 1.22 2009/05/04 09:23:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/ChangeLog,v 1.23 2009/05/10 15:15:19 yngwin Exp $
+
+  10 May 2009; Ben de Groot <yngwin@gentoo.org> qcomicbook-0.4.0.ebuild,
+  metadata.xml:
+  Fix eapi-2 migration (bug 269193), whitespace.
 
   04 May 2009; Krzysiek Pawlik <nelchael@gentoo.org>
   qcomicbook-0.4.0.ebuild:
diff --git a/x11-misc/qcomicbook/Manifest b/x11-misc/qcomicbook/Manifest
index e1089e39ec18..6de968b768bc 100644
--- a/x11-misc/qcomicbook/Manifest
+++ b/x11-misc/qcomicbook/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX qcomicbook-0.3.4-asneeded.patch 548 RMD160 559de4c2c8008289e4646acb4305acd17ef64dc1 SHA1 8e27f8178dbf45f70dd6b9645d12627474908fb0 SHA256 be041439c02e8086ca2c35f8909d2b53134965d85c86993059153af017aca5ed
 DIST qcomicbook-0.3.4.tar.gz 384681 RMD160 86c00ece34847fd9f51555ceb7dc767c2b7f6e50 SHA1 5fac6ef8c1e69da3c6477130681cbf312eefbfb2 SHA256 7accb599b05b5d5a52b66dde1f3cbb41af8eac8d5bdce0d637f06d348cfdb6a9
 DIST qcomicbook-0.4.0.tar.gz 363715 RMD160 229e4948d9033f06792b9b91ca1b74e8e66420d0 SHA1 ad77be0fa84032d6d14b79268d0dd88e9b4c80eb SHA256 d6f07803f543d8597378df8c3f6e3ff186d7b7c022178dbdd6185d77ad07eb3b
 EBUILD qcomicbook-0.3.4.ebuild 1019 RMD160 94c57acf84105581565b06bc8e521b855e34de75 SHA1 65edbfb2a169ed98e7da3ff7609795ccb38ad83a SHA256 e01721fe088041ba3e05374d7d893415524d0565f9870c948b987d32219d2450
-EBUILD qcomicbook-0.4.0.ebuild 1097 RMD160 d9415112f280d18a2f55567fc4668b7762b1c122 SHA1 c4341bb13ec035c39bdeba1e71e73c1b136c66a5 SHA256 eb1bc4f893be1dc6700320f74951b2174e6c576d1e81b9c23f8e0e2f635ad5ef
-MISC ChangeLog 3469 RMD160 9e17de58b362f461bcc2a1df4cfbe7e96ae22fca SHA1 f6ae03246b366e3e906339781905dbef6741379f SHA256 a2db3988251a67f2bebc1276af7174d433667157053f46a692874f1f60e7ca32
-MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkn+tBgACgkQgo/w9rxVVVEBwACfdzRbHIJasxsddmCUlXFi3dw4
-5QIAnRp7cSKAE/tEsW0ctCfc6N3h7/bJ
-=ItyA
------END PGP SIGNATURE-----
+EBUILD qcomicbook-0.4.0.ebuild 1020 RMD160 593650a3085c609c1b661bf283e780cd78b58aac SHA1 6c4bb878e3a87efcc4a7859b335486b988bc7218 SHA256 4e9e5a71eae325b3580a8a0b26758047aaf8b84f41a9bf48d9174a1704515d6a
+MISC ChangeLog 3606 RMD160 f1cd5a8f339ef374ca426a17c46b4cee1e1296ad SHA1 4822350b4ffde54e813541a02860594720ab2fe3 SHA256 a2197efec303867ac385433c150d66d6b21157fb6977c2db1b73e3d7a528cb48
+MISC metadata.xml 241 RMD160 3233914904f0923ae398f56d405b6d7e38ad70d8 SHA1 646742864d0cc35ee670b617d18a96c40f5c7150 SHA256 67553d6b501bca74b3b0ab275014d293d23c6f7c247063fa81e37343a740239d
diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml
index 72335b4f9bac..50ba56a6f979 100644
--- a/x11-misc/qcomicbook/metadata.xml
+++ b/x11-misc/qcomicbook/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer>
-<email>desktop-misc@gentoo.org</email>
-</maintainer>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/qcomicbook/qcomicbook-0.4.0.ebuild b/x11-misc/qcomicbook/qcomicbook-0.4.0.ebuild
index c33f3c81fa43..9441125c30c1 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.4.0.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.4.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.4.0.ebuild,v 1.5 2009/05/04 09:23:30 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.4.0.ebuild,v 1.6 2009/05/10 15:15:19 yngwin Exp $
 
 EAPI="2"
-
 inherit eutils qt4
 
 DESCRIPTION="A viewer for comic book archives containing jpeg/png images."
-HOMEPAGE="http://linux.bydg.org/~yogin"
+HOMEPAGE="http://linux.bydg.org/~yogin/"
 SRC_URI="http://linux.bydg.org/~yogin/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -15,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )
+RDEPEND="x11-libs/qt-gui
 	media-libs/imlib2[X]
 	x11-libs/libXmu
 	|| ( app-arch/unrar app-arch/rar )
@@ -24,12 +23,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	sed -i -e 's,moc-qt4,moc,g' Makefile.in || die "sed failed"
+	sed -i -e 's,moc-qt4,moc,g' src/Makefile.in || die "sed failed"
 }
 
-src_compile() {
-	econf --with-Qt-dir="${QTDIR}" || die "econf failed"
-	emake || die "emake failed."
+src_configure() {
+	econf --with-Qt-dir="${QTDIR}"
 }
 
 src_install() {