diff options
Diffstat (limited to 'sci-visualization')
-rw-r--r-- | sci-visualization/Manifest.gz | bin | 5349 -> 5354 bytes | |||
-rw-r--r-- | sci-visualization/gwyddion/Manifest | 10 | ||||
-rw-r--r-- | sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch | 19 | ||||
-rw-r--r-- | sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch | 33 | ||||
-rw-r--r-- | sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild (renamed from sci-visualization/gwyddion/gwyddion-2.44.ebuild) | 18 | ||||
-rw-r--r-- | sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild (renamed from sci-visualization/gwyddion/gwyddion-2.47.ebuild) | 40 | ||||
-rw-r--r-- | sci-visualization/gwyddion/gwyddion-2.55.ebuild | 75 | ||||
-rw-r--r-- | sci-visualization/gwyddion/metadata.xml | 4 |
8 files changed, 156 insertions, 43 deletions
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz Binary files differindex e2fb7c75386e..930ad13c875d 100644 --- a/sci-visualization/Manifest.gz +++ b/sci-visualization/Manifest.gz diff --git a/sci-visualization/gwyddion/Manifest b/sci-visualization/gwyddion/Manifest index b624a75182d8..79064794b2b4 100644 --- a/sci-visualization/gwyddion/Manifest +++ b/sci-visualization/gwyddion/Manifest @@ -1,5 +1,9 @@ +AUX gwyddion-2.47-cfitsio.patch 863 BLAKE2B 9bfb48ba7fc3dd75cba86a0ca1910c68f6affa78722723ab5945354e9d7fd477ed5b7d5df320b031a693fa9c3187270f7a1bbf37ee3d914a215f18af7ae0ae94 SHA512 5558022a002e589a358e2560ea23eb68b1b3c01536663f11dfd6e84f8927220b56ca16b00ffc9481a14b3fb0b605d1fcb71ff9529a5b3561a6f83a2aa7785db8 +AUX gwyddion-2.55-automagic.patch 1441 BLAKE2B 3f6096392742beea11c908035efebb24129ebd8a4c7207f35615c7c1b97842f5ad774bcf24369d50cb7e0270db8b46c39dd4c4074c660dd00e1a2a9150c6fa3a SHA512 6a83a723e5a82c8123b0739aba8d638d641a776fd807f8dedbff68cd035256cf3b1941b89a039bf5fd5ad24b3bf2f25237dc13f89797e7eace0e1832f74a8c7e DIST gwyddion-2.44.tar.xz 3517624 BLAKE2B c32dd33e2fe6c6a09062807db1a25fd54d3becc12bb806a21572f992429cc52a2180221c5627ab49d44f24c13f9928e3825c1b833adff1523d0caa092829ecf7 SHA512 c80a0e4e9dde2f669763629d34dacc0015770c4704a10fc820f4d8e75b4f4275852162653f0c6c52674ed76162861af860de6741466d939066bfea3fb584d2ff DIST gwyddion-2.47.tar.xz 3974120 BLAKE2B c9a0241fe509a2f067c16f77d2b02885505d47c3ba0f25a44449e0d5ad05ce8596784392d8f1265823577aeebbab7ad9c96a39625b01bf11da3cebeb1c6453cc SHA512 a6bbda2d32ec013a9d6c7e2b6dbf2cef08d8f964099c0fda511bc92c16c943459f29d52f784a599466af65027aaae3aaeb1b79e56c40e39bc47019044eecd3e6 -EBUILD gwyddion-2.44.ebuild 1859 BLAKE2B 852de2523809ff2264f22b9ddec52600829eeb766a730cdf145710c620fb84d3e33a6a140310688ab48cfeba01a57d55f50c514d98fa4b047dc83940f24ea546 SHA512 31de84a45d0f7a66f2b3bed3f32e27de4ac9092e613c4150b0ad654ac5c2094128f1321fb5035c37586699d0e89177987225d487fd2fea4b29148fcaff72a486 -EBUILD gwyddion-2.47.ebuild 1775 BLAKE2B 43093b1a35190a088e8d9412c94ddf047a22ba430abf7ab5388409a5d284dbb5c2641e29a9d55e7e9d98e8d2bf123c1661603f63e55e6710f86d04afbb1141e6 SHA512 fccecfb0efde76cf7b9fce6d3aee1096f0e4fec34e2e4745e99f118cb18c2aad86c0cde9bae358be3b21f14285e470cc70e095d73ccec5dc9061fd4d338c7989 -MISC metadata.xml 817 BLAKE2B 33b7a7f0760d4c3e1c3dccbee9c7a0bd6be640635e0863edd75e52600f7b498d5b10a528771268f0817be30abe18e4475169ec9c31216e75fbf4894c715d9868 SHA512 feca824ec29a8937e34219b327a70db2efbc6d0cef7c0d0539efe282ec0e7a657fa3897faf20afb640dafc4420385d7bdbda8124c851e9f63b77f635273766e5 +DIST gwyddion-2.55.tar.xz 4607560 BLAKE2B 30489d980d3feb6986be4041b59c847673ee589674d5913b4508f28f072eb2f570b98f0b1be01dcf6e1d45e86607582967fd83fe3c859172fcdef3c7bffae741 SHA512 680c33b1f7d36de31274869e7f0af9c06030e04779d6b59f06860ae3f47db4ad45bbf3ee2219bb7b6c01807a807aeafa4f5d0aefe20601e0dda1011acf59fc8e +EBUILD gwyddion-2.44-r1.ebuild 1625 BLAKE2B f22904c93c4938729297f920ac8a9bf1c231f9c75ea7d983bd24f960a6207812a599306be9f4390a790f54dc13320af2725303ff868dc174878591ea0d051c16 SHA512 f476b7f13e496cde117de6fded22676324bb76d093e2aee05c0291c45a242372f7c315c9a4975fa99e0085a38ecb4f274cb0c34bdece7cc51101d58e37ddecfa +EBUILD gwyddion-2.47-r1.ebuild 1478 BLAKE2B 4cfc6c856151e096736b0f88bee67fd2f32969ea3cce0de7479e3acb01dae033e0ea09ff69edc3fb90e8ca9d7f1ce9700b93fc7ae794e1329e2a69342df4085c SHA512 84f1b06f7dc4c0c896cb0b3f8467c6cb732024abaa44d62087f73bdb77d0c5f3c314fb34990b596e3aeb9ba9474a1a04c7c2969d77a4056a374af0f2c5a63380 +EBUILD gwyddion-2.55.ebuild 1584 BLAKE2B 16f5b61c897c112a9009661318570ffeb43178d4424f7fe7725860819eeb74d1bb9aed279c69c0d2db29db5d74323567b4e843b12b24855a46f7162e1dd86f0a SHA512 4c7e96cca6efcc0348d278e1e696be31463c744b4c498153c16820eaa594fd34c6a35c8c729a1752856ec0275ea934e7724806ac01eaf61d2db2d81bd10e2b01 +MISC metadata.xml 938 BLAKE2B a6bdd3f5aa17f3846d6e44ebbb6f7e230253df851819bd3ce27be44d6e288590f149576fb2bbd8e19ad04c757d58675f6b96d57571c0c92eae8dde432a08b2ee SHA512 2e90996291b1a4ca744a87af2621e3f8afcf39660a550e82d1b018ffffc41123897a923702ba61718ca97586d95672dee8777579cc4f666e57df88e534f555b1 diff --git a/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch new file mode 100644 index 000000000000..9380eafa9055 --- /dev/null +++ b/sci-visualization/gwyddion/files/gwyddion-2.47-cfitsio.patch @@ -0,0 +1,19 @@ +diff -ruN gwyddion-2.47.orig/configure.ac gwyddion-2.47/configure.ac +--- gwyddion-2.47.orig/configure.ac 2016-11-18 11:17:57.000000000 +0100 ++++ gwyddion-2.47/configure.ac 2020-01-24 04:39:18.892183563 +0100 +@@ -632,11 +632,13 @@ + ############################################################################# + # CFITSIO + # Optional. Used for FITS image import. +-enable_cfitsio=yes +-PKG_CHECK_MODULES(CFITSIO, [cfitsio], ++GWY_WITH([cfitsio],,[build with cfitsio support]) ++if test "x$enable_cfitsio" != "xno"; then ++ PKG_CHECK_MODULES(CFITSIO, [cfitsio], + [AC_DEFINE(HAVE_CFITSIO,1, + [Define if we have the cfitsio package.])], + [enable_cfitsio=no]) ++fi + AM_CONDITIONAL([HAVE_CFITSIO],[test x$enable_cfitsio != xno]) + + ############################################################################# diff --git a/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch new file mode 100644 index 000000000000..405a2552f08b --- /dev/null +++ b/sci-visualization/gwyddion/files/gwyddion-2.55-automagic.patch @@ -0,0 +1,33 @@ +diff -ruN gwyddion-2.55.orig/configure.ac gwyddion-2.55/configure.ac +--- gwyddion-2.55.orig/configure.ac 2019-11-04 10:25:16.000000000 +0100 ++++ gwyddion-2.55/configure.ac 2020-01-24 05:22:15.264763441 +0100 +@@ -634,21 +634,25 @@ + ############################################################################# + # OpenEXR + # Optional. Used for HDR greyscale OpenEXR pixmap import/export. +-enable_exr=$have_cxx +-PKG_CHECK_MODULES(EXR, [OpenEXR], ++GWY_WITH([exr],,[build with OpenEXR support]) ++if test "x$enable_exr" != "xno" && "x$have_cxx" != "xno"; then ++ PKG_CHECK_MODULES(EXR, [OpenEXR], + [AC_DEFINE(HAVE_EXR,1, + [Define if we have the OpenEXR package.])], + [enable_exr=no]) ++fi + AM_CONDITIONAL([HAVE_EXR],[test "x$enable_exr" != xno]) + + ############################################################################# + # CFITSIO + # Optional. Used for FITS image import. +-enable_cfitsio=yes +-PKG_CHECK_MODULES(CFITSIO, [cfitsio], ++GWY_WITH([cfitsio],,[build with cfitsio support]) ++if test "x$enable_cfitsio" != "xno"; then ++ PKG_CHECK_MODULES(CFITSIO, [cfitsio], + [AC_DEFINE(HAVE_CFITSIO,1, + [Define if we have the cfitsio package.])], + [enable_cfitsio=no]) ++fi + AM_CONDITIONAL([HAVE_CFITSIO],[test "x$enable_cfitsio" != xno]) + + ############################################################################# diff --git a/sci-visualization/gwyddion/gwyddion-2.44.ebuild b/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild index 98103e3b4bb5..47c8b1ba0853 100644 --- a/sci-visualization/gwyddion/gwyddion-2.44.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.44-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -PYTHON_COMPAT=( python2_7 ) AUTOTOOLS_IN_SOURCE_BUILD=1 -inherit autotools-utils fdo-mime gnome2-utils python-single-r1 +inherit autotools-utils fdo-mime gnome2-utils DESCRIPTION="Framework for Scanning Mode Microscopy data analysis" HOMEPAGE="http://gwyddion.net/" @@ -15,7 +14,7 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="doc fits fftw gnome nls opengl perl python ruby sourceview xml X" +IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X" RDEPEND=" media-libs/libpng:0 @@ -28,10 +27,6 @@ RDEPEND=" gnome? ( gnome-base/gconf:2 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl ) - python? ( - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 )" @@ -45,10 +40,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" MAKEOPTS+=" V=1" -pkg_setup() { - use python && python-single-r1_pkg_setup -} - src_configure() { local myeconfargs=( --disable-rpath @@ -58,7 +49,7 @@ src_configure() { $(use_enable python pygwy) $(use_enable fits cfitsio) $(use_with perl) - $(use_with python) + --without-python $(use_with ruby) $(use_with fftw fftw3) $(use_with opengl gl) @@ -71,7 +62,6 @@ src_configure() { src_install() { autotools-utils_src_install - use python && dodoc modules/pygwy/README.pygwy } pkg_postinst() { diff --git a/sci-visualization/gwyddion/gwyddion-2.47.ebuild b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild index cc4509980eb7..d79ead6a58a8 100644 --- a/sci-visualization/gwyddion/gwyddion-2.47.ebuild +++ b/sci-visualization/gwyddion/gwyddion-2.47-r1.ebuild @@ -1,11 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit fdo-mime gnome2-utils python-single-r1 +inherit autotools gnome2-utils xdg DESCRIPTION="Framework for Scanning Mode Microscopy data analysis" HOMEPAGE="http://gwyddion.net/" @@ -13,8 +11,8 @@ SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="doc fits fftw gnome nls opengl perl python ruby sourceview xml X" +KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fits fftw gnome nls opengl perl ruby sourceview xml X" RDEPEND=" media-libs/libpng:0= @@ -27,10 +25,6 @@ RDEPEND=" gnome? ( gnome-base/gconf:2 ) opengl? ( virtual/opengl x11-libs/gtkglext ) perl? ( dev-lang/perl:= ) - python? ( - ${PYTHON_DEPS} - dev-python/pygtk:2[${PYTHON_USEDEP}] - ) ruby? ( dev-ruby/narray ) sourceview? ( x11-libs/gtksourceview:2.0 ) xml? ( dev-libs/libxml2:2 )" @@ -40,10 +34,13 @@ DEPEND="${RDEPEND} doc? ( dev-util/gtk-doc ) " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +PATCHES=( + "${FILESDIR}/${PN}-2.47-cfitsio.patch" +) -pkg_setup() { - use python && python-single-r1_pkg_setup +src_prepare() { + default + eautoreconf } src_configure() { @@ -52,10 +49,10 @@ src_configure() { --without-kde4-thumbnailer \ $(use_enable doc gtk-doc) \ $(use_enable nls) \ - $(use_enable python pygwy) \ - $(use_enable fits cfitsio) \ + --disable-pygwy \ + $(use_with fits cfitsio) \ $(use_with perl) \ - $(use_with python) \ + --without-python \ $(use_with ruby) \ $(use_with fftw fftw3) \ $(use_with opengl gl) \ @@ -64,20 +61,11 @@ src_configure() { $(use_with X x) } -src_install() { - default - use python && dodoc modules/pygwy/README.pygwy -} - pkg_postinst() { use gnome && gnome2_gconf_install - fdo-mime_desktop_database_update + xdg_pkg_postinst } pkg_prerm() { use gnome && gnome2_gconf_uninstall } - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/sci-visualization/gwyddion/gwyddion-2.55.ebuild b/sci-visualization/gwyddion/gwyddion-2.55.ebuild new file mode 100644 index 000000000000..38eb5f9eca44 --- /dev/null +++ b/sci-visualization/gwyddion/gwyddion-2.55.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools gnome2-utils xdg + +DESCRIPTION="Framework for Scanning Mode Microscopy data analysis" +HOMEPAGE="http://gwyddion.net/" +SRC_URI="http://gwyddion.net/download/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="doc fits gnome nls openexr opengl perl ruby sourceview xml X" + +RDEPEND=" + >=dev-libs/glib-2.32 + dev-libs/libzip + media-libs/libpng:0= + >=sci-libs/fftw-3.1:3.0= + x11-libs/cairo + >=x11-libs/gtk+-2.18:2 + x11-libs/libXmu + x11-libs/pango + fits? ( sci-libs/cfitsio ) + gnome? ( gnome-base/gconf:2 ) + openexr? ( media-libs/openexr:= ) + opengl? ( virtual/opengl x11-libs/gtkglext ) + perl? ( dev-lang/perl:= ) + ruby? ( dev-ruby/narray ) + sourceview? ( x11-libs/gtksourceview:2.0 ) + xml? ( dev-libs/libxml2:2 )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.55-automagic.patch" +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --disable-rpath \ + --without-kde4-thumbnailer \ + $(use_enable doc gtk-doc) \ + $(use_enable nls) \ + --disable-pygwy \ + $(use_with fits cfitsio) \ + $(use_with perl) \ + --without-python \ + $(use_with ruby) \ + $(use_with opengl gl) \ + $(use_with openexr exr) \ + $(use_with sourceview gtksourceview) \ + $(use_with xml libxml2) \ + $(use_with X x) \ + --with-zip=libzip +} + +pkg_postinst() { + use gnome && gnome2_gconf_install + xdg_pkg_postinst +} + +pkg_prerm() { + use gnome && gnome2_gconf_uninstall +} diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml index 97387838bbc5..b4a33560f643 100644 --- a/sci-visualization/gwyddion/metadata.xml +++ b/sci-visualization/gwyddion/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>dilfridge@gentoo.org</email> + <name>Andreas K. Huettel</name> + </maintainer> <maintainer type="project"> <email>sci@gentoo.org</email> <name>Gentoo Science Project</name> |