Version Bump

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

diff --git a/sci-chemistry/gsim/ChangeLog b/sci-chemistry/gsim/ChangeLog
index 70f4a94d9d011c00d719c7999603cae15044646a..4bc41fb6261e790906767b1894b947c3267bc6b3 100644 (file)
--- a/sci-chemistry/gsim/ChangeLog
+++ b/sci-chemistry/gsim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/gsim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.3 2011/04/10 07:12:58 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/ChangeLog,v 1.4 2011/08/31 14:28:51 jlec Exp $
+
+*gsim-0.20.1 (31 Aug 2011)
+
+  31 Aug 2011; Justin Lecher <jlec@gentoo.org> +files/0.20.1-build.conf.patch,
+  +gsim-0.20.1.ebuild, metadata.xml:
+  Version Bump
 
   10 Apr 2011; Torsten Veller <tove@gentoo.org> gsim-0.19.1.ebuild:
   Add missing die: || "..." -> || die "..."

diff --git a/sci-chemistry/gsim/Manifest b/sci-chemistry/gsim/Manifest
index 2b90ea437b6558b77ec2d588b552b27c04363483..62e94923c33d4eab5735d772b38848f9f3a80f06 100644 (file)
--- a/sci-chemistry/gsim/Manifest
+++ b/sci-chemistry/gsim/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.19.1-build.conf.patch 2248 RMD160 02bd4a029e59bdd1d932154b6dded8e1946972ba SHA1 228d604619fe146a3609dcc7dc22359c71b1431e SHA256 3ffbcdf837737f18292b31a865c7836cc2ef9aaf5d8e6653e5e76bd5ad657531
+AUX 0.20.1-build.conf.patch 1890 RMD160 aae6909aeba16dde57503d7557e8c2c2f2c8dcac SHA1 5aa34cc8c46d076949a8566c090d5d32b3bb85cd SHA256 e5949f23eeab361149b4455b14d492f7e6f2c65f9ae6b816935c64e91aaa668b
 DIST gsim-0.19.1.tar.gz 3374301 RMD160 abd1c2402073584498a219e9195381f327efece5 SHA1 1e2640c139061c71fcf10bdadbda00eb1485d4ed SHA256 487c67869e561a334a0030392156b1bcb5663624e764b55cc4ca5a086c05a6a2
+DIST gsim-0.20.1.tar.gz 6088362 RMD160 a30863c2cae9ba019abea7e9a9aa926100b8ee19 SHA1 37250d624dbc84bb38b3e22b38f4d114019ec1db SHA256 0a63c52e3dc14450a3c58fb59f8dd51dfd5c685d2c7ef8f5448760c0b571fe7c
 EBUILD gsim-0.19.1.ebuild 1683 RMD160 4a58de166a04577d74b61db352bf954bc54a509c SHA1 83ef65d1ee374ba207a452e51567d7c5d5a54ee2 SHA256 7ae3f0cf2c07d4facb72578472eb5bbb6f0fe9aa048a7cec64858ad12145d614
-MISC ChangeLog 592 RMD160 92594e23cf4de977774272b70327bb8ac20fa559 SHA1 551e47f3e966e719f34834e633b135226ce392f2 SHA256 877ec3bf2ea14cdb33cb863b8571619691dd470e89cfe49d6b26dcd335daae04
-MISC metadata.xml 278 RMD160 e352d75d894fe99de02ea93b7def8cef27b93eac SHA1 a2fb7d10464705255bd76ab334026dbf50f34987 SHA256 ff060d868396cdbb49229295714d48722792e513ed8ea234ef69cd4e97429e04
+EBUILD gsim-0.20.1.ebuild 1692 RMD160 72458fbc0eb365591bbd12d7ca62e3c70ff796b4 SHA1 3a7e510e012f9955a263fb4c0b2fa54f4f25d16c SHA256 d1c4991c2196b770db1826f30dc666dd74421cf667d1375722696bc3786f8456
+MISC ChangeLog 752 RMD160 031e837e6dd00a807d1892a99813933a683a42d0 SHA1 e41d90e126495788b64c2d6994b01e99376311ae SHA256 102e364643592384baf9a1ffe40280b5695a0470c157e3fa49501d33b4b99e74
+MISC metadata.xml 284 RMD160 480f282753b645f32a269e3171b2997e26ee78d1 SHA1 8dc2f602d3b58cb2b70443464c7b104b8e670d4c SHA256 346c39bfb62e65ca1e8f4c4ad4fa484457d1f08b1946a36fc6dd0f04fd1f23a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREIAAYFAk2hWH8ACgkQV3J2n04Eauz25wCfcz4pGHeNDfUat6wPOetGsI+s
-iYgAn3nN6vb5m+BxVps72FPsJDDkw9PT
-=hc3G
+iEYEAREKAAYFAk5eRSkACgkQgAnW8HDreRYMzQCdEjRgDi6nWbA4fXWKkbXHtV9p
+LPoAn21feSN+SSVJUdo5L80nJoOY1tge
+=rWCa
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/gsim/files/0.20.1-build.conf.patch b/sci-chemistry/gsim/files/0.20.1-build.conf.patch
new file mode 100644 (file)
index 0000000..e0c68d2
--- /dev/null
+++ b/sci-chemistry/gsim/files/0.20.1-build.conf.patch
@@ -0,0 +1,44 @@
+ gsim.pro |   25 +++++++++++++++----------
+ 1 files changed, 15 insertions(+), 10 deletions(-)
+
+diff --git a/gsim.pro b/gsim.pro
+index 7316aee..9278b6a 100755
+--- a/gsim.pro
++++ b/gsim.pro
+@@ -16,21 +16,26 @@
+ #CONFIG+=use_script
+ 
+ # Change directories locations for libcmatrix, MinUIT and muParser libraries
+-unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \
+-                    /home/vjuser/gsim/Minuit2/include \
+-                    /usr/include/muParser
++#unix:INCLUDEPATH += /home/vjuser/gsim/libcmatrixR3/include \
++#                    /home/vjuser/gsim/Minuit2/include \
++#                    /usr/include/muParser
+ 
+-win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
++#win32:INCLUDEPATH += "C:\gsim\libcmatrixR3\include" "C:\gsim\Minuit2\include" "C:\gsim\muparser\include"
+ 
+-unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib  -lMinuit2 -L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser
++#unix:LIBS += -lcmatrix -L/home/vjuser/gsim/libcmatrixR3/lib  -lMinuit2 -L/home/vjuser/gsim/Minuit2/lib -L/home/vjuser/gsim/muparser/lib -lmuparser
+ 
+-win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
++#win32:LIBS += -lcmatrix -L"C:\gsim\libcmatrixR3\lib" -lMinuit2 -L"C:\gsim\Minuit2\lib" -L"C:\gsim\muparser\lib" -lmuparser
+ 
+ #Change directories location for libEMF (if used)
+-use_emf {
+-      DEFINES+=USE_EMF_OUTPUT
+-      unix:LIBS +=-lEMF -L/usr/include/libEmf
+-      win32:LIBS +=-lgdi32
++#use_emf {
++#     DEFINES+=USE_EMF_OUTPUT
++#     unix:LIBS +=-lEMF -L/usr/include/libEmf
++#     win32:LIBS +=-lgdi32
++#}
++
++GSIM_ROOT = .
++!include( $$GSIM_ROOT/build.conf ) {
++  message( "You need a build.conf file with local settings!" )
+ }
+ 
+ #################################################################################################

diff --git a/sci-chemistry/gsim/gsim-0.20.1.ebuild b/sci-chemistry/gsim/gsim-0.20.1.ebuild
new file mode 100644 (file)
index 0000000..fa18fc0
--- /dev/null
+++ b/sci-chemistry/gsim/gsim-0.20.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gsim/gsim-0.20.1.ebuild,v 1.1 2011/08/31 14:28:51 jlec Exp $
+
+EAPI="3"
+
+inherit eutils qt4-r2
+
+DESCRIPTION="Programm for visualisation and processing of experimental and simulated NMR spectra"
+HOMEPAGE="http://sourceforge.net/projects/gsim"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="emf opengl"
+
+RDEPEND="
+       x11-libs/qt-svg:4
+       dev-cpp/muParser
+       >=sci-libs/libcmatrix-3.9.0
+       virtual/blas
+       media-libs/freetype
+       emf? ( media-libs/libemf )
+       opengl? ( x11-libs/qt-opengl:4 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PV}-build.conf.patch )
+DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
+
+src_prepare() {
+       edos2unix ${PN}.pro
+
+       qt4-r2_src_prepare
+
+       cat >> build.conf <<- EOF
+       INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
+               "${EPREFIX}/usr/include/Minuit2" \
+               "${EPREFIX}/usr/include"
+       LIBS += -lcmatrix  -lMinuit2 -lmuparser $(pkg-config --libs cblas)
+       EOF
+
+       use opengl && echo "CONFIG+=use_opengl" >> build.conf
+
+       if use emf; then
+               cat >> build.conf <<- EOF
+               CONFIG+=use_emf
+               DEFINES+=USE_EMF_OUTPUT
+               LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
+               EOF
+       fi
+       sed \
+               -e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
+               -e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
+               -i mainform.h || die
+}
+
+src_install() {
+       qt4-r2_src_install
+       dobin ${PN} || die "no ${PN}"
+       insinto /usr/share/${PN}
+       doins -r images ${PN}.ico || die "no images"
+       insinto /usr/share/${PN}/ui
+       doins *.ui || die
+}

diff --git a/sci-chemistry/gsim/metadata.xml b/sci-chemistry/gsim/metadata.xml
index fa9b76fee4b3740391e598df7787ed520499e865..2c3fb100ce167fba4c40226f647efac05f398ecf 100644 (file)
--- a/sci-chemistry/gsim/metadata.xml
+++ b/sci-chemistry/gsim/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<use>
-       <flag name='emf'>Support for .emf export</flag>
-</use>
+       <herd>sci</herd>
+       <maintainer>
+               <email>jlec@gentoo.org</email>
+       </maintainer>
+       <use>
+               <flag name="emf">Support for .emf export</flag>
+       </use>
 </pkgmetadata>