Clean up patches. EAPI bump.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

8 files changed, 23 insertions, 128 deletions

diff --git a/app-office/teapot/ChangeLog b/app-office/teapot/ChangeLog
index 9b0e02e44bc1..4f715fd4094e 100644
--- a/app-office/teapot/ChangeLog
+++ b/app-office/teapot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/teapot
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/ChangeLog,v 1.6 2013/08/16 13:48:13 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/ChangeLog,v 1.7 2014/08/21 07:30:49 jer Exp $
+
+  21 Aug 2014; Jeroen Roovers <jer@gentoo.org> -teapot-2.2.0.ebuild,
+  teapot-2.3.0.ebuild, -files/teapot-2.2.0-doc-dir.patch,
+  -files/teapot-2.2.0-helpfile.patch, files/teapot-2.3.0-doc-dir.patch,
+  files/teapot-2.3.0-helpfile.patch:
+  Clean up patches. EAPI bump.
 
   16 Aug 2013; Jeroen Roovers <jer@gentoo.org>
   files/teapot-2.3.0-doc-dir.patch:
diff --git a/app-office/teapot/Manifest b/app-office/teapot/Manifest
index 719c9327e6c0..ce5e0758dbfe 100644
--- a/app-office/teapot/Manifest
+++ b/app-office/teapot/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX teapot-2.2.0-doc-dir.patch 1226 SHA256 9da60342caeb80f23902e7b66f32dac4b3c30052ff01094b650ab86db73d1c51 SHA512 b3ee0c2faf15f9777f044e20814ecc3422dfdac6321edc95e5f7c18c04dede7e798ed2f28e26c5981744f802ba06175798191005d20b846e196afef12b9c0012 WHIRLPOOL 72705a4d82c67572964da9d957ad25a9ca0f7911690b715c7360390993f39a4c67db397f84a221a119755394e5e4874d458bc230452715bc1cf61e178c19abd2
-AUX teapot-2.2.0-helpfile.patch 852 SHA256 5ee1e58c5daea001dc563d7be94327eb9842a3a87f4de923e82e02a7ea4d6c0e SHA512 5ae8e9adc651a80393b2fe91e3e93438c7dfde0b469fa7e920398bca8159f490c55fb3e47539af80057354de8a75cf8254b86d9a4224b5d57d122fcf0648b2d6 WHIRLPOOL 5f7d47c20dc5c3453d3e3472ad46aa2840f5c15e2177c847c36b97bbe360fab8b83f34ff98a49d8fce63344de31c46197c72c83f0d0379ba4fc2e18b97c6a72d
-AUX teapot-2.3.0-doc-dir.patch 1191 SHA256 cf84294ef5abb9d694c06f4b4a9e4378de995e21db5d7ac9a52d2d1caeb7fdc9 SHA512 efafcbd36ab2e178d6ddcd44f06337f3bb55628e06877dcba17e2e8dc1fb614cc5587bc340d9d3fe9b3c4206c7320ad8f0f440e029b07ce5eb2331b50dd67cc4 WHIRLPOOL 5b8057902ff5203641e93fcb16e99fe2ce83a579ec32a2d989e91e7bfd0826f8ae83a191c6a0377e0354d0123383907a4d4e98ebcc91c9ef05fa70fc2606b65b
-AUX teapot-2.3.0-helpfile.patch 975 SHA256 2db979604db460d200dba2fa27bcb33c77d73f8a7fe8ea5a6b1f9781d3f12cd6 SHA512 50744ea43c7aee7f806e811d6d2bf1332ae1098ab85750150d958c660a7948d15028c8baa489ed83f0dd3a21fdf1fb0fad21ba1ceebe92d6214afd25aa3d2a9e WHIRLPOOL 212c3949cd138f016860d995b018a5c409eceee0c52d6fcb63f95294846ee186b3f76b2c7398653088483ce2f8f945aaac3d06082c75696b0804889bd5f4d4ac
-DIST teapot-2.2.0.tar.gz 113903 SHA256 883c6298002e0f4f27abeeb08f1c0282ae69de8f5b70619437b46ad92bb70916 SHA512 acb55359e9bc5bd6c78686101d641b3edf88418e807fab29f9d38c9301b8651dedd7226c18086d1ac938fa169bea93a631eb9d4b74819defef1530d0322b55de WHIRLPOOL 912f274f68ce98ec64f78a0a7edf42accf79b75db164eccf1f2ed863cd85127794f643f8a777c1ab41e83a608aead3549b8408412dc235d7f23dcedc6f785b03
+AUX teapot-2.3.0-doc-dir.patch 1169 SHA256 a9b1716a062b6661b55cf05ef710837e0251650befc131398525af99230222b3 SHA512 3debb8340d7e757f7f3df17fe3c506fc7b52219bfdbf5d3539d0795815334fef5994d2bbfd8ed13080eb8e86a2169365b87d875f033e924465727ba06fd3a031 WHIRLPOOL c03ae43ed0589ea27ad56f04de625a653eb75192b73dfc23c9ff0f0a862d8b3f4cd6c8c098fbe43b95d8e74cbb0a026f3fc7e0f5fc5c0dd16f621d0acb1f4061
+AUX teapot-2.3.0-helpfile.patch 953 SHA256 0373e6d380ff0694f7245f371d841e63c9066bfafd2463375372a31e4d46ec38 SHA512 3ab425c2b715da1326b974c6e0ab981bff99679fde0c2687c8e834d15b8358a0a0fcccd5b0df50bdd87319c363a0126c30ee70a5a8d4e7130935224830631aaa WHIRLPOOL fa8359c025c4abb81429fc81d2b0836196ee9c90542c0e7fc55efe2612eb356f75a38e0e7bfe5171776d9835b020c7123c068c0c4c78c6694f7719fc67b1c7b4
 DIST teapot-2.3.0.tar.gz 113647 SHA256 580e0cb416ae3fb3df87bc6e92e43bf72929d47b65ea2b50bc09acea3bff0b65 SHA512 cb85aa59e0e4e25f5067bbf2099caa7414bc6f923808d140f12844d6f19ca32f6ed649fae99dc8c93d51e789a8c6d1d92f38fe5d57f41e968f6c3b8b59cec9ca WHIRLPOOL 68236c8cfbf8f60cebd3055f54c67ce07f82409838e2406ddf3d5d6c7a2d43f2dadaa8923e039c63242afb8f3c5c5eaeaf40fed62f8f004a6ebbd18e3845b57b
-EBUILD teapot-2.2.0.ebuild 1142 SHA256 1fc22767d385e8f53fc2970b0e2eb39b2c1b0ce403a5578b0b3118ea2b0aa8e9 SHA512 bd292fd198ebe4ca7b56830b1a0efc6dc749a30dedc1ad0cbfebc813b0bcc05f536a5f9b555744c8e046089ecf17be22ea4c5f2dac49c386fad828bb9f6728f1 WHIRLPOOL 311cad3127965cb2e772e9611fd61b3ae926e25ab0be824788932c23eab9fd956d2f51599f543a04069698cd2ec80b8f015637e167a2a38383051247ca71205f
-EBUILD teapot-2.3.0.ebuild 1136 SHA256 849a19bea88a84a9449bbdfad6291d497b6faf23372524c144f4e1f5e8569a66 SHA512 ccbe7128fbd28a129dcc1210b592aea2287a5151fe476236b53992bb406afb99b0d036c4d8e870043ea13f8c51634813709030e3912c75ff34c9c9b2e0726fe4 WHIRLPOOL c2d87a10bb3477e00845a6db665fc3595611a448d5c83da612f4532f0be2ac84a076e3a73e8399ca262545505ba4105dea3280ca46d181d412b0fd25b94ccf45
-MISC ChangeLog 1110 SHA256 5c8ccbb16cc3aebf120a85b1b178ece7e368db5fbe8930ae60a8449f1c5103a7 SHA512 50ef7396ee9674f20b4554be7446d213aa382add5adf8526187c3688d8054aebb979ccc76dd2f3daf9250f986230dbf555080cca225021b48d1442c2ab8bb7cd WHIRLPOOL 2bb62a846ca5f70fe5db4c96d5c517023dc05ef60114a9486661a1676b58694fc99745085f877916bc361d983530f72128cd7bc307bd1be0c8ded159a916239a
+EBUILD teapot-2.3.0.ebuild 1136 SHA256 77738445b3e515d9b7cb4840cbf1727a82376b076741487ed2644361b1513db8 SHA512 e016c9e87d719fb4b6c806a0de39d22aae917ea16dea24d7e5a840223c6ea45ed688e2af616b290bfffaf0bf21b948d3b5bca3ab8ef8b9510af3f0905cc5f63d WHIRLPOOL cdbf01e0e91e7ee3022960cf97c045096fc3aec9f208e2a4ce88974a26efd3d449789e42850e1c44b099f898130ab5ab13caa24d5b9cb11b3c22a5ebd18cae74
+MISC ChangeLog 1378 SHA256 b537554e87dd76b6820028e5f9a9f8582d118dfe3f815fbf3e4893fb1f133419 SHA512 4e1e46b218aa654c36bec33e74a41b9a09927c966f7ebbd58d122b5f38f35be3bce560e579bdc7330bbd1d2e5150f46ddf8ebf96daea04751bf3d54de1410283 WHIRLPOOL fe06e0df852d975c794959d801a97b5884a3b4d437834e13ecb3f0d7916860c8bb117ca5b993487bfa4253a1838a0a280ea1198d57358fa5d1e9860220a9496e
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlIOLZ4ACgkQVWmRsqeSphMUFwCffVloAJ/GXVxZT9pnEz+sWdb/
-xGcAn23nGyHkNC3Hrh/l8aa/nzyidvtw
-=w0Gp
+iEYEAREIAAYFAlP1oCsACgkQVWmRsqeSphMJYACePVxD8FBnmbbmyO20lHyjTWFx
+toMAn1yvP/H6eiTIdxMubC4KZ5yks47R
+=24Jh
 -----END PGP SIGNATURE-----
diff --git a/app-office/teapot/files/teapot-2.2.0-doc-dir.patch b/app-office/teapot/files/teapot-2.2.0-doc-dir.patch
deleted file mode 100644
index 12a55ad71251..000000000000
--- a/app-office/teapot/files/teapot-2.2.0-doc-dir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix to put docs in correct location based on ${PF}
-This requires -DPF=${PF} passed to cmake
-
-Also prevent the installation of COPYING
-
-Patch by Kevin McCarthy <signals42@gmail.com>
-
-
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -83,12 +83,12 @@
- 	add_custom_target(pdf DEPENDS teapot.pdf)
- 	add_custom_target(html DEPENDS html/index.html)
- 	add_custom_target(doc ALL DEPENDS teapot.pdf html/index.html)
--	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/teapot FILES_MATCHING PATTERN *.html PATTERN *.png)
--	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/teapot)
--	set(HELPFILE "${CMAKE_INSTALL_PREFIX}/share/doc/teapot/html/index.html")
-+	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PF} FILES_MATCHING PATTERN *.html PATTERN *.png)
-+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/teapot.pdf DESTINATION share/doc/${PF})
-+	set(HELPFILE "/usr/share/doc/${PF}/html/index.html")
- endif ()
- 
--install(FILES COPYING README DESTINATION share/doc/teapot)
-+install(FILES README DESTINATION share/doc/${PF})
- 
- add_custom_target(dist
- 	COMMAND ${CMAKE_COMMAND} -E remove_directory teapot-${Teapot_VERSION_MAJOR}.${Teapot_VERSION_MINOR}.${Teapot_VERSION_PATCH}
diff --git a/app-office/teapot/files/teapot-2.2.0-helpfile.patch b/app-office/teapot/files/teapot-2.2.0-helpfile.patch
deleted file mode 100644
index 751e68119350..000000000000
--- a/app-office/teapot/files/teapot-2.2.0-helpfile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-This fixes a bug where HELPFILE was being overridden by a hard coded path
-
-This also fixes an issue with fl_filename_absolute returning a relative path
-preventing fteapot from finding its helpfile when started from any directory
-except /
-
-Patch by Kevin McCarthy <signals42@gmail.com>
-
---- fteapot.fl
-+++ fteapot.fl
-@@ -8,6 +8,9 @@
- decl {\#include "misc.h"} {private global
- } 
- 
-+decl {\#include "config.h"} {private global
-+}
-+
- decl {\#include <stdint.h>} {private global
- } 
- 
-@@ -781,8 +784,8 @@
- 
- Function {find_helpfile(char *buf, int size, const char *argv0)} {open C return_type void
- } {
--  code {fl_filename_absolute(buf, size, argv0);
-+  code {strncpy(buf, argv0, size);
- char *p = (char *)fl_filename_name(buf);
--strncpy(p, "../share/doc/teapot/html/index.html", buf+size-p);
-+strncpy(p, HELPFILE, buf+size-p);
- buf[size-1] = 0;} {}
- } 
diff --git a/app-office/teapot/files/teapot-2.3.0-doc-dir.patch b/app-office/teapot/files/teapot-2.3.0-doc-dir.patch
index 4a6094e14619..726badf8c8b4 100644
--- a/app-office/teapot/files/teapot-2.3.0-doc-dir.patch
+++ b/app-office/teapot/files/teapot-2.3.0-doc-dir.patch
@@ -5,8 +5,8 @@ Also prevent the installation of COPYING
 
 Patch by Kevin McCarthy <signals42@gmail.com>
 
---- teapot-2.3.0/CMakeLists.txt
-+++ teapot-2.3.0/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -99,12 +99,12 @@
  	add_custom_target(pdf DEPENDS teapot.pdf)
  	add_custom_target(html DEPENDS html/index.html)
diff --git a/app-office/teapot/files/teapot-2.3.0-helpfile.patch b/app-office/teapot/files/teapot-2.3.0-helpfile.patch
index 3df5f2f443aa..683939ce7162 100644
--- a/app-office/teapot/files/teapot-2.3.0-helpfile.patch
+++ b/app-office/teapot/files/teapot-2.3.0-helpfile.patch
@@ -6,8 +6,8 @@ except /
 
 Patch by Kevin McCarthy <signals42@gmail.com>
 
---- teapot-2.3.0/fteapot.fl
-+++ teapot-2.3.0/fteapot.fl
+--- a/fteapot.fl
++++ b/fteapot.fl
 @@ -5,6 +5,10 @@
  decl {\#include <stdint.h>} {private global
  }
diff --git a/app-office/teapot/teapot-2.2.0.ebuild b/app-office/teapot/teapot-2.2.0.ebuild
deleted file mode 100644
index 2cca7fb6fab8..000000000000
--- a/app-office/teapot/teapot-2.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/teapot-2.2.0.ebuild,v 1.3 2011/12/10 14:18:53 ssuominen Exp $
-
-EAPI=4
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A powerful spreadhseet program"
-HOMEPAGE="http://www.syntax-k.de/projekte/teapot/"
-SRC_URI="http://www.syntax-k.de/projekte/teapot/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk"
-
-RDEPEND="sys-libs/ncurses
-	fltk? ( >=x11-libs/fltk-1.3.0:1 )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-office/lyx
-		dev-tex/latex2html
-		dev-tex/pgf
-		dev-texlive/texlive-fontsrecommended
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-doc-dir.patch
-	"${FILESDIR}"/${P}-helpfile.patch
-)
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_enable doc HELP)
-		-DPF=${PF}
-	)
-
-	if use fltk; then
-		mycmakeargs+=(
-			-DFLTK_USE_FILE=/usr/share/cmake/Modules/FLTKConfig.cmake
-			-DFLTK_DIR=/usr/share/cmake/Modules
-			-DFLTK_FLUID_EXECUTABLE=/usr/bin/fluid
-		)
-		append-cxxflags -I/usr/include/fltk-1
-		append-ldflags -L/usr/$(get_libdir)/fltk-1
-	fi
-
-	cmake-utils_src_configure
-}
diff --git a/app-office/teapot/teapot-2.3.0.ebuild b/app-office/teapot/teapot-2.3.0.ebuild
index 8dae27a89dce..5dbbcf4a1a9a 100644
--- a/app-office/teapot/teapot-2.3.0.ebuild
+++ b/app-office/teapot/teapot-2.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/teapot-2.3.0.ebuild,v 1.1 2013/05/31 13:49:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/teapot/teapot-2.3.0.ebuild,v 1.2 2014/08/21 07:30:49 jer Exp $
 
-EAPI=4
+EAPI=5
 inherit cmake-utils flag-o-matic
 
 DESCRIPTION="A powerful spreadhseet program"