From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3F8C859CA2 for ; Sat, 13 Feb 2016 14:55:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3FD2E07D6; Sat, 13 Feb 2016 14:55:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56EC6E07D6 for ; Sat, 13 Feb 2016 14:55:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 450E6340C1C for ; Sat, 13 Feb 2016 14:55:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C7798E9 for ; Sat, 13 Feb 2016 14:55:35 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1455375874.b099501a186220c788d7da99643c0b85e5f8107a.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/xapian/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/xapian/Manifest dev-libs/xapian/xapian-1.3.3-r2.ebuild dev-libs/xapian/xapian-1.3.4-r1.ebuild dev-libs/xapian/xapian-1.3.4-r2.ebuild dev-libs/xapian/xapian-1.3.4.ebuild X-VCS-Directories: dev-libs/xapian/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b099501a186220c788d7da99643c0b85e5f8107a X-VCS-Branch: master Date: Sat, 13 Feb 2016 14:55:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 47011311-1fc0-47ee-b11a-ff927de1c83d X-Archives-Hash: 3b6f9ca2a6c8b551a5d0be96245db28e commit: b099501a186220c788d7da99643c0b85e5f8107a Author: Anthony G. Basile gentoo org> AuthorDate: Sat Feb 13 15:04:34 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sat Feb 13 15:04:34 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b099501a dev-libs/xapian: remove older versions in 1.3 branch and fix subslot Package-Manager: portage-2.2.26 dev-libs/xapian/Manifest | 1 - dev-libs/xapian/xapian-1.3.3-r2.ebuild | 69 ---------------------- ...pian-1.3.4-r1.ebuild => xapian-1.3.4-r2.ebuild} | 2 +- dev-libs/xapian/xapian-1.3.4.ebuild | 69 ---------------------- 4 files changed, 1 insertion(+), 140 deletions(-) diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest index 1662f28..7fefc95 100644 --- a/dev-libs/xapian/Manifest +++ b/dev-libs/xapian/Manifest @@ -1,5 +1,4 @@ DIST xapian-core-1.2.19.tar.xz 3175384 SHA256 4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785 SHA512 5cd29b8c278b4fa652f947cd6689945bbe239c95425344d0fedb445bf1534198333844d91e6e59cf870043066f4dc511cd0268071916002e96bd38b59aa91c1b WHIRLPOOL 5d65982d47145addc6585b72a99494bf6d14277df2c796925fbe6284ddd08b89fbc147c1a29575d573afebb2e2f6eb6dc73d58161260404be7e5ceefe1371ffb DIST xapian-core-1.2.21.tar.xz 3202560 SHA256 63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f SHA512 a821043ea1686a09178bb91b14ed6a8cf00c50dfb0f066e420a40395edd3be085d7f89abb8f6a1151c847272c13601274e645055ede3548b07d5e912f0a70f81 WHIRLPOOL 9de8b2b70252b87da16a2502a831b46857f48cca8623a6ac411291bb6607bd61968ddd64a77c8685f300818abcbf91149a3f43af849a7843f67a5ebcc5130963 DIST xapian-core-1.2.22.tar.xz 3204096 SHA256 269b87ca3faf79d444e8bb82ed58a96f1955008d7702f9966dec68608588527f SHA512 cb6bd565eb307f9bc8f801fc9cda0cc6ad5d7cb8bf0af2ab6e42d48ca4ea4169f08621db810ab87d15957d0f873bcb0336e16b12fdb6026375d9c0192781e0d6 WHIRLPOOL 580c16889a6c3e99a00f8bb791f878a08ff3522c3dffb18ace18d54575247332f0fff8866f46475513dde7544205fe08971cbd284ec3714ce0d6b9b445e8746e -DIST xapian-core-1.3.3.tar.xz 2543260 SHA256 2d273ca0df6af208c4b6904542a9dffed8a9520376522d650e1a2885b476a280 SHA512 8b0d0fce532748efc1c2705e3f6f45ff83ec97be7c1f5b54846a9ff94b9d416b67491262a157afdc40497c52e1c4aa94bd11a78b4494db4a1fb45ba6d18f7099 WHIRLPOOL bf9c2f1606ba72469f2306cc6edfff63834c58831ee75063e39445392460b85478c9c44ef7d2ec1fdfd63bad113544f8c1ba3eb01ee178abf63da3a7ae2d5b3b DIST xapian-core-1.3.4.tar.xz 2570240 SHA256 0a49da54a1eecb43de657f6341fde386f4c6e6bd1d2d64f77212adfc44bf67d4 SHA512 b616eb3532aaf7a00f58e6f21fa7309e434f9e598322793d2e81fe90da2a9d343518c9900bd30686594efeb24d370099f0df8f3a30afadb613ba19638f700617 WHIRLPOOL 167df88df4d12548e69e97e1163487f8a0eef93daedbac2c4a0bd4e4515dc2932c2bd044b2ec4905d251fdc69b460cb4ada67b511c2bfd8495eff8c5697b5271 diff --git a/dev-libs/xapian/xapian-1.3.3-r2.ebuild b/dev-libs/xapian/xapian-1.3.3-r2.ebuild deleted file mode 100644 index 6042a74..0000000 --- a/dev-libs/xapian/xapian-1.3.3-r2.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="http://www.xapian.org/" -SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/1.3.5" # ABI version of libxapian-1.3.so, prefixed with 1.3. -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" - -REQUIRED_USE="inmemory? ( chert )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myconf="" - - einfo - if use cpu_flags_x86_sse2; then - einfo "Using sse2" - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - einfo "Using sse" - myconf="${myconf} --enable-sse=sse" - else - einfo "Disabling sse and sse2" - myconf="${myconf} --disable-sse" - fi - fi - einfo - - myconf="${myconf} $(use_enable static-libs static)" - - use brass || myconf="${myconf} --disable-backend-brass" - use chert || myconf="${myconf} --disable-backend-chert" - use inmemory || myconf="${myconf} --disable-backend-inmemory" - - myconf="${myconf} --enable-backend-remote --program-suffix=" - - econf $myconf -} - -src_install() { - emake DESTDIR="${D}" install - - mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" || die - use doc || rm -rf "${D}usr/share/doc/${PF}" - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - prune_libtool_files --all -} - -src_test() { - emake check VALGRIND= -} diff --git a/dev-libs/xapian/xapian-1.3.4-r1.ebuild b/dev-libs/xapian/xapian-1.3.4-r2.ebuild similarity index 96% rename from dev-libs/xapian/xapian-1.3.4-r1.ebuild rename to dev-libs/xapian/xapian-1.3.4-r2.ebuild index 6341123..4aa3cc0 100644 --- a/dev-libs/xapian/xapian-1.3.4-r1.ebuild +++ b/dev-libs/xapian/xapian-1.3.4-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://www.xapian.org/" SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" LICENSE="GPL-2" -SLOT="0/1.3.4" # ABI version of libxapian-1.3.so, prefixed with 1.3. +SLOT="0/1.3.5" # ABI version of libxapian-1.3.so, prefixed with 1.3. KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory" diff --git a/dev-libs/xapian/xapian-1.3.4.ebuild b/dev-libs/xapian/xapian-1.3.4.ebuild deleted file mode 100644 index 58616c5..0000000 --- a/dev-libs/xapian/xapian-1.3.4.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils - -MY_P="${PN}-core-${PV}" - -DESCRIPTION="Xapian Probabilistic Information Retrieval library" -HOMEPAGE="http://www.xapian.org/" -SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/1.3.4" # ABI version of libxapian-1.3.so, prefixed with 1.3. -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory" - -DEPEND="sys-libs/zlib" -RDEPEND="${DEPEND}" - -REQUIRED_USE="inmemory? ( chert )" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myconf="" - - ewarn - if use cpu_flags_x86_sse2; then - ewarn "Using sse2" - myconf="${myconf} --enable-sse=sse2" - else - if use cpu_flags_x86_sse; then - ewarn "Using sse" - myconf="${myconf} --enable-sse=sse" - else - ewarn "Disabling sse and sse2" - myconf="${myconf} --disable-sse" - fi - fi - ewarn - - myconf="${myconf} $(use_enable static-libs static)" - - use brass || myconf="${myconf} --disable-backend-brass" - use chert || myconf="${myconf} --disable-backend-chert" - use inmemory || myconf="${myconf} --disable-backend-inmemory" - - myconf="${myconf} --enable-backend-remote --program-suffix=" - - econf $myconf -} - -src_install() { - emake DESTDIR="${D}" install - - mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}" || die - use doc || rm -rf "${D}usr/share/doc/${PF}" - - dodoc AUTHORS HACKING PLATFORMS README NEWS - - prune_libtool_files --all -} - -src_test() { - emake check VALGRIND= -}