Revbump and remove old. Install html documentation in the correct place (bug #297637), update to EAPI 3, and add a slot dependency on gtk+:2.

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

3 files changed, 36 insertions, 16 deletions

diff --git a/app-text/winefish/ChangeLog b/app-text/winefish/ChangeLog
index 8415eb226722..55f8949aad2c 100644
--- a/app-text/winefish/ChangeLog
+++ b/app-text/winefish/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/winefish
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/winefish/ChangeLog,v 1.9 2008/05/04 08:01:29 drac Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/winefish/ChangeLog,v 1.10 2011/03/01 07:46:52 radhermit Exp $
+
+*winefish-1.3.3-r1 (01 Mar 2011)
+
+  01 Mar 2011; Tim Harder <radhermit@gentoo.org> -winefish-1.3.3.ebuild,
+  +winefish-1.3.3-r1.ebuild:
+  Revbump and remove old. Install html documentation in the correct place (bug
+  #297637), update to EAPI 3, and add a slot dependency on gtk+:2.
 
   04 May 2008; Samuli Suominen <drac@gentoo.org> winefish-1.3.3.ebuild:
   Use berlios mirrors://
diff --git a/app-text/winefish/Manifest b/app-text/winefish/Manifest
index 7a7adabadcf7..8af3e2565200 100644
--- a/app-text/winefish/Manifest
+++ b/app-text/winefish/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX winefish-1.3.3-nostrip.patch 521 RMD160 9a4597bad0b66dd879e1e998771c6b74581530c9 SHA1 cb5fb6c8ac438f479ee755d77d16ddb4cb15e7d9 SHA256 41d8b4d73b585b1e22710399b90cff653dd9c903bf70b0ba079af6daaf0e9f0d
 DIST winefish-1.3.3.tgz 478063 RMD160 578bb0b7c6703a573d69dc4fd53d2a24507c29f4 SHA1 784d11565990210b116fc2122239b5bfba87ecb2 SHA256 b61a7edf954b0314695a3fc09b3780602d331b676e8ccea5b0aabe0427f6b7c7
-EBUILD winefish-1.3.3.ebuild 1048 RMD160 deb020fe1be530da842c252c5fe4c59b996cc0ef SHA1 1b40e8ed3a4c0ad3bf2c62144937babb29c0740e SHA256 df1d9a42d33da4955ae62b7daf586c1e80b652167177ca4bce1f6d82ee2600f7
-MISC ChangeLog 1326 RMD160 33ae8ce75a728d77a0691d76ccfdeceb195014e2 SHA1 333dada343cc6343cb5122194ece1a06cbffb1cf SHA256 458559528b153bb0ea136be351143e9b454047522d4bb6f10a88f51b66484652
+EBUILD winefish-1.3.3-r1.ebuild 1059 RMD160 d5663b2b9b04b7b9f3d30e2c524e593349829efe SHA1 2482f9d268889baacbcfb2e552ac3fb691cbb3ca SHA256 fd49b161667a453ad91f887badc36cd59dfce260551ca31066355205a05a56b0
+MISC ChangeLog 1615 RMD160 db548ca0bc8d789f704c246d6d19178c7721e5f7 SHA1 77e074cbcb7b6555cdbe39ba88840a5df203374d SHA256 561cc44ea30ca1cfec7915036ac6ff44f4ddf69cfcd7d71f07024d52891f2bcf
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNbKR2AAoJEEqz6FtPBkyjWfgH/153mrwCRfaT+VTn63GBltoL
+ga0f4OSVHAp+m5h/dRSlTEbAChKxLLWlh++Qouefen2BUzS3nX/Niq/2VEEPe5vf
+IU8TICMZlOZ/tGo990XCBdVSrMy/keeCF+fCCyfY47nuFIg3+Gv3TgXFLduLX3gj
+u6AkLl5CNhYUGVtgczuwpr1lODXWEv7A2OXbKA/qqdnxhXqyKIf5A5J6VAxZCuP/
+nO5CPqWn7h9LxNmnWf0pYWbkr2RFHqQiJtzqqNjFd0FWDxHguWi1VmX/AfKeomq9
+2lNm/lCB6IS6/xbmA6vCVTF/GJw3W+vvVlen1uSx1n0DqB1CFu+zA57AhKeTzP4=
+=b0zp
+-----END PGP SIGNATURE-----
diff --git a/app-text/winefish/winefish-1.3.3.ebuild b/app-text/winefish/winefish-1.3.3-r1.ebuild
index 06a3823a2e00..c9727da2f321 100644
--- a/app-text/winefish/winefish-1.3.3.ebuild
+++ b/app-text/winefish/winefish-1.3.3-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/winefish/winefish-1.3.3.ebuild,v 1.9 2008/05/04 08:01:29 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/winefish/winefish-1.3.3-r1.ebuild,v 1.1 2011/03/01 07:46:52 radhermit Exp $
+
+EAPI=3
 
 inherit eutils fdo-mime
 
@@ -15,25 +17,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="spell"
 
-RDEPEND=">=x11-libs/gtk+-2.4
+RDEPEND=">=x11-libs/gtk+-2.4:2
 	>=dev-libs/libpcre-6.3
 	spell? ( virtual/aspell-dict )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-nostrip.patch"
 }
-src_compile() {
-	econf --disable-update-databases || die
-	emake || die
+
+src_configure() {
+	econf --disable-update-databases
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-
+	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html || die "emake install failed"
 	dodoc AUTHORS CHANGES README ROADMAP THANKS TODO
 }
 
@@ -41,5 +40,5 @@ pkg_postinst() {
 	fdo-mime_desktop_database_update
 	fdo-mime_mime_database_update
 
-	elog "You need to emerge a TeX distribution to gain winfish's full capacity"
+	elog "You need to emerge a TeX distribution to gain winefish's full capacity"
 }