Fix postgres dep to libpq, bug #214673

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 61 deletions

diff --git a/app-misc/sphinx/ChangeLog b/app-misc/sphinx/ChangeLog
index 75d17f7ebeff..60ac49bb12c4 100644
--- a/app-misc/sphinx/ChangeLog
+++ b/app-misc/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/sphinx
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.3 2008/03/14 12:22:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/ChangeLog,v 1.4 2008/03/26 14:08:56 caleb Exp $
+
+*sphinx-0.9.8_rc1-r1 (26 Mar 2008)
+
+  26 Mar 2008; Caleb Tennis <caleb@gentoo.org> -sphinx-0.9.8_pre1065.ebuild,
+  -sphinx-0.9.8_pre1112.ebuild, +sphinx-0.9.8_rc1-r1.ebuild:
+  remove old ebuilds, change postgres dep to libpq
 
 *sphinx-0.9.8_rc1 (14 Mar 2008)
 
diff --git a/app-misc/sphinx/Manifest b/app-misc/sphinx/Manifest
index 132331f9306f..15e1298dc347 100644
--- a/app-misc/sphinx/Manifest
+++ b/app-misc/sphinx/Manifest
@@ -1,11 +1,8 @@
 AUX sphinx-0.9.7-fix-sandbox.patch 568 RMD160 953814b1ec204984b3e43f3352fa67a25deef6d9 SHA1 a1bb1fd97d42ec15e1821b453a486118e3052a0b SHA256 8e2e04d6e2021ffe33afe784a05aebebe46048750da12a93adec0396df75be02
 DIST sphinx-0.9.7.tar.gz 344500 RMD160 b2f679855cf725a154478e59d980c60124165915 SHA1 30d13e7a63ed28282b49b5db364c48811d9c4b47 SHA256 6c841b9042f880394858dd0373a1e3343c30e815422671ba3872691326c1c0a4
 DIST sphinx-0.9.8-rc1.tar.gz 636074 RMD160 1095235757f4b744a07c0d4e37cae21b9a865be0 SHA1 8cf276eb9ddd09dcec88a55d54570bd7367c3686 SHA256 439d42e021149c6b8ba809785b8f72923a84039c224420f4a124469e87f098b1
-DIST sphinx-0.9.8-svn-r1065.tar.gz 491770 RMD160 8c1b52f76ee635b4a4dbe7dce96fd5b1a3e8ea89 SHA1 f30e2bbde8c34894339a3159ac3075499558a261 SHA256 f8d4e9084570400be377c276c0987609d9e329ffc046806f8c99ec9adfc3fd59
-DIST sphinx-0.9.8-svn-r1112.tar.gz 544277 RMD160 2817a3838b4dabe7a9dd5a0b3e238fcf9799c12b SHA1 4ef4b6098c0d3ea7e20d2bf207318b3cb7dec692 SHA256 2f774438de2b67071b071e956e64f1c362b629f16991bd41eded1f78031ed57d
 EBUILD sphinx-0.9.7.ebuild 1081 RMD160 64a30912595dd494e0f1f59d665112bdb047bef8 SHA1 624de8956997ee141bc078980dea266c8d7e56c8 SHA256 520c28d832a3d2272b5d0067431f2b5d6a19f225b1ee6af1b7c237325bd3a4e4
-EBUILD sphinx-0.9.8_pre1065.ebuild 1138 RMD160 b99b8eb2e4242d0f5947472f4fa13de96fe92acd SHA1 0002938dac0979f5b6d65985a64b9a95d40c6f79 SHA256 dcbd1c7c2974528631cce9e236b0240df7d16ff29996fcd2b5e88b6319c33e0d
-EBUILD sphinx-0.9.8_pre1112.ebuild 1140 RMD160 7951126bf446bf45a123f0a26e0fbc81545a2211 SHA1 671e74370b83ea3f30f21848c4f1cc992a94248f SHA256 541917e6dd99023ed4896af8731e8416da1445f175c9a3e2a89838c8aded4156
+EBUILD sphinx-0.9.8_rc1-r1.ebuild 1080 RMD160 2f0a1c0ca03a9430e0a436321b875d58737bd324 SHA1 bfb94c820781178051e00e439440931352c139e9 SHA256 e36adac5b27a4046e141351c1c6c62776badf7fe0d1f10b4b7a9bf7c05bfa922
 EBUILD sphinx-0.9.8_rc1.ebuild 1128 RMD160 59d77ea6019aa1e0a3d9b260d2ae12e351e7cb73 SHA1 dc210b6544db8ccb1685b59f5991cc5080472219 SHA256 cd63e7c63393af55c301f01f78a25e25cdd7c6929b9e607e07d14dd64ed97f25
-MISC ChangeLog 744 RMD160 d10244cb56fc5237b5c1e04a70d451f572d4cf43 SHA1 e98bb89603f084ca52b555909065446215215b89 SHA256 1eedc6fe014103599c88c4819823c93a72343f43a9e1527862584b5552f240a1
+MISC ChangeLog 970 RMD160 93efcc1b1abc1a3adc19e2c0b778020f0cca751d SHA1 5f6a78f182920901842210b6b56b3a0a2148bd6a SHA256 0dc30dfb0735c5cfa08ab12fb1c9c9fa10402de3de171ea3b3fee4b3018648a1
 MISC metadata.xml 252 RMD160 4975ee0177b93542969b3ed3d9a29d7533745e3b SHA1 2eec8a59c9e6c7d702ff8e8ca85c206c17f3cf21 SHA256 8896dbe5acd055978bc9088a6e8c3a1d2eaecc12bd22ce864dd53fb0130fca81
diff --git a/app-misc/sphinx/sphinx-0.9.8_pre1065.ebuild b/app-misc/sphinx/sphinx-0.9.8_pre1065.ebuild
deleted file mode 100644
index 8a0e054f0c79..000000000000
--- a/app-misc/sphinx/sphinx-0.9.8_pre1065.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8_pre1065.ebuild,v 1.2 2008/01/24 04:54:51 mr_bones_ Exp $
-
-inherit eutils autotools
-
-MY_P=${P/_pre/-svn-r}
-
-DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
-HOMEPAGE="http://www.sphinxsearch.com/"
-SRC_URI="http://sphinxsearch.com/downloads/${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="mysql postgres debug"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-#	epatch "${FILESDIR}"/${P}-fix-sandbox.patch
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_with mysql) \
-		$(use_with postgres) \
-		$(use_with debug) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc doc/* example.sql
-	dodir /etc/sphinx
-	insinto /etc/sphinx
-	doins sphinx.conf.dist
-
-	dodir /var/lib/sphinx
-	dodir /var/log/sphinx
-	dodir /var/run/sphinx
-}
diff --git a/app-misc/sphinx/sphinx-0.9.8_pre1112.ebuild b/app-misc/sphinx/sphinx-0.9.8_rc1-r1.ebuild
index f46dd3016bd0..9ac005847dea 100644
--- a/app-misc/sphinx/sphinx-0.9.8_pre1112.ebuild
+++ b/app-misc/sphinx/sphinx-0.9.8_rc1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8_pre1112.ebuild,v 1.1 2008/02/18 15:10:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/sphinx/sphinx-0.9.8_rc1-r1.ebuild,v 1.1 2008/03/26 14:08:56 caleb Exp $
 
 inherit eutils autotools
 
-MY_P=${P/_pre/-svn-r}
+MY_P=${P/_/-}
 
 DESCRIPTION="Full-text search engine with support for MySQL and PostgreSQL"
 HOMEPAGE="http://www.sphinxsearch.com/"
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~amd64"
 IUSE="mysql postgres debug"
 
 DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql )"
+	postgres? ( dev-db/libpq )"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -25,7 +25,6 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-#	epatch "${FILESDIR}"/${P}-fix-sandbox.patch
 	eautoreconf
 }