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

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

7 files changed, 99 insertions, 101 deletions

diff --git a/sci-libs/libticalcs2/Manifest b/sci-libs/libticalcs2/Manifest
index f127dee8e32a..6657d0fbbdf2 100644
--- a/sci-libs/libticalcs2/Manifest
+++ b/sci-libs/libticalcs2/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libticalcs2-1.1.0-locale.patch 317 RMD160 35009f4b3c9e650da8ebe79598b521fffc634ae7 SHA1 09fb68f11ee5898e8a7c978177d49de269365a05 SHA256 625ca5a67556463d7170458446da8167e8b6ede7bf43897acabef7248c06ae15
-DIST libticalcs2-1.1.0.tar.bz2 456388 RMD160 060dc95bdec772d4d17c6040b18e2eab08b3f235 SHA1 03f1cf7685cb1ecb0f2e0da947802d691734de21 SHA256 29b3ed5ca4a7b968fd4e90efddf37fc5e1376061098489a1f6dfbb4bfd3856a6
 DIST libticalcs2-1.1.5.tar.bz2 471954 RMD160 32b6f922c71143b468129c507304e1af43cf0715 SHA1 c5992489b0d5b47a82807a3fd2ce8277e9500c00 SHA256 46e338554a77754485f19746fa508df7823bff9a410449ca66c02af9bd5e0320
-DIST libticalcs2_1.1.3.orig.tar.gz 636115 RMD160 760f4bdee5899ddd6bc333e8e0cf3fa77673a5c4 SHA1 cb6babb6ba6b009cf5566f155a3372663e6a5764 SHA256 23810556080ec83ee50f64c8cf33940ad09da35f9b1881cbe020ced714fc1286
-EBUILD libticalcs2-1.1.0.ebuild 1020 RMD160 f3a220987bdbfb74344a063c22eabf97ff2dc0b3 SHA1 9748ecece41bc2fbfeb0a32932af26ce3eb9048b SHA256 75addbc1ac86b0cab96daebe733050bad206dd6eba0d9c306356a616697773a3
-EBUILD libticalcs2-1.1.3.ebuild 1053 RMD160 e7d4e08b769c2aef9a5e61121910dc8adf2d5b05 SHA1 b32125f98b004bf820f28a3832d805bd6ede2d39 SHA256 b0c9239cc72aeb1820cbf664b028f84d48660e6537fda1d2219984f2442b788a
+DIST libticalcs2-1.1.7.tar.bz2 525111 RMD160 c5bed4064c708489835dc591d04bbc7d7fa5a747 SHA1 cda1d356816b352618d25fc2d7afed59352a91ad SHA256 e16c79033c0eafa4ccda7fc56d018565bba1dfb70dd0b4c5f681bafe32a52ab0
 EBUILD libticalcs2-1.1.5.ebuild 981 RMD160 a987c7c58c78e0183187f0fd63152e8e74cb7525 SHA1 1eb98868b696b28bd2d7c5f731fa7997123751eb SHA256 f0e8e234a52c1b2b96d47d2734b3cd47b6ef87802c7fd9fd9c69b0a2653e3798
-MISC ChangeLog 1820 RMD160 6912edbedc6484c3a8d5521b00a5dd808b345fe5 SHA1 cac85abf13a184cd219a39a3c0d12ea0c329c9c1 SHA256 95f17a03149771230627ce1ff40f9c6704e5badbec9fd83225516b6e8ba760b9
+EBUILD libticalcs2-1.1.7.ebuild 1001 RMD160 ce21a8c98a101fb729bdbde9e1847d4bf70f2a69 SHA1 70e68c4401c95fedc3f1b77f5ec572ff215df769 SHA256 1be94e7001fe7857f501d7d003969e98ee34aa09072811bdbb5a7c0690cc50a9
+MISC ChangeLog 2036 RMD160 0e9520748fdc5699cc69f1964f33fe218b4e6456 SHA1 2c579063e0a1ac218beaac51bc5335cf404b46b4 SHA256 b0cfd1685c6fdc260440104daafe4bd1f56395ccc99b446c9042ed60557a4e40
 MISC metadata.xml 489 RMD160 412959cda67bda595b87be3ed956fb8d94439369 SHA1 7d5d87a5d959bbfc00d0d046e4a81e10a8bdf961 SHA256 192c112c8613d96efce1c8b9c66126880adc36fdeb36dfe198da112ad3d820be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1/2HEACgkQ1ycZbhPLE2As/QCeL6VGcoOdqn65+D32YzHZFv6o
-zdoAn3OE4oLwNKuXksfPsJnszwDy8/MX
-=yGEK
+iQIcBAEBCAAGBQJPQP3xAAoJEF0huFKJUZL50cQQAJPCdUbULNjTMAicfgFPCN9B
+NP2c8smQsIPEla42zgSP6Kc/mMqRkHcg/9aKVyzD1yUuTzolDHDzaNHswbN1hiSP
+bWncGTerf1BEewJJI1eFFahFYYYbXnKd+vMCuOgO7CG21E6Kd5amahMhZ6VSmr9t
+LdvusB2byitWSgqQd9fSujCKUHg5q8aPN1gpfLMyQKWgYmyMvxuVWuvDkpiC8k/b
+gofGLyWDwuTEWIIHj//cqpj05V+O+VZKVRucrJrCN4bLAWt3pi33tGAgcZBkM2oG
+Wn0htua2itmusPQl1Ywn5EK8Zxp/ozL9r9SEV+8KzQEe7igDZB/zAzrkfuaa/t3w
+XuvKwg21//Epkef1xheuppVCPYlO8g+2k0qRGoQ9S6B/LrMVTd6CoYTxtSDAbJie
+FQs6IsIBqh9A8BTkm8Ww5avhTGCdIrZwwFMNXttLkCJs+wWgbw0suzaV+8MCxbsU
+dYrNXoR5+vKe3zfK3GerxFc+C0gnoL4B7mFmT5JwsfYlEePR3a4bmqYwmxz8CBKl
+sZPzDX5o//1Dzw4s5AaG/zInAGSyljKrzvWl1jbI1rwqIcTqsBjw+6zukdpbmrT1
+s9h+r/MA4C1KltmiwqzM+C1FkkcnZbJ7fb+i7DwXyBir/v1ETvcCziilQ3Vxkwer
+bLqH2HTbaoVCO7LnmDPH
+=upP7
 -----END PGP SIGNATURE-----
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/Manifest b/sci-libs/libtifiles2/Manifest
index f3a998ac987b..869911ada99e 100644
--- a/sci-libs/libtifiles2/Manifest
+++ b/sci-libs/libtifiles2/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST libtifiles2-1.1.0.tar.bz2 405923 RMD160 60c1503ffea609a214e9c322473a5487e7377f09 SHA1 d6ad91c58f63953b842b03c3e10c35dc931d7e5a SHA256 219238e3e11ecc5e9c5ba887a03832e99ffb45015123e8cd1c687f54b0f79c55
 DIST libtifiles2-1.1.3.tar.bz2 408005 RMD160 2100a745bbb079d14a4b8199013132141cf2c862 SHA1 87ddba91a1229849ac9224cdcd4c1ccdd1b77833 SHA256 6f097a769c945547977a243c69bfecbbcb7c80117f4a1bf5e68a37837ff631f5
-DIST libtifiles2_1.1.1.orig.tar.gz 562840 RMD160 67b197e46ce0243d3130f4d1004cd7b001b15998 SHA1 c3fd6d2faa0132c6d7e0f7695b64a29d4112f287 SHA256 12fd16d79d6fbda4fe8f50d9eec20e80a1211f2d756870af02ad49bb6e07c452
-EBUILD libtifiles2-1.1.0.ebuild 886 RMD160 2e4d7084287a226430a75cde1b5901afcf48467d SHA1 029cc5f61dc899683ea3d6c6c9bb6b9aa2657c1e SHA256 ded928875fc2a3fb769b2b39e561ff98f6f42b8fb1aca2ead726ac56b098bacd
-EBUILD libtifiles2-1.1.1.ebuild 919 RMD160 85f130d6ccc0723a2aada4a877d85d6d874887c3 SHA1 5eab1fa53712ced311726052ed2048021907f8f4 SHA256 1773aaaa83d83439cdcefe1c6a70b76375362c1395a77d036e2c5ceb339c4b3a
-EBUILD libtifiles2-1.1.3.ebuild 941 RMD160 4f8c51b8614da4794924eb059ceea07ff7e0d9d7 SHA1 b99d02441941aa432bda172303cb56856f28fe95 SHA256 ba77f2c8f69d5f5d8fd0555fc57a07722f9914d5d51b8b984406c6ce3415786c
-MISC ChangeLog 1981 RMD160 deee008fde5760dc99b0f9c20151178ef7f26d59 SHA1 4133dc72c8cd4f849b52b450bee1b2fe9dfa291a SHA256 bd515d372736e8862d6458a9ccd7af7a5143d19e6b84f843ca5ce1e7fe3caaab
+DIST libtifiles2-1.1.5.tar.bz2 460500 RMD160 cdac8e83f70c1019d00ba0d7e230911d770ec173 SHA1 ed08600bd767cf878e56cbd55143e16d42ecd372 SHA256 4e701c98863c778c3f6fa465e426af23df88c9feee6fc9a9ca224a629a91e274
+EBUILD libtifiles2-1.1.3.ebuild 1056 RMD160 e4ed0925e7a88a0a04d8fd968bca802a91c86fc2 SHA1 ebd7c425becf1cf06c9de64095424e4cbdda194a SHA256 d576d99880483dbe8d6ab37d513280168c146bd52b46619c72a84de8d54b938a
+EBUILD libtifiles2-1.1.5.ebuild 1067 RMD160 5b4c2346bae3f94166924d9a438165697abc2548 SHA1 377d4a64825dc1b323bed6ace0d9a8a938b5ca55 SHA256 6a3370df727923a1ccbe11b8b9ecb6676db9d5916317fb027117b51077c88851
+MISC ChangeLog 2287 RMD160 e2dfb7d4d9e18edd367983fe0099b23a608dcb2a SHA1 4401952de5768c7aa642bd894c17b40fc71bf1fb SHA256 43f9db1cb23e0ff20787c1829438fe3c95a01b903d52d45a7371cfa944b344eb
 MISC metadata.xml 507 RMD160 8039551138ecdd71612dc791c0adee9fda4afe93 SHA1 ba4d5fa79fd4f8bb2cd3b4ffc0c4b4f78336f830 SHA256 ed5a0aecbf5f36e2b8a734ea7d702377f3f315a77a14dd92c4cb97982806b230
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk1/2BcACgkQ1ycZbhPLE2AeKgCgiUgv9Pm/nMEqFOT+o9t7nMXq
-byAAoJLUSiaCswpbb1CGiAghIuOfSeb2
-=JNch
+iQIcBAEBCAAGBQJPQPzUAAoJEF0huFKJUZL5bg4P/2I+AHzemH1tQ3MKQmQlnkMT
+/GOkR+bke46mL3quhuTsWcq7AppfwIwNPW98+lpEQLjm9klxBcL21jJ/VAw8e9yF
+pT3bd8xMpdLAprewN0psBXp6bLkhgbHaXzvsnC5b53Ad1+kMGtr5GaZmShLsJfXt
+N8cDzYGMnA+1NUObaQqolawolgSpK5n/kmir9ttUZctouLR+q4S39pnB8O1QkeDB
+5BURo8enRgwDfzA3OauhW4PPvDhXI6byMayEPAeQjxFWrojCp7sUmpf7raJuoOri
+ZDVmke4AZsd71MBTip6lFTR9spnsJYr0Bm9oUisBj36FIqpNpt8xmXp5JZbrk/WO
+Pw6fPX8o1a7eMNkEys5hUC4uQHgesVmXkdG62w+kiCHgAc3jN87mXT12TM92LJ0S
++3q2p1YRd3M2DdQcSQ5kVMH/Wd1sWsDyicCkqlilDSwbAg2UPZvxx0nyDvONL+Iq
+35VWupT+F92s57khrjpKYkLgdepkBwWqTcrViyMuToJc7YVS/WEbNdoV1if62WwT
+vr3FTjgZX8045qcKHs1sjF5XCzOcePgfpdvaUYjiJ/QVgggLvUNej0evm0SJceMp
+Bn9yDHv8G+IH0EnZxvbPeCOg57yyIz+ppBt8/PfVjXbyxUWP75MxgnepbhP+6/pV
+LmXjU1ddWPOjKV0fhDwj
+=zLCZ
 -----END PGP SIGNATURE-----
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
+}