diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /sci-chemistry/wxmacmolplt | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'sci-chemistry/wxmacmolplt')
| -rw-r--r-- | sci-chemistry/wxmacmolplt/Manifest | 4 | ||||
| -rw-r--r-- | sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch | 7 | ||||
| -rw-r--r-- | sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild | 23 |
3 files changed, 18 insertions, 16 deletions
diff --git a/sci-chemistry/wxmacmolplt/Manifest b/sci-chemistry/wxmacmolplt/Manifest index 4debb3518814..bfd3f0f96752 100644 --- a/sci-chemistry/wxmacmolplt/Manifest +++ b/sci-chemistry/wxmacmolplt/Manifest @@ -1,4 +1,4 @@ -AUX wxmacmolplt-7.5-glew.patch 415 BLAKE2B 733398664fae6fa3a6d11026a085010381998c68b2032958e3c7aa6516eb8578d08656b0ff5fcd2742c52f8b20053241a140b207ca08509396dd7177ed5247b4 SHA512 4d15247fbb5c2d9a60e7427b2c2f91d8a8f82cc457c681687f3046eda8e913125a0e041fd5d28744e0b12fe96b71280432b27bcdea5b7a8af7718b2f2d820d9e +AUX wxmacmolplt-7.5-glew.patch 232 BLAKE2B 9e0bd2849cc20664ca4a6b6678d2d78a723ae3e730225355dd70db0cac56d501c14aaa34d86d2ff87932feb950178a7245a943b763bde728f64a07a49ed4ba29 SHA512 cf1f77f9a86224b866f55154316a044314fda47a82de9b5be4ee58ed4ea8f4a07f9540e7060f477249b773e147739f15f43df293110045bdbca9567c60fbd5dc DIST wxmacmolplt-7.5.tar.gz 1965376 BLAKE2B 01033266ae66a215582a62690e792ca4ae82c8a8885fe277e2e77ee67ff70f02f6a9c10467ea6f3cee15933c6c89ba3c6137c9d29e47322ac4f395a3efd41383 SHA512 a1064d5068136b2a91328c7f912ff57d4741081d6d61437e7b4567fbf732917485b391493d637b8892bdad50b539363cfa9c778bb35407a9c0a2bfed20e42bc0 -EBUILD wxmacmolplt-7.5-r1.ebuild 930 BLAKE2B 5eedb7b7ba03b601a466ab9058fb0e2c1bea1d6da37ec0641fa15be58bbe616f358b5683cb21531c1b66b64d66ac0d9ce7ed5235d010dbab177da4ae1f25c95c SHA512 4306d954b510e242a4ede6bdf56c53ea5b2e73e9d8ddcfc9fd8ffe52e8bcceae7b3e9b7d327f87e8005c919b3c061d501838001cf7f2b935db9ef359be7946d8 +EBUILD wxmacmolplt-7.5-r1.ebuild 986 BLAKE2B 67cccea1d2e7886ee67f78ac54548047c2fe889dedfef45956a4614149d5597fd0376f0f01fd59085c9f925faa2284c2c22d4bae2d8ee98f2eca3be6b06e96ed SHA512 6e1d9051621a36deb7aeb997aa93a0b5becea1b3f7512fc56d2ee97788b5a9bedace25fb40a7a7b4e77a76830e7f8aa61ad0c32ea3e1afdb66b744197d50daf0 MISC metadata.xml 635 BLAKE2B 16b84b540cfe7fd49b9087c530ee49e035fc930a392dfaaef798338b3361c2b1d11626020d56de871066998f0e88ab39c3a6fac0633b3f8b07864a9c3424d0ae SHA512 d9bddd02379c3a39633028fbc6d0645ea9c46c344781e2c754539afa35577967a02e5c44278ec0fa015d0b9ba7f8fdeb0c9ad14d72d6abcaba85d0021c426f76 diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch index 08986db5bff2..809d7723cbb0 100644 --- a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch +++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.5-glew.patch @@ -1,12 +1,11 @@ -diff -urN wxmacmolplt-7.4.2.orig/configure.ac wxmacmolplt-7.4.2/configure.ac ---- wxmacmolplt-7.4.2.orig/configure.ac 2010-12-05 02:48:29.000000000 +0300 -+++ wxmacmolplt-7.4.2/configure.ac 2010-12-06 19:30:24.000000000 +0300 +--- a/configure.ac ++++ b/configure.ac @@ -20,7 +20,7 @@ ;; *) HOST=LINUX - LIBGL="-lGL -lGLU" -+ LIBGL=`pkg-config --libs glu glew` ++ LIBGL=`${PKG_CONFIG} --libs glu glew` ;; esac AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW]) diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild index b102cd19a244..d100dad51cbc 100644 --- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild +++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.5-r1.ebuild @@ -1,31 +1,30 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 WX_GTK_VER=3.0 - -inherit autotools eutils wxwidgets +inherit autotools desktop toolchain-funcs wxwidgets DESCRIPTION="Chemical 3D graphics program with GAMESS input builder" HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/" SRC_URI="https://wxmacmolplt.googlecode.com/files/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="" +KEYWORDS="~amd64 ~x86" RDEPEND=" media-libs/glew:0= media-libs/mesa[X(+)] x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-glew.patch ) src_prepare() { - need-wxwidgets unicode - epatch "${FILESDIR}"/${P}-glew.patch + default sed \ -e "/^dist_doc_DATA/d" \ -i Makefile.am || die "Failed to disable installation of LICENSE file" @@ -33,6 +32,9 @@ src_prepare() { } src_configure() { + tc-export PKG_CONFIG + + setup-wxwidgets unicode econf \ --with-glew \ --without-ming @@ -40,6 +42,7 @@ src_configure() { src_install() { default + doicon resources/${PN}.png make_desktop_entry ${PN} wxMacMolPlt ${PN} "Science;DataVisualization;" } |