Version bump, remove .la file, drop old

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 42 insertions, 33 deletions

diff --git a/sci-libs/libticables2/ChangeLog b/sci-libs/libticables2/ChangeLog
index e576335ecdae..bcdbb924caed 100644
--- a/sci-libs/libticables2/ChangeLog
+++ b/sci-libs/libticables2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libticables2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libticables2/ChangeLog,v 1.4 2011/03/15 21:18:16 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libticables2/ChangeLog,v 1.5 2012/02/19 13:36:35 xarthisius Exp $
+
+*libticables2-1.3.3 (19 Feb 2012)
+
+  19 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +libticables2-1.3.3.ebuild, -libticables2-1.2.0.ebuild:
+  Version bump, remove .la file, drop old
 
 *libticables2-1.3.1 (15 Mar 2011)
 
diff --git a/sci-libs/libticables2/libticables2-1.2.0.ebuild b/sci-libs/libticables2/libticables2-1.3.3.ebuild
index afbd817d162e..6e1c95935ab1 100644
--- a/sci-libs/libticables2/libticables2-1.2.0.ebuild
+++ b/sci-libs/libticables2/libticables2-1.3.3.ebuild
@@ -1,18 +1,19 @@
-# 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/sci-libs/libticables2/libticables2-1.2.0.ebuild,v 1.3 2011/03/02 20:05:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libticables2/libticables2-1.3.3.ebuild,v 1.1 2012/02/19 13:36:35 xarthisius Exp $
+
+EAPI=4
 
-EAPI=2
 inherit eutils
 
 DESCRIPTION="Library to handle different link cables for TI calculators"
 HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/gtktiemu/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc nls threads usb"
+IUSE="doc nls static-libs usb"
 
 RDEPEND="dev-libs/glib:2
 	usb? ( dev-libs/libusb )
@@ -22,24 +23,20 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-locale.patch
-}
+DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
 
 src_configure() {
 	econf \
 		--disable-rpath \
 		$(use_enable nls) \
-		$(use_enable usb libusb) \
-		$(use_enable threads)
+		$(use_enable static-libs static) \
+		$(use_enable usb libusb)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS LOGO NEWS README ChangeLog docs/api.txt
-	if use doc; then
-		dohtml docs/html/*
-	fi
+	default
+	use doc && dohtml docs/html/*
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/${PN}.la
 }
 
 pkg_postinst() {
diff --git a/sci-libs/libticonv/ChangeLog b/sci-libs/libticonv/ChangeLog
index 4f6e1aac4597..ba4f1ca2effa 100644
--- a/sci-libs/libticonv/ChangeLog
+++ b/sci-libs/libticonv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/libticonv
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libticonv/ChangeLog,v 1.4 2011/03/15 20:56:25 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libticonv/ChangeLog,v 1.5 2012/02/19 13:32:28 xarthisius Exp $
+
+*libticonv-1.1.3 (19 Feb 2012)
+
+  19 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +libticonv-1.1.3.ebuild,
+  -libticonv-1.1.0.ebuild:
+  Version bump, remove .la file, drop old
 
 *libticonv-1.1.1 (15 Mar 2011)
 
diff --git a/sci-libs/libticonv/libticonv-1.1.0.ebuild b/sci-libs/libticonv/libticonv-1.1.3.ebuild
index b75fbd6914cc..b32b4ee4f876 100644
--- a/sci-libs/libticonv/libticonv-1.1.0.ebuild
+++ b/sci-libs/libticonv/libticonv-1.1.3.ebuild
@@ -1,38 +1,38 @@
-# 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/sci-libs/libticonv/libticonv-1.1.0.ebuild,v 1.3 2011/03/02 20:08:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libticonv/libticonv-1.1.3.ebuild,v 1.1 2012/02/19 13:32:28 xarthisius Exp $
 
-EAPI=2
+EAPI=4
+
+inherit multilib
 
 DESCRIPTION="Charset conversion library for TI calculators"
 HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/gtktiemu/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc iconv nls"
-
-RDEPEND="dev-libs/glib:2
-	nls? ( virtual/libintl )"
+IUSE="doc iconv static-libs"
 
+RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
+	dev-util/pkgconfig"
+
+DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
 
 src_configure() {
 	econf \
-		--disable-rpath \
-		$(use_enable nls) \
+		$(use_enable static-libs static) \
 		$(use_enable iconv)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS LOGO NEWS README ChangeLog docs/api.txt
+	default
 	if use doc; then
 		dohtml docs/html/*
 		docinto charsets
 		dohtml docs/charsets/*
 	fi
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/${PN}.la
 }