diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-04-28 09:54:45 +0100 |
commit | b7ebc951da8800f711142f69d9d958bde67a112d (patch) | |
tree | e318514216845acb8f2e49fff7a5cba4027e9d91 /sci-libs/libsigrok | |
parent | dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff) |
gentoo resync : 28.04.2019
Diffstat (limited to 'sci-libs/libsigrok')
-rw-r--r-- | sci-libs/libsigrok/Manifest | 8 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-0.4.0.ebuild | 4 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-0.5.0.ebuild | 92 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-0.5.1.ebuild | 9 | ||||
-rw-r--r-- | sci-libs/libsigrok/libsigrok-9999.ebuild | 84 |
5 files changed, 83 insertions, 114 deletions
diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest index 88119b674df4..b20b18e2414f 100644 --- a/sci-libs/libsigrok/Manifest +++ b/sci-libs/libsigrok/Manifest @@ -2,11 +2,9 @@ AUX libsigrok-0.3.0-configure-flags.patch 6291 BLAKE2B 24ca94ea005a1148fc3492c90 AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9b2a1edb27d66713699765aa90955c4ef408fef8f8c06d9ca314acb40780c66992245e167f7c0a615e31d1b5ae76b455bbc9b180 SHA512 45d31733c9942cedd916819baa842ae9b68de7ac9f7fc5d440f93d5eb2ea13975c3a4ac7116d80d669c7f942f5342e616da208b83a98ea005fe6a62fab3db373 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550 DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b SHA512 5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0 -DIST libsigrok-0.5.0.tar.gz 1560400 BLAKE2B 2093a7f2855708ef5b8d260fb6721c1ed66cade65ceecdce5808d4edf97f65026755586ca28888969417c19b89bde46b0b786287dcf0bf554d8faba42f8f51a9 SHA512 56129da97830d9c98c73612a6ce21664b4365aafa2939c1dd9e4ff3f7397b3a07f82684b3d34fc998acd32a04f17a7a629dde455e4ed6310f0075dabaae0e5ec DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517 EBUILD libsigrok-0.3.0.ebuild 1700 BLAKE2B 33dc1607eb3aaf38b7547fafe90940b3cf3b539fd257d394ee27225d3c40fea9d9d349a1ecaf8b7b4c99b6a57e590aae4c9b5225e6baf514d2bdfe47c4043107 SHA512 73f17a46ea7bfb003dc1ac6be3b32e43bffe2bbe135c6f5c667419ecae5ee0a57f77377d2eb69113e8e50cd25b73f123dffa2711a64837a1035841f3f4d7df43 -EBUILD libsigrok-0.4.0.ebuild 2115 BLAKE2B f15bc1e01ea4cc389148eb6b3ebc5bc6f1ef42d14662888562ca48a1e1f5a1afe639ebd7755e36994675a461f4c4ac85e962efb4467503d9926ce4f06b51b2c9 SHA512 c0106ee8b697b6932a1ea69721b51e43d84d145ba9050e79afc3dc2e97303f93e73f2e8717a3ea4e6f522ec68830382def004283d32807be5bac647e47f78c4d -EBUILD libsigrok-0.5.0.ebuild 2285 BLAKE2B 7a0d70723315dcd5f1c012d3730e3e3c44b69f92f91fb02c2a3f5a3a4c85b90ca5c4694f020a27fa7ded5833de515c3679951520fcac0d07fcd76f12b2f832d8 SHA512 0f2ae431afbcdf3b4df3ff48a59d44406d70b8b75fc02129229643f8a5afb2ca31f82df7e6c192412416efb975ee270f699e13dca707246d5cf98fde1b59a11c -EBUILD libsigrok-0.5.1.ebuild 2287 BLAKE2B 6f7fec5645abe0a513269dccbbe68acab0c43f2ade78a77da69f7567ac61d7a2639a0d56efe031694209fbf7e8a542f53b263fca941961c9d9c4026d912128c5 SHA512 4c1ab3863d334e542ae4b28fd8a9c1287c5bcd28ef11d4b30beb537f83a3268dcab12ab8b7752ec5970ede6369675b5911f3101fde71a87aa8c4f2df94e4ee29 -EBUILD libsigrok-9999.ebuild 2290 BLAKE2B d7cfeb002ba0c8218cb1047a99147344d8746c1889f73399f58fc42e78cf993ceae1c43a2ba9729b7898fbf640e33fdca9ef72ce055b7e38e4ac025fa686e779 SHA512 bbebea8ea4ea81dc826f29396a8bf8380dca155d4869421ae32616398c19a01db438dd92fb2da87741580e67126d160f31cca49c4aee4f076b1b4dbbee34887a +EBUILD libsigrok-0.4.0.ebuild 2110 BLAKE2B 2204607de84d0e280debb03089de2d6f2f7065de41190e9ac7ba394359faaa87d23b64c3eb37dba28db1221fc8a2ef82e47e5a37d48951c79e18a7a6b1b6e6b2 SHA512 64745457f78225b04a07e35a074744acc34298de1442ccff93e57b98505c4291baa0154956a6c80d0e948d5fe3c36964fe8a8fadff0458c6e9a6dc4f7cc64e69 +EBUILD libsigrok-0.5.1.ebuild 2338 BLAKE2B 3a0dee99db4df1691b98b8352ca898e0f21f6002184d165fb66f1494c6384ac6d79a47f66ba6aeda47f70f26ae9e407501d2766c1e892cb65d41297ee13ceb81 SHA512 b0b8417940aa670b6f79463728f28562a27c72286a4a75950ec9c9fbd18b571d2ab46dddc6614b8c46f535ee1076bceccb31ac743d02fb8e0e01e61594dd4f37 +EBUILD libsigrok-9999.ebuild 3602 BLAKE2B ee20a39c262db27b4b85174e86fee3868e8e68f8469ae4ec83d033087830e628ad62d09af83264c2961df52c8a21c02b0e6a315028b92b2dbeedf0989ee3122b SHA512 8caf7092a9c451085ae55a1595985d9c307a803605ef6e993d22329616b832b7db7fc6e0b27dc699b81b8026412107810535479caf2579b5262c4fdb6d8db534 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild index 6eb82d781626..58e0d34119bb 100644 --- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6}} ) inherit eutils python-single-r1 java-pkg-opt-2 diff --git a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild b/sci-libs/libsigrok/libsigrok-0.5.0.ebuild deleted file mode 100644 index 8d56edf96992..000000000000 --- a/sci-libs/libsigrok/libsigrok-0.5.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 autotools -else - SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support" -HOMEPAGE="https://sigrok.org/wiki/Libsigrok" - -LICENSE="GPL-3" -SLOT="0/4" -IUSE="cxx ftdi java parport python serial static-libs test usb" -REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" - -# We also support librevisa, but that isn't in the tree ... -LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)] - >=dev-libs/libzip-0.8:=[static-libs(+)] - cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) - python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] ) - ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) - parport? ( sys-libs/libieee1284[static-libs(+)] ) - serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) - usb? ( virtual/libusb:1[static-libs(+)] )" -RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} ) - static-libs? ( ${LIB_DEPEND} ) - java? ( >=virtual/jre-1.4 )" -DEPEND="${LIB_DEPEND//\[static-libs(+)]} - test? ( >=dev-libs/check-0.9.4 ) - cxx? ( app-doc/doxygen ) - java? ( - >=dev-lang/swig-3.0.6 - >=virtual/jdk-1.4 - ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - >=dev-lang/swig-3.0.6 - ) - virtual/pkgconfig" - -pkg_setup() { - use python && python-single-r1_pkg_setup - java-pkg-opt-2_pkg_setup -} - -src_prepare() { - [[ ${PV} == "9999" ]] && eautoreconf - eapply_user -} - -src_configure() { - econf \ - $(use_with ftdi libftdi) \ - $(use_with parport libieee1284) \ - $(use_with serial libserialport) \ - $(use_with usb libusb) \ - $(use_enable cxx) \ - $(use_enable java) \ - $(use_enable python) \ - --disable-ruby \ - $(use_enable static-libs static) -} - -src_test() { - emake check -} - -src_install() { - default - prune_libtool_files -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild index 8ebbf15dc3de..85412408ba65 100644 --- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild +++ b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils +inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 udev xdg-utils if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" @@ -20,7 +20,7 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok" LICENSE="GPL-3" SLOT="0/4" -IUSE="cxx ftdi java parport python serial static-libs test usb" +IUSE="cxx ftdi java parport python serial static-libs test +udev usb" REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" # We also support librevisa, but that isn't in the tree ... @@ -78,6 +78,7 @@ src_test() { src_install() { default + use udev && udev_dorules contrib/*.rules prune_libtool_files } diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild index 694f44c3d603..b82051f8e0f5 100644 --- a/sci-libs/libsigrok/libsigrok-9999.ebuild +++ b/sci-libs/libsigrok/libsigrok-9999.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +USE_RUBY="ruby26 ruby25 ruby24" +RUBY_OPTIONAL="yes" -inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 xdg-utils +inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" @@ -20,14 +22,15 @@ HOMEPAGE="https://sigrok.org/wiki/Libsigrok" LICENSE="GPL-3" SLOT="0/9999" -IUSE="cxx ftdi java parport python serial static-libs test usb" -REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" +IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb" +REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )" # We also support librevisa, but that isn't in the tree ... LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)] >=dev-libs/libzip-0.8:=[static-libs(+)] cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] ) + ruby? ( $(ruby_implementations_depend) ) ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] ) @@ -47,19 +50,36 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]} dev-python/numpy[${PYTHON_USEDEP}] >=dev-lang/swig-3.0.6 ) + ruby? ( >=dev-lang/swig-3.0.8 ) virtual/pkgconfig" +S="${WORKDIR}"/${P} + pkg_setup() { - use python && python-single-r1_pkg_setup + use ruby && ruby-ng_pkg_setup java-pkg-opt-2_pkg_setup } -src_prepare() { +src_unpack() { + [[ ${PV} == "9999" ]] && git-r3_src_unpack || default +} + +sigrok_src_prepare() { [[ ${PV} == "9999" ]] && eautoreconf +} + +each_ruby_prepare() { + sigrok_src_prepare +} + +src_prepare() { + use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare + sigrok_src_prepare eapply_user + use python && python_copy_sources } -src_configure() { +sigrok_src_configure() { econf \ $(use_with ftdi libftdi) \ $(use_with parport libieee1284) \ @@ -67,17 +87,59 @@ src_configure() { $(use_with usb libusb) \ $(use_enable cxx) \ $(use_enable java) \ - $(use_enable python) \ - --disable-ruby \ - $(use_enable static-libs static) + $(use_enable static-libs static) \ + "${@}" +} + +each_ruby_configure() { + RUBY="${RUBY}" sigrok_src_configure --enable-ruby --disable-python +} + +each_python_configure() { + cd "${BUILD_DIR}" + sigrok_src_configure --disable-ruby --enable-python +} + +src_configure() { + python_setup + sigrok_src_configure --disable-ruby --disable-python + use ruby && ruby-ng_src_configure + use python && python_foreach_impl each_python_configure +} + +each_ruby_compile() { + emake ruby-build +} + +each_python_compile() { + cd "${BUILD_DIR}" + emake python-build +} + +src_compile() { + default + use ruby && ruby-ng_src_compile + use python && python_foreach_impl each_python_compile } src_test() { emake check } +each_ruby_install() { + emake ruby-install DESTDIR="${D}" +} + +each_python_install() { + cd "${BUILD_DIR}" + emake python-install DESTDIR="${D}" +} + src_install() { default + use python && python_foreach_impl each_python_install + use ruby && ruby-ng_src_install + use udev && udev_dorules contrib/*.rules prune_libtool_files } |