summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/libmodbus/ChangeLog8
-rw-r--r--dev-libs/libmodbus/libmodbus-2.0.3.ebuild17
-rw-r--r--dev-libs/libmodbus/libmodbus-3.0.3.ebuild (renamed from dev-libs/libmodbus/libmodbus-2.9.3.ebuild)19
3 files changed, 16 insertions, 28 deletions
diff --git a/dev-libs/libmodbus/ChangeLog b/dev-libs/libmodbus/ChangeLog
index cd9ef5abf47b..df3f7e369e86 100644
--- a/dev-libs/libmodbus/ChangeLog
+++ b/dev-libs/libmodbus/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/libmodbus
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/ChangeLog,v 1.6 2012/02/20 04:27:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/ChangeLog,v 1.7 2012/06/11 09:46:46 xmw Exp $
+
+*libmodbus-3.0.3 (11 Jun 2012)
+
+ 11 Jun 2012; Michael Weber <xmw@gentoo.org> +libmodbus-3.0.3.ebuild,
+ -libmodbus-2.0.3.ebuild, -libmodbus-2.9.3.ebuild:
+ Version bump (thanks euscan), EAPI-4, drop old.
20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Drop no-herd.
diff --git a/dev-libs/libmodbus/libmodbus-2.0.3.ebuild b/dev-libs/libmodbus/libmodbus-2.0.3.ebuild
deleted file mode 100644
index 9eff02677aa7..000000000000
--- a/dev-libs/libmodbus/libmodbus-2.0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/libmodbus-2.0.3.ebuild,v 1.1 2009/05/05 20:49:16 vapier Exp $
-
-DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
-HOMEPAGE="http://launchpad.net/libmodbus/"
-SRC_URI="http://launchpad.net/libmodbus/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog MIGRATION NEWS README TODO
-}
diff --git a/dev-libs/libmodbus/libmodbus-2.9.3.ebuild b/dev-libs/libmodbus/libmodbus-3.0.3.ebuild
index 2d789add516d..f1e252086638 100644
--- a/dev-libs/libmodbus/libmodbus-2.9.3.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/libmodbus-2.9.3.ebuild,v 1.2 2011/04/13 19:52:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmodbus/libmodbus-3.0.3.ebuild,v 1.1 2012/06/11 09:46:46 xmw Exp $
-EAPI="2"
+EAPI=4
DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
HOMEPAGE="http://www.libmodbus.org/"
@@ -11,17 +11,16 @@ SRC_URI="http://github.com/downloads/stephane/libmodbus/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
- sed -i '/CFLAGS/s:-Werror::' configure || die #363477
-}
+IUSE="static-libs"
src_configure() {
- econf --disable-silent-rules
+ econf \
+ --disable-silent-rules \
+ $(use_enable static-libs static)
}
src_install() {
- emake install DESTDIR="${D}" || die
+ emake install DESTDIR="${D}"
dodoc AUTHORS MIGRATION NEWS README.rst
+ use static-libs || rm "${D}"/usr/*/libmodbus.la
}