public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas K. Huettel" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/
Date: Fri, 25 Feb 2011 07:29:43 +0000 (UTC)	[thread overview]
Message-ID: <fab19b1e9728b5d62c6418b7d0beb574452ee783.dilfridge@gentoo> (raw)

commit:     fab19b1e9728b5d62c6418b7d0beb574452ee783
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Feb 24 23:30:04 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 23:30:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=fab19b1e

[sci-electronics/tnt] General cleanup

(Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 sci-electronics/tnt/ChangeLog                      |    7 ++
 sci-electronics/tnt/Manifest                       |   37 +++++------
 .../tnt/files/tnt-1.2.2-Makefile-am.patch          |   27 --------
 .../tnt/files/tnt-1.2.2-doc-Makefile-am.patch      |   37 -----------
 sci-electronics/tnt/files/tnt-1.2.2-docs.patch     |   66 ++++++++++++++++++++
 sci-electronics/tnt/files/tnt-1.2.2-f77.patch      |   14 ++++
 .../tnt/files/tnt-1.2.2-gui-splash.patch           |   11 ---
 sci-electronics/tnt/files/tnt-1.2.2-gui.patch      |   24 +++++++
 sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch |   11 ---
 sci-electronics/tnt/tnt-1.2.2.ebuild               |   46 +++++---------
 10 files changed, 144 insertions(+), 136 deletions(-)

diff --git a/sci-electronics/tnt/ChangeLog b/sci-electronics/tnt/ChangeLog
index c92dc3e..96ae9fb 100644
--- a/sci-electronics/tnt/ChangeLog
+++ b/sci-electronics/tnt/ChangeLog
@@ -3,6 +3,13 @@
 # $Header: $
 
   24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
+  -files/tnt-1.2.2-Makefile-am.patch,
+  -files/tnt-1.2.2-doc-Makefile-am.patch, +files/tnt-1.2.2-docs.patch,
+  +files/tnt-1.2.2-f77.patch, +files/tnt-1.2.2-gui.patch,
+  -files/tnt-1.2.2-gui-splash.patch, -files/tnt-1.2.2-gui_help.patch:
+  General cleanup and simplification
+
+  24 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org> tnt-1.2.2.ebuild,
   +files/tnt-1.2.2-calc.patch, -files/tnt-1.2.2-calc-cap-calcCAP.patch,
   -files/tnt-1.2.2-calc-cap-cmplxmat.patch,
   -files/tnt-1.2.2-calc-cap-cmplxvec.patch,

diff --git a/sci-electronics/tnt/Manifest b/sci-electronics/tnt/Manifest
index e242eb8..05147b6 100644
--- a/sci-electronics/tnt/Manifest
+++ b/sci-electronics/tnt/Manifest
@@ -1,32 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tnt-1.2.2-Makefile-am.patch 758 RMD160 2524d177a9ea2f28889775ee8dad0663f55a586c SHA1 5dc022c9009ad5f425fed591c880e73047d2eeb1 SHA256 aea0daec458376e63315736a45bc307a4768443c2a3be85aeb29f6fd1caf1f34
 AUX tnt-1.2.2-bem-nmmtl.patch 456 RMD160 8463540d64226a8bf769a66d7fdd9fd5daf61cb6 SHA1 8b08be79fee98f1e06c5ded2e4fa24aacd8c6007 SHA256 f6f0bde8df73c524545e2290958a9612692f2a76114ed1ba7a6b984b81cb1dd1
 AUX tnt-1.2.2-calc.patch 14487 RMD160 9234f56886cb95db4c1d1501250dc2f4954214d3 SHA1 e9b3b58a9409986b767a6b9678f2d37d8201fcb3 SHA256 daee74c5c2fb46a9a3742be5d9d8441260119dddcb52e9a06ddfe54147f5b735
-AUX tnt-1.2.2-doc-Makefile-am.patch 1032 RMD160 f8175289f67577cadb61649c00f4a233ff2b16b6 SHA1 24c83817bd7afdcd59260f1f52d2757e98bdf947 SHA256 38862d969bcee3e35623317572d3b22122f16678b88a95e79f4727c7d6f9ffa0
-AUX tnt-1.2.2-gui-splash.patch 401 RMD160 7870cc511eea6d591ee8be96504c5d5a63e40375 SHA1 e5fe12e4e1af6bb0627440f3722894a5d9aaaa8f SHA256 aede7920d86ec402463a4ce3ea43f839b509dda6859a12ae01796eadf77bd2ef
-AUX tnt-1.2.2-gui_help.patch 315 RMD160 050721d4c09efe2a9706ab8fe21a1ae072fae50b SHA1 9722eeb18a7daa1026f5b1a730801da675c727d1 SHA256 bf0c7b39a2c4a8eb8e5195868ee1b9751ebc53ab531435cc7e970ad7a8199d7f
+AUX tnt-1.2.2-docs.patch 1970 RMD160 ecfa0e2c973fcdcda155de3bf49eab1ef29b40a6 SHA1 28c2b8aa2ec2ad94e4e38ae57f514fc3ad03a4ce SHA256 35741bb44d5c97f718830fbfa63ed23f00c84cf4e5c1007bfa997f0e3f842520
+AUX tnt-1.2.2-f77.patch 482 RMD160 8f45a248f511bdd5aae54d0511a6f23abfbfdbc2 SHA1 f6d9f5b22d85fc7ac8d84845558497514009aab2 SHA256 b80cd8fdf9000ba115511b4b440d929dcdb55d8778bf01c52a1082607fd82362
+AUX tnt-1.2.2-gui.patch 900 RMD160 acfa4c03aa92c97b257f3d7d5a08e01d94834e77 SHA1 8486e487c10d29b6d3c09bb219b030d32039d6cf SHA256 d1c3cc7cf0f6d084d583502aa67a10687e1fbcd5a5833aca986b3c2d3fd37a20
 AUX tnt-1.2.2-namespaces.patch 6862 RMD160 2a32bb175e4769f35bd9d91521da7c9ac13c11d9 SHA1 7a181abc878951f631d576188144e44422743eea SHA256 d777646d0e7a43aee5c68e5061a85cd99be45cd539b683afff7752d7581d16c1
 AUX tnt-1.2.2-tkcon.patch 447 RMD160 d3b708d681a5a468c9f17b27dba6c273e3b472ad SHA1 55e8f6bb54d4e59ce73620d2909d6d8b23197770 SHA256 1302823cd11ad31dcca115abb93a6f1c07299872bf5d48d51815b5436bbee846
 DIST tnt-1.2.2.tar.gz 2020099 RMD160 1a2ba68a93ee21590bb25a3eacf85d3773c3e77d SHA1 bd089863ca2cd939009253e83f4ab75317191047 SHA256 cbb418d0de4f244d8174e8826e4d8272bce753f50431c9d87af08928f5817445
-EBUILD tnt-1.2.2.ebuild 2213 RMD160 05f65a9e5ab0dc5a6b6e899741e98685cc01d9ec SHA1 2fc154af1a1ead865577d75dae0dc5e6430d8cfb SHA256 ae7aebfad09e94606d3d84910af4a88c7b0b123d64b2b963f96881360f656a23
-MISC ChangeLog 1013 RMD160 2dfa7a993395195056cf06e365cd08fecb6af6db SHA1 b0969f00bee62dfe2d6962bb33c73d46b8f7a76f SHA256 459c200d376175e95ef4395d7d20433b8371560a454e8e23b9e7de468160a6f3
+EBUILD tnt-1.2.2.ebuild 1560 RMD160 cf0dc81a332f776ea0d74861a840b0f65c5c5055 SHA1 d64b470d0edf236e2447e646c4cc31c81d3a6579 SHA256 db439bd394e69329ace1f76cba887df819c1f67a9a4e9f01cc04eca743efe15c
+MISC ChangeLog 1363 RMD160 4ca3eafee7154329f2c59ee6fc41623197ff7c73 SHA1 a6406509983d84621dddd59c816f8be1e8a6ae83 SHA256 62962a9ddbe3996c739b676a9cc8fd04ce270988f6d09bc466c7e5d13f7e484f
 MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNZqaqAAoJENwGBM22xffe2XAQAJwvYBGGt7oeNAi14C0s+oJ6
-5sVOBY90n9zzH0RZxdwO4saKWhEoHhcuSW8Dek9g4GlwM7pxDlCY4SrYc6sK5v4t
-Q+NxTKSMxeVFkvHFD2x8xbLaNW9D+wG7NCgmQtRkcKy5QS5BNntXMRoe+xFGNvk7
-bihmLN2tJuanOhw6wLKdDK9SSLrvkqOrP8na1YUTiIOO5Ma2W2E5SK2KPO1N7q5x
-xbiSX0rgEN+FhZAte3hr3OVndnGv6YvrHZYu6592N7wcZarwitg1S4qWeBpCyOfp
-/R/Cy9BvqLxav+FxI0O4v/MUkQT25+oDw+dDiwu+WhsGrU+rHlvkKRdobqi1TcjP
-1ypdOddHFsC/R4mzUOH6w7/ew10/OJE/KabYlaptFchq+AeBpp0rWKWJtROc+YuR
-oNkgt854XswaubF2t9QFn2vPGpYefNPtnXh3hAVv94Dmh7KUdhzKXuhllX68BlWr
-FqwTMhdo1gGeh9XPmE5XF1qa/zHDlcNg8CBh00w3sE9E68aKQ2zWc2R2WNY+jyWn
-LfIZ6Kpr7cF8FbE6XNOW7yl/afaRAzbWYueu6OT4cYHCOoO3c1RAc5wInT4pAK1g
-gv4hUipgXlIQqiodZ8n9N9UmJOLZc7UjexkPk6jbOX8uZ3Zt144SJQ1jSP+7U2Nd
-Neie6vdDFakNDl13zpq2
-=uLQ+
+iQIcBAEBAgAGBQJNZun8AAoJENwGBM22xffev5wQAKJXT2pZ1zIjiUJI+Nx5pOtH
+MYpNmrLRedxCD/awO/WU60PfAdCxXIpxZ3lQlheAy55sKV2U2P0Zspw128ZCxcav
+IQU5XWI2uiF4RDF/m28mRVYz15BsLx9uRNogkWko4ewLNgr8Z6ulP4Vhpli+wbdl
+ZTpvNmfvhqEG1DWLwycy/pk3IGn+zdlbyPOAfI9RKjjEnVIQVfgxMiW6B2+4eAc/
+1Fze8g6hc7TkqLZjB8dxyddu6tZhzAkG3HNDYkJSLKxkECcusznoMvjqEt1h6X35
+hp+PdcZXPO6OyiP8wIrInDT50VQ/uAhG6H1LKKalvD5u2Q0rWQzteIKeOWoYbWpi
+KmBU33urUvJq61H2J5Aqb4eAZ06IPVRUWe7keDbomuK40DoR8BhwiTSBJlVOfS/X
+odjXKK1GvEIHNZ2JugycAO4/D/FwTJNnqS64+DCdz4i1uPmplVlXMpxY71fYTAki
+jXN6rR6R3QCPRzbW8jZgS1XdhQhnv15ZsfKLxraek93sB373Ap3Kuu08HamJ9oHK
+t8i54gGucknDvWwoMwXWIK47SE+5+R6YC2thIu9xFmx6bCtti+0f5MuTOCp/C2X7
+x6ruqnphajtyeoX5Sup1NxznPKixebhyRl3iGgvzXFw9ZAUpOyfOPy8J1DyC6wz7
+rrxbsEsGvSVAtqfdsLjf
+=L4xp
 -----END PGP SIGNATURE-----

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
deleted file mode 100644
index aea1e2e..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-Makefile-am.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Makefile.am.org	2011-02-19 00:22:25.000000000 -0800
-+++ Makefile.am	2011-02-19 00:23:29.000000000 -0800
-@@ -51,14 +51,16 @@
- #  a prefix.  If not, then I suppose README will go into
- #  /usr.
- #---------------------------------------------------------------
--appdocsdir = $(prefix)
--appdocs_DATA = \
--	AUTHORS$(TXTEXT) \
--	COPYING$(TXTEXT) \
--	ChangeLog$(TXTEXT) \
--	NEWS$(TXTEXT) \
--	README$(TXTEXT) \
--	THANKS$(TXTEXT)
-+#
-+# Portage takes care for this
-+#appdocsdir = $(prefix)
-+#appdocs_DATA = \
-+#	AUTHORS$(TXTEXT) \
-+#	COPYING$(TXTEXT) \
-+#	ChangeLog$(TXTEXT) \
-+#	NEWS$(TXTEXT) \
-+#	README$(TXTEXT) \
-+#	THANKS$(TXTEXT)
- 
- #---------------------------------------------------------------
- #  Convert application documents to text files on Windows.

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch b/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
deleted file mode 100644
index 092158b..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-doc-Makefile-am.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- doc/Makefile.am.org	2011-02-19 00:25:11.000000000 -0800
-+++ doc/Makefile.am	2011-02-19 00:28:31.000000000 -0800
-@@ -43,7 +43,7 @@
- #
- #---------------------------------------------------------------
- 
--docdir = $(prefix)/doc
-+#docdir = $(prefix)/doc
- doc_DATA = \
- 	user-guide.pdf 
- 
-@@ -73,15 +73,17 @@
- 	pdflatex $*
- 	latex2html -split 4 -show_section_numbers -local_icons $<
- 
-+# Removed, because portage takes care of it.
-+#
- #  Custom installation rule
--install-data-local:
--	for f in $(doc_DATA); do \
--	  $(mkinstalldirs) $(docdir); \
--	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
--	  d=`basename $$f .pdf`; \
--	  $(mkinstalldirs) $(docdir)/$$d; \
--	  $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
--	done
-+#install-data-local:
-+#	for f in $(doc_DATA); do \
-+#	  $(mkinstalldirs) $(docdir); \
-+#	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
-+#	  d=`basename $$f .pdf`; \
-+#	  $(mkinstalldirs) $(docdir)/$$d; \
-+#	  $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
-+#	done
- 
- #---------------------------------------------------------------
- #  clean

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-docs.patch b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
new file mode 100644
index 0000000..77fe504
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-docs.patch
@@ -0,0 +1,66 @@
+diff -ruN tnt-1.2.2-5-tkcon/Makefile.am tnt-1.2.2/Makefile.am
+--- tnt-1.2.2-5-tkcon/Makefile.am	2004-07-22 16:23:32.000000000 +0200
++++ tnt-1.2.2/Makefile.am	2011-02-24 23:43:41.000000000 +0100
+@@ -51,14 +51,16 @@
+ #  a prefix.  If not, then I suppose README will go into
+ #  /usr.
+ #---------------------------------------------------------------
+-appdocsdir = $(prefix)
+-appdocs_DATA = \
+-	AUTHORS$(TXTEXT) \
+-	COPYING$(TXTEXT) \
+-	ChangeLog$(TXTEXT) \
+-	NEWS$(TXTEXT) \
+-	README$(TXTEXT) \
+-	THANKS$(TXTEXT)
++#
++# Portage takes care for this
++#appdocsdir = $(prefix)
++#appdocs_DATA = \
++#	AUTHORS$(TXTEXT) \
++#	COPYING$(TXTEXT) \
++#	ChangeLog$(TXTEXT) \
++#	NEWS$(TXTEXT) \
++#	README$(TXTEXT) \
++#	THANKS$(TXTEXT)
+ 
+ #---------------------------------------------------------------
+ #  Convert application documents to text files on Windows.
+diff -ruN tnt-1.2.2-5-tkcon/doc/Makefile.am tnt-1.2.2/doc/Makefile.am
+--- tnt-1.2.2-5-tkcon/doc/Makefile.am	2004-07-21 17:45:26.000000000 +0200
++++ tnt-1.2.2/doc/Makefile.am	2011-02-24 23:43:45.000000000 +0100
+@@ -43,7 +43,7 @@
+ #
+ #---------------------------------------------------------------
+ 
+-docdir = $(prefix)/doc
++#docdir = $(prefix)/doc
+ doc_DATA = \
+ 	user-guide.pdf 
+ 
+@@ -73,15 +73,17 @@
+ 	pdflatex $*
+ 	latex2html -split 4 -show_section_numbers -local_icons $<
+ 
++# Removed, because portage takes care of it.
++#
+ #  Custom installation rule
+-install-data-local:
+-	for f in $(doc_DATA); do \
+-	  $(mkinstalldirs) $(docdir); \
+-	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
+-	  d=`basename $$f .pdf`; \
+-	  $(mkinstalldirs) $(docdir)/$$d; \
+-	  $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
+-	done
++#install-data-local:
++#	for f in $(doc_DATA); do \
++#	  $(mkinstalldirs) $(docdir); \
++#	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
++#	  d=`basename $$f .pdf`; \
++#	  $(mkinstalldirs) $(docdir)/$$d; \
++#	  $(INSTALL_DATA) $$d/* $(docdir)/$$d; \
++#	done
+ 
+ #---------------------------------------------------------------
+ #  clean

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-f77.patch b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
new file mode 100644
index 0000000..b1f3fa1
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-f77.patch
@@ -0,0 +1,14 @@
+diff -ruN tnt-1.2.2-3-namespace/bem/configure.ac tnt-1.2.2-4-g77/bem/configure.ac
+--- tnt-1.2.2-3-namespace/bem/configure.ac	2004-04-22 22:07:12.000000000 +0200
++++ tnt-1.2.2-4-g77/bem/configure.ac	2011-02-24 23:55:35.000000000 +0100
+@@ -74,9 +74,7 @@
+ ;;
+ *linux*)
+ 	#  For Linux, all flavors...
+-	#  Use the GNU compilers for C++ and FORTRAN.
+-	CXX="g++"
+-	F77="g77"
++	#  Use the GNU compilers for C++ and FORTRAN and rely on portage
+ 	AM_CXXFLAGS="-DFORTRAN_UNDERBARS"
+ ;;
+ esac

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
deleted file mode 100644
index e0c381a..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-gui-splash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/splash.tcl.org	2011-02-19 18:30:20.000000000 -0800
-+++ gui/splash.tcl	2011-02-19 18:40:53.000000000 -0800
-@@ -81,7 +81,7 @@
-     } else {
- 	set filename COPYING
-     }
--    set licenseFile [file join $::scriptDir .. $filename]
-+    set licenseFile [file join /usr share doc package_name html $filename]
-     if { [file exists $licenseFile] } {
- 	::gui::guiPopupFile $licenseFile
-     } else {

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
new file mode 100644
index 0000000..e2a9b4c
--- /dev/null
+++ b/sci-electronics/tnt/files/tnt-1.2.2-gui.patch
@@ -0,0 +1,24 @@
+diff -ruN tnt-1.2.2-6-docs/gui/gui_help.tcl tnt-1.2.2/gui/gui_help.tcl
+--- tnt-1.2.2-6-docs/gui/gui_help.tcl	2004-07-26 15:37:52.000000000 +0200
++++ tnt-1.2.2/gui/gui_help.tcl	2011-02-24 23:45:27.000000000 +0100
+@@ -26,7 +26,7 @@
+     switch -exact $helpTopic {
+ 
+ 	userguide {
+-	    display_online_help user-guide/index.html
++	    display_online_help /usr/share/doc/package_name/html/index.html
+ 	}
+ 
+     }
+diff -ruN tnt-1.2.2-6-docs/gui/splash.tcl tnt-1.2.2/gui/splash.tcl
+--- tnt-1.2.2-6-docs/gui/splash.tcl	2004-07-22 15:16:21.000000000 +0200
++++ tnt-1.2.2/gui/splash.tcl	2011-02-24 23:45:23.000000000 +0100
+@@ -81,7 +81,7 @@
+     } else {
+ 	set filename COPYING
+     }
+-    set licenseFile [file join $::scriptDir .. $filename]
++    set licenseFile [file join /usr share doc package_name html $filename]
+     if { [file exists $licenseFile] } {
+ 	::gui::guiPopupFile $licenseFile
+     } else {

diff --git a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch b/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
deleted file mode 100644
index ba5da09..0000000
--- a/sci-electronics/tnt/files/tnt-1.2.2-gui_help.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gui/gui_help.tcl.org	2011-02-19 18:52:20.000000000 -0800
-+++ gui/gui_help.tcl	2011-02-19 18:59:17.000000000 -0800
-@@ -26,7 +26,7 @@
-     switch -exact $helpTopic {
- 
- 	userguide {
--	    display_online_help user-guide/index.html
-+	    display_online_help /usr/share/doc/package_name/html/index.html
- 	}
- 
-     }

diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild
index 6fb8b5f..8ce4ae0 100644
--- a/sci-electronics/tnt/tnt-1.2.2.ebuild
+++ b/sci-electronics/tnt/tnt-1.2.2.ebuild
@@ -27,56 +27,40 @@ DEPEND="${RDEPEND}
 	media-gfx/imagemagick
 "
 
-PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces}.patch )
+PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui}.patch )
 
 src_prepare() {
 	base_src_prepare
 
-	# Update fortran compiler
-	sed -i 's/\"g77\"/\"$(tc-getF77)\"/' bem/configure.ac
-	sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcCAP/configure.ac
-	sed -i 's/\"g77\"/\"$(tc-getF77)\"/' calcRL/configure.ac
-	#block document installation
-	epatch "${FILESDIR}/${P}"-Makefile-am.patch
-	epatch "${FILESDIR}/${P}"-doc-Makefile-am.patch
-	epatch "${FILESDIR}/${P}"-tkcon.patch
 	#adjust new document location in gui
-	epatch "${FILESDIR}/${P}"-gui-splash.patch
 	sed -i "s/package_name/${PF}/" gui/splash.tcl
-	epatch "${FILESDIR}/${P}"-gui_help.patch
 	sed -i "s/package_name/${PF}/" gui/gui_help.tcl
-	# regenerate the configure and make files
-	rm aclocal.m4
-	eautoreconf --force
-}
-
-src_configure() {
-	econf || die "econf failed"
-}
 
-src_compile() {
-	emake || die "emake failed"
+	eautoreconf
 }
 
 src_install () {
 	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die "failed to install docs"
-	dohtml COPYING #tcl cannot handle the archives created by dodoc
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS || die
+
+	# tcl cannot handle the archives created by dodoc
+	dohtml COPYING || die
 	if use doc; then
-				dodoc doc/*.pdf doc/*.png
-				dohtml doc/user-guide/*
+				dodoc doc/*.pdf doc/*.png || die
+				dohtml doc/user-guide/* || die
 	fi
-	#Install icon
+
+	# Install icon
 	convert gui/logo.gif gui/tnt.png
 	docinto "examples"
 	dodoc examples/* || die "failed to install exampels"
 	newicon gui/tnt.png tnt.png
-	make_desktop_entry ${PN} "Mttl" ${PN}
+	make_desktop_entry ${PN} "tnt" ${PN}
 }
 
 pkg_postinst() {
-		einfo "Warning: the sources are not under development anymore."
-		einfo "We made it compile, but users should check if the results make sense."
-		einfo "The GUI was written in an old version of TCL/TK."
-		einfo "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
+		elog "Warning: the sources are not under development anymore."
+		elog "We made it compile, but users should check if the results make sense."
+		elog "Examples are in the /usr/share/doc/tnt-1.2.2 folder."
 }



             reply	other threads:[~2011-02-25  7:29 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-25  7:29 Andreas K. Huettel [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-10-20 19:09 [gentoo-commits] dev/dilfridge:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/ Andreas Hüttel
2011-02-24 21:44 Andreas K. Huettel
2011-02-24 21:44 Andreas K. Huettel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fab19b1e9728b5d62c6418b7d0beb574452ee783.dilfridge@gentoo \
    --to=dilfridge@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox