From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B0091395E2 for ; Tue, 13 Dec 2016 00:47:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8630C21C0FA; Mon, 12 Dec 2016 22:58:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31B0021C0FA for ; Mon, 12 Dec 2016 22:58:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 892183412B7 for ; Mon, 12 Dec 2016 22:58:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7281BC78 for ; Mon, 12 Dec 2016 22:58:40 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1481583511.ca095aac3343b459c291010a31101dd06d22d14c.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild X-VCS-Directories: sci-libs/linux-gpib/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: ca095aac3343b459c291010a31101dd06d22d14c X-VCS-Branch: master Date: Mon, 12 Dec 2016 22:58:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 66513777-1225-4b69-9371-19d2eea4f89c X-Archives-Hash: 7a14d53097307dd8fd449d08b2495fc3 commit: ca095aac3343b459c291010a31101dd06d22d14c Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Dec 12 22:58:31 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Mon Dec 12 22:58:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca095aac sci-libs/linux-gpib: correctly use REPLACING_VERSIONS, bug 589512 Package-Manager: portage-2.3.3 sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild | 20 ++++++++++++-------- sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild | 20 ++++++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild index f5904e3..8a70950 100644 --- a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PERL_EXPORT_PHASE_FUNCTIONS=no GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user +inherit versionator eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware" HOMEPAGE="http://linux-gpib.sourceforge.net/" @@ -184,10 +184,14 @@ pkg_postinst () { einfo "" fi - if [[ $REPLACING_VERSIONS < "3.2.21-r1" ]]; then - ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel" - ewarn "interface. You may need to reboot to make sure the newly built driver modules" - ewarn "are used (some of the driver modules cannot be unloaded)." - ewarn "If you do not do this, every gpib call will just result in an error message." - fi + local v + for v in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 3.2.21-r1 ${v}; then + ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel" + ewarn "interface. You may need to reboot to make sure the newly built driver modules" + ewarn "are used (some of the driver modules cannot be unloaded)." + ewarn "If you do not do this, every gpib call will just result in an error message." + break + fi + done } diff --git a/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild index 72a254f..e23cd37 100644 --- a/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,7 +8,7 @@ PERL_EXPORT_PHASE_FUNCTIONS=no GENTOO_DEPEND_ON_PERL=no PYTHON_COMPAT=( python2_7 ) -inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user +inherit versionator eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware" HOMEPAGE="http://linux-gpib.sourceforge.net/" @@ -183,10 +183,14 @@ pkg_postinst () { einfo "" fi - if [[ $REPLACING_VERSIONS < "3.2.21-r1" ]]; then - ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel" - ewarn "interface. You may need to reboot to make sure the newly built driver modules" - ewarn "are used (some of the driver modules cannot be unloaded)." - ewarn "If you do not do this, every gpib call will just result in an error message." - fi + local v + for v in ${REPLACING_VERSIONS}; do + if ! version_is_at_least 3.2.21-r1 ${v}; then + ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel" + ewarn "interface. You may need to reboot to make sure the newly built driver modules" + ewarn "are used (some of the driver modules cannot be unloaded)." + ewarn "If you do not do this, every gpib call will just result in an error message." + break + fi + done }