From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 95E77138247 for ; Mon, 6 Jan 2014 17:18:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1F01E0729; Mon, 6 Jan 2014 17:18:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1F993E0729 for ; Mon, 6 Jan 2014 17:18:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 183D833F700 for ; Mon, 6 Jan 2014 17:18:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 63C1CE5536 for ; Mon, 6 Jan 2014 17:18:33 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1389028705.3e1390f37e0bfd0be5dafae25c8166b06ee03ff9.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-electronics/tnt/, sci-electronics/tnt/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-electronics/tnt/ChangeLog sci-electronics/tnt/files/tnt-1.2.2-autotools.patch sci-electronics/tnt/metadata.xml sci-electronics/tnt/tnt-1.2.2.ebuild X-VCS-Directories: sci-electronics/tnt/ sci-electronics/tnt/files/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 3e1390f37e0bfd0be5dafae25c8166b06ee03ff9 X-VCS-Branch: master Date: Mon, 6 Jan 2014 17:18:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 52d263c8-a486-41ac-a59d-f4c2fe4e3c7c X-Archives-Hash: 1a088a18cbfbdc6c3e58527c74010a76 commit: 3e1390f37e0bfd0be5dafae25c8166b06ee03ff9 Author: Justin Lecher gentoo org> AuthorDate: Mon Jan 6 17:18:25 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Jan 6 17:18:25 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3e1390f3 sci-electronics/tnt: Punt base.eclass Package-Manager: portage-2.2.8 --- sci-electronics/tnt/ChangeLog | 6 +- .../tnt/files/tnt-1.2.2-autotools.patch | 277 +++++++++++++++++++++ sci-electronics/tnt/metadata.xml | 2 +- sci-electronics/tnt/tnt-1.2.2.ebuild | 40 +-- 4 files changed, 303 insertions(+), 22 deletions(-) diff --git a/sci-electronics/tnt/ChangeLog b/sci-electronics/tnt/ChangeLog index e34c323..24b19c3 100644 --- a/sci-electronics/tnt/ChangeLog +++ b/sci-electronics/tnt/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for sci-electronics/tnt -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 06 Jan 2014; Justin Lecher tnt-1.2.2.ebuild, + +files/tnt-1.2.2-autotools.patch, metadata.xml: + Punt base.eclass + 24 Jun 2011; Justin Lecher tnt-1.2.2.ebuild: Streamlined fortran-2 eclass usage diff --git a/sci-electronics/tnt/files/tnt-1.2.2-autotools.patch b/sci-electronics/tnt/files/tnt-1.2.2-autotools.patch new file mode 100644 index 0000000..36fe517 --- /dev/null +++ b/sci-electronics/tnt/files/tnt-1.2.2-autotools.patch @@ -0,0 +1,277 @@ + bem/Makefile.am | 5 +++-- + calcCAP/Makefile.am | 3 ++- + calcRL/Makefile.am | 3 ++- + csdl/Makefile.am | 5 +++-- + gui/Makefile.am | 12 +++--------- + sppdgTcllib/Makefile.am | 3 ++- + sppdgTcllib/addressDialog/Makefile.am | 3 ++- + sppdgTcllib/addressDialog/configure.ac | 2 +- + sppdgTcllib/configure.ac | 2 +- + sppdgTcllib/console/Makefile.am | 7 +++---- + sppdgTcllib/console/configure.ac | 4 ++-- + sppdgTcllib/getFilePreview/Makefile.am | 3 ++- + sppdgTcllib/getFilePreview/configure.ac | 2 +- + sppdgTcllib/sgraph/Makefile.am | 3 ++- + sppdgTcllib/sgraph/configure.ac | 2 +- + units/Makefile.am | 3 ++- + 16 files changed, 32 insertions(+), 30 deletions(-) + +diff --git a/bem/Makefile.am b/bem/Makefile.am +index c2af1cd..9b784ca 100755 +--- a/bem/Makefile.am ++++ b/bem/Makefile.am +@@ -31,9 +31,10 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + lib/bem.tcl \ +- lib/bem_gpge.itcl \ ++ lib/bem_gpge.itcl \ + lib/bem_graphs.itcl \ + lib/bem_iterate.tcl \ + lib/bem_parameters.tcl \ +diff --git a/calcCAP/Makefile.am b/calcCAP/Makefile.am +index 703cb0f..ce34995 100755 +--- a/calcCAP/Makefile.am ++++ b/calcCAP/Makefile.am +@@ -30,7 +30,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + lib/calcCAP_exe.tcl \ + lib/calcCAP.tcl \ + lib/epl.bit \ +diff --git a/calcRL/Makefile.am b/calcRL/Makefile.am +index 34dbb8d..9c2986c 100755 +--- a/calcRL/Makefile.am ++++ b/calcRL/Makefile.am +@@ -31,7 +31,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_SCRIPTS = \ + lib/calcRL.tcl \ + lib/calcRL_exe.tcl \ + lib/pkgIndex.tcl +diff --git a/csdl/Makefile.am b/csdl/Makefile.am +index c49af20..2b74c89 100755 +--- a/csdl/Makefile.am ++++ b/csdl/Makefile.am +@@ -31,7 +31,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + csdl.tcl \ + csdl_hlcsdl.itcl \ + csdl_llcsdl.itcl \ +@@ -44,4 +45,4 @@ pkglib_SCRIPTS = \ + #--------------------------------------------------------------- + pkglibdir = $(libdir)/$(PACKAGE)$(PACKAGE_VERSION) + +- ++ +diff --git a/gui/Makefile.am b/gui/Makefile.am +index 44a4308..df8c284 100755 +--- a/gui/Makefile.am ++++ b/gui/Makefile.am +@@ -30,7 +30,8 @@ AUTOMAKE_OPTIONS = foreign + #--------------------------------------------------------------- + # tcl/tk scripts to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + canvas_functions.tcl \ + gui.tcl \ + gui_build.tcl \ +@@ -41,14 +42,7 @@ pkglib_SCRIPTS = \ + gui_xmission.tcl \ + pkgIndex.tcl \ + splash.tcl \ +- style.tcl +- +- +- +-#--------------------------------------------------------------- +-# Data files to be installed +-#--------------------------------------------------------------- +-pkglib_DATA = \ ++ style.tcl \ + MayoSPPDGlogo.gif \ + conductivity.list \ + loss_tangent.list \ +diff --git a/sppdgTcllib/Makefile.am b/sppdgTcllib/Makefile.am +index 589874b..e16b83e 100755 +--- a/sppdgTcllib/Makefile.am ++++ b/sppdgTcllib/Makefile.am +@@ -33,7 +33,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # Only one script that needs to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + pkgIndex.tcl + + #--------------------------------------------------------------- +diff --git a/sppdgTcllib/addressDialog/Makefile.am b/sppdgTcllib/addressDialog/Makefile.am +index 32fc525..47ef097 100755 +--- a/sppdgTcllib/addressDialog/Makefile.am ++++ b/sppdgTcllib/addressDialog/Makefile.am +@@ -14,7 +14,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + addressDialog.tcl \ + pkgIndex.tcl + +diff --git a/sppdgTcllib/addressDialog/configure.ac b/sppdgTcllib/addressDialog/configure.ac +index 488ed2c..288faf3 100755 +--- a/sppdgTcllib/addressDialog/configure.ac ++++ b/sppdgTcllib/addressDialog/configure.ac +@@ -21,7 +21,7 @@ AC_INIT(ADDRESSDIALOG, 1.0, schrauf@mayo.edu) + # we're going to use automake later. + #---------------------------------------------------------------- + AC_CONFIG_SRCDIR +-AM_INIT_AUTOMAKE(addressDialog, 1.0) ++AM_INIT_AUTOMAKE + + + #---------------------------------------------------------------- +diff --git a/sppdgTcllib/configure.ac b/sppdgTcllib/configure.ac +index e4e8d54..6e010e1 100755 +--- a/sppdgTcllib/configure.ac ++++ b/sppdgTcllib/configure.ac +@@ -28,7 +28,7 @@ AC_INIT(sppdgTcllib, 1.0, techentin.robert@mayo.edu) + # we're going to use automake later. + #---------------------------------------------------------------- + AC_CONFIG_SRCDIR +-AM_INIT_AUTOMAKE(sppdgTcllib, 1.0) ++AM_INIT_AUTOMAKE + + + #--------------------------------------------------------------- +diff --git a/sppdgTcllib/console/Makefile.am b/sppdgTcllib/console/Makefile.am +index 92d5a2f..9bbe657 100755 +--- a/sppdgTcllib/console/Makefile.am ++++ b/sppdgTcllib/console/Makefile.am +@@ -33,13 +33,12 @@ AUTOMAKE_OPTIONS = foreign + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + console.tcl \ + console_demo.tcl \ + tkcon.tcl \ +- pkgIndex.tcl +- +-pkglib_DATA = \ ++ pkgIndex.tcl \ + README + + #--------------------------------------------------------------- +diff --git a/sppdgTcllib/console/configure.ac b/sppdgTcllib/console/configure.ac +index 1ce7a3c..bf4d12c 100755 +--- a/sppdgTcllib/console/configure.ac ++++ b/sppdgTcllib/console/configure.ac +@@ -22,14 +22,14 @@ + # Declare the package name and version. + # All the bouquets and brickbats go to Bob. :-) + #---------------------------------------------------------------- +-AC_INIT(console, 1.1, techentin.robert@mayo.edu) ++AC_INIT([console], [1.1], techentin.robert@mayo.edu) + + #---------------------------------------------------------------- + # Give autoconf a point of reference, and tell it that + # we're going to use automake later. + #---------------------------------------------------------------- + AC_CONFIG_SRCDIR +-AM_INIT_AUTOMAKE(console, 1.1) ++AM_INIT_AUTOMAKE + + + #---------------------------------------------------------------- +diff --git a/sppdgTcllib/getFilePreview/Makefile.am b/sppdgTcllib/getFilePreview/Makefile.am +index 94394c3..c0c6394 100755 +--- a/sppdgTcllib/getFilePreview/Makefile.am ++++ b/sppdgTcllib/getFilePreview/Makefile.am +@@ -32,7 +32,8 @@ AUTOMAKE_OPTIONS = foreign + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + getFilePreview.tcl \ + pkgIndex.tcl + +diff --git a/sppdgTcllib/getFilePreview/configure.ac b/sppdgTcllib/getFilePreview/configure.ac +index ccf33a3..50b1838 100755 +--- a/sppdgTcllib/getFilePreview/configure.ac ++++ b/sppdgTcllib/getFilePreview/configure.ac +@@ -28,7 +28,7 @@ AC_INIT(getFilePreview, 1.0, techentin.robert@mayo.edu) + # we're going to use automake later. + #---------------------------------------------------------------- + AC_CONFIG_SRCDIR +-AM_INIT_AUTOMAKE(getFilePreview, 1.0) ++AM_INIT_AUTOMAKE + + + #---------------------------------------------------------------- +diff --git a/sppdgTcllib/sgraph/Makefile.am b/sppdgTcllib/sgraph/Makefile.am +index b02a876..b1da3e1 100755 +--- a/sppdgTcllib/sgraph/Makefile.am ++++ b/sppdgTcllib/sgraph/Makefile.am +@@ -32,7 +32,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + sgraph.tcl \ + pkgIndex.tcl + +diff --git a/sppdgTcllib/sgraph/configure.ac b/sppdgTcllib/sgraph/configure.ac +index 8eb7ef7..e28b7dd 100755 +--- a/sppdgTcllib/sgraph/configure.ac ++++ b/sppdgTcllib/sgraph/configure.ac +@@ -29,7 +29,7 @@ AC_INIT(SGRAPH, 1.0, zahn.sharon@mayo.edu) + # we're going to use automake later. + #---------------------------------------------------------------- + AC_CONFIG_SRCDIR +-AM_INIT_AUTOMAKE(sgraph, 1.0) ++AM_INIT_AUTOMAKE + + + #---------------------------------------------------------------- +diff --git a/units/Makefile.am b/units/Makefile.am +index c47ec3c..ea941a9 100755 +--- a/units/Makefile.am ++++ b/units/Makefile.am +@@ -31,7 +31,8 @@ AUTOMAKE_OPTIONS = foreign subdir-objects + #--------------------------------------------------------------- + # tcl/tk scripts that may need to be installed. + #--------------------------------------------------------------- +-pkglib_SCRIPTS = \ ++scriptsdir=${pkgdatadir}/scripts ++scripts_DATA = \ + units.tcl \ + pkgIndex.tcl \ + units.html diff --git a/sci-electronics/tnt/metadata.xml b/sci-electronics/tnt/metadata.xml index 2034b72..ce0e016 100644 --- a/sci-electronics/tnt/metadata.xml +++ b/sci-electronics/tnt/metadata.xml @@ -1,5 +1,5 @@ - sci-electronics + sci-electronics diff --git a/sci-electronics/tnt/tnt-1.2.2.ebuild b/sci-electronics/tnt/tnt-1.2.2.ebuild index e133718..397cd99 100644 --- a/sci-electronics/tnt/tnt-1.2.2.ebuild +++ b/sci-electronics/tnt/tnt-1.2.2.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -inherit autotools base eutils fortran-2 toolchain-funcs +AUTOTOOLS_AUTORECONF=true + +inherit autotools-utils fortran-2 toolchain-funcs DESCRIPTION="MoM 2.5 D stripline simulator" HOMEPAGE="http://mmtl.sourceforge.net/" @@ -19,45 +21,43 @@ RDEPEND=" dev-lang/tcl dev-tcltk/tcllib dev-tcltk/itcl - dev-tcltk/bwidget - virtual/fortran" + dev-tcltk/bwidget" DEPEND="${RDEPEND} dev-texlive/texlive-latex dev-tex/latex2html media-gfx/imagemagick" -PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui}.patch ) +PATCHES=( "${FILESDIR}/${P}"-{calc,bem-nmmtl,namespaces,f77,tkcon,docs,gui,autotools}.patch ) src_prepare() { - base_src_prepare - #adjust new document location in gui - sed -i "s/package_name/${PF}/" gui/splash.tcl - sed -i "s/package_name/${PF}/" gui/gui_help.tcl + sed -i "s/package_name/${PF}/" gui/splash.tcl || die + sed -i "s/package_name/${PF}/" gui/gui_help.tcl || die - eautoreconf + autotools-utils_src_prepare } -src_install () { - default +AUTOTOOLS_IN_SOURCE_BUILD=1 +src_install () { # tcl cannot handle the archives created by dodoc - dohtml COPYING || die if use doc; then - dodoc doc/*.pdf doc/*.png - dohtml doc/user-guide/* + DOCS=( doc/*.pdf doc/*.png ) + HTML_DOCS=( doc/user-guide/* ) fi + autotools-utils_src_install + # Install icon convert gui/logo.gif gui/tnt.png docinto "examples" dodoc examples/* - newicon gui/tnt.png tnt.png + doicon gui/tnt.png make_desktop_entry ${PN} "tnt" ${PN} } pkg_postinst() { - 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." + 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." }