From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- sci-calculators/Manifest.gz | Bin 3034 -> 3033 bytes sci-calculators/galculator/Manifest | 1 - sci-calculators/galculator/galculator-2.1.4.ebuild | 30 --------- sci-calculators/transcalc/Manifest | 3 +- .../files/transcalc-0.14-fno-common.patch | 70 +++++++++++++++++++++ sci-calculators/transcalc/transcalc-0.14-r2.ebuild | 14 +++-- sci-calculators/units/Manifest | 4 +- sci-calculators/units/units-2.19-r1.ebuild | 66 ------------------- sci-calculators/units/units-2.20.ebuild | 4 +- 9 files changed, 83 insertions(+), 109 deletions(-) delete mode 100644 sci-calculators/galculator/galculator-2.1.4.ebuild create mode 100644 sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch delete mode 100644 sci-calculators/units/units-2.19-r1.ebuild (limited to 'sci-calculators') diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz index ccb04762d9f0..c02b0ff8cf29 100644 Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ diff --git a/sci-calculators/galculator/Manifest b/sci-calculators/galculator/Manifest index 84dbab28be80..d72a159161dc 100644 --- a/sci-calculators/galculator/Manifest +++ b/sci-calculators/galculator/Manifest @@ -1,5 +1,4 @@ AUX galculator-2.1.4-fno-common.patch 2030 BLAKE2B 288c04e137cb93da6a7b49e074998621d1f40153ba6b2dfa4cb94f1f6244920a66913d866e5939f84c8a1469576ba3c5138604badcac495d6411a186b0d1e155 SHA512 9cdddad238c0b4c4ee57934cdcd742ee24efb6df80452462f447d0deed6039a6238e48d25933a8c69fe031e1fb5a57d464b7f0913010a3feda275b1ebde85378 DIST galculator-2.1.4.tar.bz2 472989 BLAKE2B 2fa40aa0d04880e46aad89c79ebb221a13fca815af3540c159205690a65dae6c5ec9e52e48c110ecadc4a18b86d5bd5d363f9d77c162717c8bfd2a60b71d0896 SHA512 ca5f373649d9bf26184e94ba6a501610efbb13e92a8723cda78b83aa495519e82e5b4fcd17f00f615eb702ed186598aecc70ae63a8238c32384b7f608cba4cfa EBUILD galculator-2.1.4-r1.ebuild 739 BLAKE2B 1856fbf1bf6deead09b312225115923157860633922fc819dca815e1e2b9ab0a1fe22c833f9c7404fbba6a6bbe76e86d6b963ed4a49e739b225d568b7128a8ff SHA512 3c99f4a04f4b161f403a80fe3a8cb1264e01ceb07e6d4faadbabe4215fd8f9ab4dae236e4fa01b9237234031c676cd18db28c74e88c525ee19974909af8086b7 -EBUILD galculator-2.1.4.ebuild 621 BLAKE2B 31b82421c81ef587f1675d8e7f309865da0900ada87ed8b3e860ec67973ba518a058712e582117985fd7327328c422bf8808b55caae63990159fa9b500641ecd SHA512 474ba12c97fe4f49586cf6adf4b4cb657390f0fc6fbc375b4cb6ccb87df7ab97675c5d325885e0ee7c2f5682ff80403a07c5dd9c9bf610ee90faed8e529b218b MISC metadata.xml 394 BLAKE2B 4fa1374c3ac91ea4c4212455d7ff63a35705444c3df485c6f327d6b5ebae90afcc345030c69e7a256759277f18253a20c3b7ff11036e0cd8ababa918212d9ce5 SHA512 fc850474030836be72c5a81983052b0af11312a3b3ef815b6b5eaf7a95a1b7bdbf5b1f25b5e0b2c32786b6fc5958993ff859bd2c9c818dc7df68dbecb4b61800 diff --git a/sci-calculators/galculator/galculator-2.1.4.ebuild b/sci-calculators/galculator/galculator-2.1.4.ebuild deleted file mode 100644 index fda5caa1ce92..000000000000 --- a/sci-calculators/galculator/galculator-2.1.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -GCONF_DEBUG=no - -inherit gnome2 - -DESCRIPTION="GTK+ based algebraic and RPN calculator" -HOMEPAGE="http://galculator.mnim.org/" -SRC_URI="http://galculator.mnim.org/downloads/${P}.tar.bz2" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/gtk+:3 - x11-libs/pango -" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig -" - -DOCS="AUTHORS ChangeLog NEWS README THANKS doc/shortcuts" diff --git a/sci-calculators/transcalc/Manifest b/sci-calculators/transcalc/Manifest index 2c553bf23bee..03af049400e2 100644 --- a/sci-calculators/transcalc/Manifest +++ b/sci-calculators/transcalc/Manifest @@ -1,4 +1,5 @@ AUX transcalc-0.14-fd-perm.patch 596 BLAKE2B 4da82546d0c26e22dbed1817cefee3184bb41b7655636deeef929267422cf3ab283f2ed22f65713ae1c36b98b46ed7ac359fb8339b9443aec5f191788e03b07d SHA512 d63e4d8d5da77e97037d6014aa10a392778bdd1dfe0074ee61af94c3349c529ec965d2774e50c4ffae0fd76003429b64776fa7378d01e7a9608d1d4581b65eb5 +AUX transcalc-0.14-fno-common.patch 1529 BLAKE2B 89c6363d2846b6619b9e6b286076674b6cfeb75fbce9de4c016b8f0516fe0776854b1c5cc3af4a892553afaa67e46719cd54758f3e8dfc7a773075d775c1db54 SHA512 ee5f54c3b8c5df59acfb006f6baf849419a9c308170fd372e4d4ee82ed4f527ebfa9c72be38b78ff27ace89ca71ae51c66ebc49f973995155c2f975ccad6d07b DIST transcalc-0.14.tar.gz 186434 BLAKE2B 7c2a031f34ab4b64af5be6203fca350356b75502ebdd94cce0f8338c266ff09a2cd68de80960f477228ddc4ffdd1acff84d6124506f52fd282ae0b28c949706e SHA512 b8c2cfbe3ea9787a2c694732baaf0e7c734f9a58c825f3791f21527f54398fcc79e24570d4f5f5c942b138b164cc6dc39744e0a66bafd888122608b641dcfa05 -EBUILD transcalc-0.14-r2.ebuild 688 BLAKE2B f2ec22a4018cc035074d1565d9ea2149623452a1e1ff8cd5fdc38554c5a46c691611bc09e30b9916f28b9885f2934f0c06efd84c39acf205764e6fecbc7e53bb SHA512 d0ecb26f7a8fdac51d853862e887df791504c2b60e83e206c7fcc540a4a80338ae2e5c353bb097635fd5ba5c0f1dc2b23699944fe3440662d7ef0ea2d1844ebe +EBUILD transcalc-0.14-r2.ebuild 715 BLAKE2B a05a2e6d4f797b057ff10c5fd896f70b497753c14a5846beb07f6af27db8ed3fe42606a23e0d686f7a746fc20d11c02b7458ecfad00f5db40544bd982848d0b8 SHA512 ece5b6274621967c0e1ef92451a290e6cf707f3762d7144924d22c322d1bfac067ae86e70177a4278dd6934243191915d4017e34ca9752ae7623309ef1c53276 MISC metadata.xml 1350 BLAKE2B 61a9ea60e474c9cae8ba2d2e46da1e621fe352fd2c024a7ceea58067ed2fbe695e04706bb8601b28957b72d779b0f04f9a5cca70a16688c934725b57be4bb4b8 SHA512 b61dda04f6f3c913c381a201f1acd1c9bca0e73f690c2b65a279558cec6d88541611b02640cb7329b9f9f157d3bdc77106ef01c85a0cb9e3b6cd9e6c6fdcb7b7 diff --git a/sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch b/sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch new file mode 100644 index 000000000000..1e9288c74b93 --- /dev/null +++ b/sci-calculators/transcalc/files/transcalc-0.14-fno-common.patch @@ -0,0 +1,70 @@ +--- a/src/transcalc.c ++++ b/src/transcalc.c +@@ -37,6 +37,15 @@ + extern gint trc_file_load (FILE *, short); + + char version[] = "transcalc " VERSION; ++GtkWidget *main_body_window; ++GtkWidget *transtype_combo; ++ ++short current_transtype; ++trans_win *twin; ++short statusint; ++trans_gui *tgui; ++gboolean statusexists; ++int main_window_width, main_window_height; + + + /* +--- a/src/transcalc.h ++++ b/src/transcalc.h +@@ -53,8 +53,8 @@ + #endif /* HAVE_STRCPY */ + + +-GtkWidget *main_body_window; +-GtkWidget *transtype_combo; ++extern GtkWidget *main_body_window; ++extern GtkWidget *transtype_combo; + /*GtkWidget *status;*/ + + #define MICROSTRIP 0 +@@ -163,12 +163,12 @@ + gfloat electrical_params_value[NUMELECPARS]; + } trans_value; + +-short current_transtype; +-trans_win *twin; +-short statusint; +-trans_gui *tgui; +-gboolean statusexists; +-int main_window_width, main_window_height; ++extern short current_transtype; ++extern trans_win *twin; ++extern short statusint; ++extern trans_gui *tgui; ++extern gboolean statusexists; ++extern int main_window_width, main_window_height; + + void error_mes(gchar * text); + +--- a/src/unitscombo.c ++++ b/src/unitscombo.c +@@ -33,6 +33,7 @@ + #include "transcalc.h" + #include "body.h" + ++short length_unit, freq_unit, res_unit, ang_unit; + + gchar *length_unit_name[] = { "mil", + "cm", +--- a/src/units.h ++++ b/src/units.h +@@ -77,6 +77,6 @@ + #define ohm_to_kohm(a) (a/1000.0) + */ + +-short length_unit, freq_unit, res_unit, ang_unit; ++extern short length_unit, freq_unit, res_unit, ang_unit; + + #endif diff --git a/sci-calculators/transcalc/transcalc-0.14-r2.ebuild b/sci-calculators/transcalc/transcalc-0.14-r2.ebuild index 02376bc9ed7a..b6c144a8b7ff 100644 --- a/sci-calculators/transcalc/transcalc-0.14-r2.ebuild +++ b/sci-calculators/transcalc/transcalc-0.14-r2.ebuild @@ -1,28 +1,30 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="Microwave and RF transmission line calculator" HOMEPAGE="http://transcalc.sourceforge.net" SRC_URI="http://transcalc.sourceforge.net/${P}.tar.gz" LICENSE="GPL-2" - SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" RDEPEND="x11-libs/gtk+:2" DEPEND="${RDEPEND}" # patch from debian -PATCHES=( "${FILESDIR}"/${P}-fd-perm.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fd-perm.patch + "${FILESDIR}"/${P}-fno-common.patch +) src_prepare() { + default + # respect flags sed -i -e 's|^CFLAGS=|#CFLAGS=|g' configure || die - default # syntax errors sed -i \ -e 's/ythesize/ynthesize/g' \ diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest index 788e2c65c5b1..80876d14cc8f 100644 --- a/sci-calculators/units/Manifest +++ b/sci-calculators/units/Manifest @@ -1,10 +1,8 @@ AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97 AUX units-2.20-WIN32.patch 395 BLAKE2B 5f6cee1a4ca07be73979efc6060b0225cf0a52114085dc31d1259d7a09f131d9a3d8ab91d3f2f995b41e9a3eb3299bbb09575e8c2677cee33e2ccad05abbd628 SHA512 b79d1cea6542a8360f9ba8e6a0bdbc69ade2ccd58bcda53851f6368b6c91a98ca6d2f757028bfc141c9ad8773117972d480e99063800394bcd9c5d3ba2ab61dc AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d -DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8 DIST units-2.20.tar.gz 1309242 BLAKE2B 5321e6234cfe4514d1ebccec490e472ff64a0428bb2721f51e3ff626ddef7eec4b4e8822aa947da1f4ddca414078b617ba34308c86a71788f6d8a9ba20dd6846 SHA512 5292588fb7ea0ab12e45e5521a115a0eaba4e37378011677cbd80e6e17a6ffa5f388a57859c590b6d65460fc91a4ff33e6603e27d4909b8122d4ad3696c8600d DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62 -EBUILD units-2.19-r1.ebuild 1419 BLAKE2B efbb701fcfc0def5e41f6ad4f31e1f074fa7b01f297ecd19833601f27b3507aaa2241bcc9af032ae8e9dc95bc8de89e8c6c2ab69f3e5639b8c0d98453e6af96e SHA512 c31a7d1314d708528df556b19e1d18752ad1bb5d7a9c607e96559cf7dbd746bf16c110a3573740212c17c7c7296c8dd94dac2f0822074fa6fbd3e5a8bde05892 -EBUILD units-2.20.ebuild 1241 BLAKE2B 89aad89db4fe4804fbb8b009cf3dcc668f6f4fc58a80ecb734259bbddebfa89923e18f9ed4c3a9c0af5b53c8ac2f19757c51574d886c0e30cafed5d48e48e4f5 SHA512 a4acfcf9e14b4b8127af772f2ffbbd80e7cab00bd10af2f05e3f722b8cc0d364e439ed620a669cd333c038b3f157dad6b90848f3bda3e466b81c9cbd398609fd +EBUILD units-2.20.ebuild 1237 BLAKE2B 95eaf455b315f6d3179b72e89efb1ffc14125f7efdcbb7852054256874cbfe7dde6ab05e0f1b310efdf03562deca9069cbaa012a3ea8838fc22cf88fa48dd3f6 SHA512 cf8850dca15abb13c09c73a925eb590036e3aa19e9479356ffb1f78af9e475c4487c74986a7798e802a5c25ece315f126c52cf66a0a3016e9b70ca64e66f4b1e EBUILD units-2.21.ebuild 1202 BLAKE2B 8163a804f37dcf59f1fec0b9731ff7a1349e28d2f4b95b0bba3eeae1d5a3f2ef1b8436cf7a6eed5efcc26b5c35f3993ba96611e2446e253d42454bf4386a3399 SHA512 f842cc52b1dd7525a225d1716abad976cec91d1f2bc418ac7d0007fa93a781d4ef71d640ecb556218963b48d2e8948352e27537321bc9c20c7a76ef7e7c48406 MISC metadata.xml 269 BLAKE2B 212fd839faa71081ff89c999bc77e37b69c5c618f9e1527ed9402ad14af7072432fcd3eaa3ced4dd20a45929c054095d652ab6c18a1642be436b345436ed48a7 SHA512 bcb2f5dd279dd126273909fdaf0c3ee89f0eb050938317ba26e75532a742e7eb496669bea134494071ec30b3475a3ffc70b47035de404e8c1f7bc1034012e917 diff --git a/sci-calculators/units/units-2.19-r1.ebuild b/sci-calculators/units/units-2.19-r1.ebuild deleted file mode 100644 index 755e4b2d6df4..000000000000 --- a/sci-calculators/units/units-2.19-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8} ) -inherit python-single-r1 - -DESCRIPTION="Unit conversion program" -HOMEPAGE="https://www.gnu.org/software/units/units.html" -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" - -LICENSE="FDL-1.3 GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="+units-cur" -REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - sys-libs/readline:= - units-cur? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/future[${PYTHON_MULTI_USEDEP}] - dev-python/requests[${PYTHON_MULTI_USEDEP}] - ') - ) -" -DEPEND=" - ${RDEPEND} -" -PATCHES=( - "${FILESDIR}"/${PN}-2.17-network-sandbox.patch -) -DOCS=( - ChangeLog NEWS README -) - -pkg_setup() { - use units-cur && python-single-r1_pkg_setup -} - -src_configure() { - econf \ - --sharedstatedir="${EPREFIX}"/var/lib \ - ac_cv_path_PYTHON=no -} - -src_compile() { - emake ${PN} -} - -src_install() { - default - - # we're intentionally delaying this since 'make install' would - # get confused if we shove 'units_cur' there, and there is no real - # need to add more complexity for it - if use units-cur; then - sed \ - -e "/^outfile/s|'.*'|'/usr/share/units/currency.units'|g" \ - -e 's|^#!|&/usr/bin/python|g' \ - units_cur_inst > units_cur || die - python_fix_shebang units_cur - python_doscript units_cur - fi -} diff --git a/sci-calculators/units/units-2.20.ebuild b/sci-calculators/units/units-2.20.ebuild index 40e4195d89a7..185a3134701e 100644 --- a/sci-calculators/units/units-2.20.ebuild +++ b/sci-calculators/units/units-2.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="FDL-1.3 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="+units-cur" REQUIRED_USE="units-cur? ( ${PYTHON_REQUIRED_USE} )" -- cgit v1.2.3