Version bump, remove .la file, drop old. Fixes bug #403387 by Piotr Szymaniak <szarpaj@grubelek.pl>

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

5 files changed, 62 insertions, 80 deletions

diff --git a/sci-libs/libtifiles2/ChangeLog b/sci-libs/libtifiles2/ChangeLog
index e6d13b7fd781..1eedb590b95b 100644
--- a/sci-libs/libtifiles2/ChangeLog
+++ b/sci-libs/libtifiles2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/libtifiles2
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/ChangeLog,v 1.5 2011/03/15 21:20:15 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/ChangeLog,v 1.6 2012/02/19 13:44:47 xarthisius Exp $
+
+*libtifiles2-1.1.5 (19 Feb 2012)
+
+  19 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +libtifiles2-1.1.5.ebuild,
+  -libtifiles2-1.1.0.ebuild, -libtifiles2-1.1.1.ebuild,
+  libtifiles2-1.1.3.ebuild:
+  Version bump, remove .la file, drop old. Fixes bug #403387 by Piotr Szymaniak
+  <szarpaj@grubelek.pl>
 
 *libtifiles2-1.1.3 (15 Mar 2011)
 
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.0.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.0.ebuild
deleted file mode 100644
index 35aacfa28610..000000000000
--- a/sci-libs/libtifiles2/libtifiles2-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/libtifiles2-1.1.0.ebuild,v 1.2 2011/03/02 20:08:54 jlec Exp $
-
-EAPI=2
-
-DESCRIPTION="Library for TI calculator files"
-HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="mirror://sourceforge/gtktiemu/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls threads"
-
-RDEPEND="dev-libs/glib:2
-	sci-libs/libticables2
-	sci-libs/libticonv
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_enable threads)
-}
-
-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
-}
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.1.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.1.ebuild
deleted file mode 100644
index 07ceea44a6f7..000000000000
--- a/sci-libs/libtifiles2/libtifiles2-1.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/libtifiles2-1.1.1.ebuild,v 1.3 2011/03/02 20:08:54 jlec Exp $
-
-EAPI=2
-
-DESCRIPTION="Library for TI calculator files"
-HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
-SRC_URI="http://repo.calcforge.org/debian/source/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc nls threads"
-
-RDEPEND="dev-libs/glib:2
-	sci-libs/libticables2
-	sci-libs/libticonv
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_enable threads)
-}
-
-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/* || die
-	fi
-}
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.3.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.3.ebuild
index 480b081b7770..f85a88f98295 100644
--- a/sci-libs/libtifiles2/libtifiles2-1.1.3.ebuild
+++ b/sci-libs/libtifiles2/libtifiles2-1.1.3.ebuild
@@ -1,6 +1,6 @@
-# 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/libtifiles2/libtifiles2-1.1.3.ebuild,v 1.1 2011/03/15 21:20:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/libtifiles2-1.1.3.ebuild,v 1.2 2012/02/19 13:44:47 xarthisius Exp $
 
 EAPI=2
 
@@ -22,6 +22,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
+src_prepare() {
+	sed -e '/define _ZLIBIOAPI_H/ a#define OF(x) x' \
+	    -i src/minizip/ioapi.h || die #403387
+}
+
 src_configure() {
 	econf \
 		--disable-rpath \
diff --git a/sci-libs/libtifiles2/libtifiles2-1.1.5.ebuild b/sci-libs/libtifiles2/libtifiles2-1.1.5.ebuild
new file mode 100644
index 000000000000..515432762d15
--- /dev/null
+++ b/sci-libs/libtifiles2/libtifiles2-1.1.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/libtifiles2/libtifiles2-1.1.5.ebuild,v 1.1 2012/02/19 13:44:47 xarthisius Exp $
+
+EAPI=4
+
+inherit multilib
+
+DESCRIPTION="Library for TI calculator files"
+HOMEPAGE="http://lpg.ticalc.org/prj_tilp/"
+SRC_URI="mirror://sourceforge/tilp/tilp2-linux/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	>=sci-libs/libticables2-1.3.3
+	>=sci-libs/libticonv-1.1.3
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS LOGO NEWS README ChangeLog docs/api.txt )
+
+src_prepare() {
+	sed -e '/define _ZLIBIOAPI_H/ a#define OF(x) x' \
+	    -i src/minizip/ioapi.h || die #403387
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use doc && dohtml docs/html/*
+	use static-libs || rm -f "${D}"/usr/$(get_libdir)/${PN}.la
+}