From aee6455f255927c8416607166384bd9818129519 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Fri, 20 Feb 2015 09:29:58 +0000 Subject: [PATCH] ppc/ppc64 stable wrt bug #525974 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xC42EB5D6 --- dev-db/libiodbc/ChangeLog | 6 ++- dev-db/libiodbc/Manifest | 15 ++++--- dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild | 51 ----------------------- dev-db/libiodbc/libiodbc-3.52.7.ebuild | 42 ------------------- dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild | 4 +- 5 files changed, 14 insertions(+), 104 deletions(-) delete mode 100644 dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild delete mode 100644 dev-db/libiodbc/libiodbc-3.52.7.ebuild diff --git a/dev-db/libiodbc/ChangeLog b/dev-db/libiodbc/ChangeLog index 68836500b31a..3eb14b691273 100644 --- a/dev-db/libiodbc/ChangeLog +++ b/dev-db/libiodbc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/libiodbc # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.68 2015/01/16 10:03:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.69 2015/02/20 09:29:48 zlogene Exp $ + + 20 Feb 2015; Mikle Kolyada -libiodbc-3.52.7-r1.ebuild, + -libiodbc-3.52.7.ebuild, libiodbc-3.52.8-r2.ebuild: + ppc/ppc64 stable wrt bug #525974 16 Jan 2015; Raúl Porcel libiodbc-3.52.8-r2.ebuild: alpha/ia64/s390/sh/sparc stable wrt #525974 diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest index 91d840961423..a0228231866a 100644 --- a/dev-db/libiodbc/Manifest +++ b/dev-db/libiodbc/Manifest @@ -9,17 +9,16 @@ AUX libiodbc-3.52.7-multilib.patch 853 SHA256 bb9e60277d14f16206351efdd22e74264e AUX libiodbc-3.52.7-unicode_includes.patch 432 SHA256 cfa6fc4bdbd200f5eb7d502b9d5878d46a9c7b140b41c876dfda4e42bbda6f97 SHA512 b4bd56e88199ed06ec7ce64bbf53c3d792c501cdadee44a1c52d95336c36e93c2379d312b14c576a138210f2cf277e895ded18e80db4e5bb3f664ccb5695a305 WHIRLPOOL 8af0a923e8425094afaa10b22c00aa67094084c350885d6bd03ec467cafbb703d93d0c94885ba7edbc79e95a1493df38e8c99ff34d3a3beb8bbb7d77d0b79040 AUX libiodbc-3.52.8-gtk-parallel-make.patch 661 SHA256 c7275637ce251106258d2436f640c352eef11c3083515cf109ce88e0d6efaac5 SHA512 5378bba53eea8c45a13631b5b8d0d4efed78ea2f786835d509431da3813924cbc07aae3d19053efef6fc052d351193f576ed4fcc301956f59f3e36e18280d537 WHIRLPOOL 059a360ff0d0a9cc04e1a65bc6323a2673935dda8eaf7db78a56a1a63e66f31ff3f71ce8bc1bf42a4a3c61b1a5a58c74556763743069c20d66032e2bebd33e49 AUX libiodbc-3.52.8-runtime-failures.patch 2033 SHA256 84909ef0bbd8a862c9ed83ca73f22fa7bf75107eeb35d36d87a9b8413c9da66d SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142 WHIRLPOOL 2dd19d56ad6ba8ff6688769f22c2afd25d275fe0c75c9824b1b8c3e1d575ead75be6b180b5e7c2e40301a29a381db6a29ff8a94c6ebde1a7cab28a21cbc4a108 -DIST libiodbc-3.52.7.tar.gz 1038710 SHA256 d7002cc7e566785f1203f6096dcb49b0aad02a9d9946a8eca5d663ac1a85c0c7 SHA512 a0274cd40d8fa7445f9442541e7e1d90427273a137fc2d3227e81e8af42fb35a8a38a3601f445ee821a0f88cca732d56cec8b7f08e94492da3aca609063f1a1e WHIRLPOOL c63770fff3fd14cb727828b5c016c127bf17454dbd20b9f7aba6d569fcaf58051d7abf3f9015546931a99144c62a1e38ad0da10bb42b835a2b25017b5ede1134 DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b -EBUILD libiodbc-3.52.7-r1.ebuild 1393 SHA256 cc6ec61a1de48b490ca94e87cf6ad0932d1f32af1c219a9cd1b2912198472215 SHA512 af8b22a53bfd0914535ea535e380b1dac122abc6dae970645cf7e9bec248b2eb93c18fc78e9d71f5ed75aa4480015fc546631078a6347a887afa63efc77c3b1a WHIRLPOOL 3e12b4e839b4fb8c2d6e3142cd8f0a77b3c3cb04f91c316349282f14aee0c19600aed430cca29bcd902f378a31f9d920acec07087eef610609936085fa1b1a55 -EBUILD libiodbc-3.52.7.ebuild 1049 SHA256 51c19fffce3f934792c0495779033d4f78cc398e4129e2ddbb4ba865a4f0f0d3 SHA512 876c15e19f280ab3c60f8186ad123b8ac53de620db2d2e0bbfafc0b0450d62795e3b893c047f759fd6943e30604e13cd6c694c8253870cd842eab346b2138ce9 WHIRLPOOL 5366d54a50808bb7251e722e909635278325872d9170fe99ef72a7fb8e8edec42b17dc986ba82b33793f95bfd00af67048fa13bb68d666aee8e0c151664ffcf3 -EBUILD libiodbc-3.52.8-r2.ebuild 1830 SHA256 d713d937253a3a97526d31fa68df1f987565c3064d29f19f80dd67ae68fca6d9 SHA512 2f4e4d476ae477e61a86f11432167119c53699a5fa48f5d3371d08afb5596c4fdd2331788f71250a44cfd2862130b1e38d540b69ddf3498ddb83641c4ec20e7a WHIRLPOOL 6d0d1e9d6551d244eb150c7a918baea7b09a608f6b566bbc6f0fc31c019a0e1a62dedd312e5cd5417fee1fa8dab94c7eb24252796a3304390554b6463fee4099 -MISC ChangeLog 8823 SHA256 fdcdf4dcbdc7a531812088628d328f1a4059d14dd957b72c420309551c7045d4 SHA512 76b108f3feb4030cbb17564dc4168ac5724a0f4f4b605764486ccb46d0a3d7b515729c3472982f8fdc3bbbdffbae51a730969f52d9d0b24019a6fb412f02fa44 WHIRLPOOL 7300a5cad86974cf48f8628fdc6f6ec3156aa5587be87e55cdd6ae26401a06d90828368649ec92d95d975652258e32563a4eb044d76f37a319fc53a62519e79e +EBUILD libiodbc-3.52.8-r2.ebuild 1828 SHA256 de6cbaabb7248253877ce6eb7dbe7fb662f12a7cea53f03f836d121e68ecf126 SHA512 f4d0b5838566e36a36492522f9ed39d3c731522bad413f1370592ba9a0e6785adccd47db7ec9dce2e2a287a87359b6067643a5e3ed35f2116035a9b69784ebfd WHIRLPOOL 290c9dbb3e1c67d5ef7322bec2fe04d8033333106cca0f61b0dd2b2625a8ad7082791b6cf22e135324e9cefa31d7650f4779d2d88697ee5d4768b73775ba8ee8 +MISC ChangeLog 8991 SHA256 a91470a39e7fd3bd843da80d2b8252f614a12483865259bbe0a3a57a36ad5318 SHA512 3f4e7344f9c31222167de75d43abf35bf2ebe8ea57170b1b1c8066dba6e0032b7cd1a7c00c78b0b9663480d85a0a39febe197a31fb8167eb8b11b49f1196b82a WHIRLPOOL 0827d7b9ac3a06491f148b233a7817dc184e9b5e39d77c9cb8382ce5fb18055c4120801b7cfcdcd7e7d2abc8d2ef00c7d407eebc5e939086c8d29e256a7a70fd MISC metadata.xml 206 SHA256 375feec21d1a56bde55d17f03a78c0163b4171898d96945fd0ab792d5d40f32d SHA512 c24642895ceb33fe433db64cf5c29160c99aba8a1462d30714a0108ceb277c2377628066bd1cda636412579e3147966bacde6627d918cd31ccff506be27e83f9 WHIRLPOOL 93d0e74df30edeb25a99dae15e20948e96e7f8ab0fa1fb12c1bf8b2bb324aaa10eceda2043a2a6b9fa2f0f9ac7ed9e75a81838634bf84932c9a53ec8cb8288e7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlS44eYACgkQuQc30/atMkCy5ACgm4/ui2sFOr79e7c0HkF9JePp -B8UAnigc+y9ca3xDXeFNfDWtGCnkRgOs -=venO +iJwEAQEIAAYFAlTm/ioACgkQG9wOWsQutda4nQP/RVvFirUkGUAnTLi3iDdwZ3xK +4H/ozhS9mFw9Uy9QCb0aMtHLBZwbI68QCXtaYjgAmUe1jhm88YTBwb0tPBfyVdHS +o7cGHPDLtWSTrf3xeEg8ZHvmecY++brzEIMJ+WG8y4RNzK+Oh79pA/EPD629sKzf +vFY5iejtiddhNXP/4pw= +=fpve -----END PGP SIGNATURE----- diff --git a/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild b/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild deleted file mode 100644 index 1cf3ffaf01a3..000000000000 --- a/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.7-r1.ebuild,v 1.6 2014/08/10 20:00:58 slyfox Exp $ - -EAPI=4 - -inherit eutils - -DESCRIPTION="ODBC Interface for Linux" -HOMEPAGE="http://www.iodbc.org/" -SRC_URI="http://www.iodbc.org/downloads/iODBC/${P}.tar.gz" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" -LICENSE="|| ( LGPL-2 BSD )" -SLOT="0" -IUSE="gtk static-libs" - -DEPEND=">=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - gtk? ( x11-libs/gtk+:2 )" -RDEPEND="${DEPEND}" - -DOCS="AUTHORS ChangeLog NEWS README" - -MAKEOPTS="${MAKEOPTS} -j1" - -src_prepare() { - sed -i.orig \ - -e '/^cd "$PREFIX"/,/^esac/d' \ - iodbc/install_libodbc.sh || die "sed failed" - epatch \ - "${FILESDIR}"/libiodbc-3.52.7-debian_bug501100.patch \ - "${FILESDIR}"/libiodbc-3.52.7-debian_bug508480.patch \ - "${FILESDIR}"/libiodbc-3.52.7-gtk.patch \ - "${FILESDIR}"/libiodbc-3.52.7-multilib.patch \ - "${FILESDIR}"/libiodbc-3.52.7-unicode_includes.patch - chmod -x include/*.h -} - -src_configure() { - econf \ - --with-layout=gentoo \ - --with-iodbc-inidir=yes \ - $(use_enable gtk gui) \ - $(use_enable static-libs static) -} - -src_install() { - default - use static-libs || find "${ED}" -name '*.la' -exec rm -f {} + -} diff --git a/dev-db/libiodbc/libiodbc-3.52.7.ebuild b/dev-db/libiodbc/libiodbc-3.52.7.ebuild deleted file mode 100644 index e8306aaf4758..000000000000 --- a/dev-db/libiodbc/libiodbc-3.52.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.7.ebuild,v 1.12 2014/08/10 20:00:58 slyfox Exp $ - -EAPI="1" - -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" - -DESCRIPTION="ODBC Interface for Linux" -HOMEPAGE="http://www.iodbc.org/" -SRC_URI="http://www.iodbc.org/downloads/iODBC/${P}.tar.gz" -LICENSE="|| ( LGPL-2 BSD )" -SLOT="0" -IUSE="gtk" - -DEPEND=">=sys-libs/readline-4.1 - >=sys-libs/ncurses-5.2 - gtk? ( x11-libs/gtk+:2 )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - sed -i.orig \ - -e '/^cd "$PREFIX"/,/^esac/d' \ - iodbc/install_libodbc.sh || die "sed failed" -} - -src_compile() { - econf \ - --with-layout=gentoo \ - --with-iodbc-inidir=yes \ - $(use_enable gtk gui) \ - || die "econf failed" - - emake -j1 || die "emake failed" -} - -src_install() { - emake -j1 DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild index 56fedc83f04b..431d2338f82f 100644 --- a/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild +++ b/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild,v 1.7 2015/01/16 10:03:17 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.52.8-r2.ebuild,v 1.8 2015/02/20 09:29:48 zlogene Exp $ EAPI="5" @@ -12,7 +12,7 @@ DESCRIPTION="ODBC Interface for Linux" HOMEPAGE="http://www.iodbc.org/" SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos" LICENSE="|| ( LGPL-2 BSD )" SLOT="0" IUSE="gtk" -- 2.26.2