Fix logic to allow initial install, not only upgrades #469262

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

3 files changed, 81 insertions, 12 deletions

diff --git a/dev-db/couchdb/ChangeLog b/dev-db/couchdb/ChangeLog
index 91fde4c0a3e5..af0623d78289 100644
--- a/dev-db/couchdb/ChangeLog
+++ b/dev-db/couchdb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/couchdb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.72 2013/05/03 13:23:59 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/ChangeLog,v 1.73 2013/05/16 04:06:37 patrick Exp $
+
+*couchdb-1.3.0-r1 (16 May 2013)
+
+  16 May 2013; Patrick Lauer <patrick@gentoo.org> +couchdb-1.3.0-r1.ebuild:
+  Fix logic to allow initial install, not only upgrades #469262
 
   03 May 2013; Dirkjan Ochtman <djc@gentoo.org> couchdb-1.2.1.ebuild,
   couchdb-1.3.0.ebuild, files/couchdb.conf-0.10, files/couchdb.init-3,
diff --git a/dev-db/couchdb/Manifest b/dev-db/couchdb/Manifest
index 3fd2f5ee68f6..b2511a8a2838 100644
--- a/dev-db/couchdb/Manifest
+++ b/dev-db/couchdb/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX couchdb.conf-0.10 338 SHA256 4fa2dafadedb5eb6c6afbca5e8aca04f75a954e35491ddece3daebc496a534b8 SHA512 55a22f63691ee7bc74ad1445cc052299fa915a9d4e95662ca9df4debb0a9d5b325274164913cafacbd19860a3051b6feaeec45c629effbaaa37c0b8efd6be64b WHIRLPOOL 33e5eece8fa8fb9c9000af1bfbdde36319cc43fbbc5ef83ae71fd0c06662c26a3f237dcfeae4c45757abfcb31d02ab5ac3d6f8d5bc661465731d6ca669696169
 AUX couchdb.conf-2 234 SHA256 056042951c9314feab924d707bf347b2ef265f10e90bec847315d9c0156f700a SHA512 5c40927957362a7431be6980be3a239e4ee0ca47d28f1b4d4fb3014b307e459eb429f5b50e0c8aa58b3e9f2285371616a58f06207e272feae1bed33f8c32d836 WHIRLPOOL 694a6ad4d948a56903ea8c628506325bcac181b827c8000aad1032014668da19d571ecee6f37bc1ecaec06c7783ea2918685aa107ff3786f5909cfbf3356fd5c
 AUX couchdb.init-0.10 1176 SHA256 8e3dcdd68702927da09aec2f730ee7ce98a442095279ccf26bf3ef75febda824 SHA512 f96b0586f1414b7368523bc0c343839d89ed8b1b55e7e099b9e80584aad10595919405662757eab79940bcd3b3290aabdf9b0a0f46df9114ceedc45ecbf5681f WHIRLPOOL c9e00ee27bd2b12603eee49201ccc03a5f50c861157550fc030eb6f10373d32aeb4bb2239668842d2f671be10d3c941f4b6f864fcf7d582685f6ab97a8715a6b
@@ -10,13 +7,7 @@ AUX couchdb.init-4 438 SHA256 7f191b22d82b5e430b0c1d29a7e9e791a69a0867e96d2a643e
 DIST apache-couchdb-1.2.1.tar.gz 1372433 SHA256 b54e643f3ca5f046cfd2f329a001efeaae8a3094365fa6c1cb5dcf68c1b25ccd SHA512 f98ec79f67a26f9d745f4ef14f33830b0103dc41aeb00e237b69ca94691c5b2203b3cf33afe0de744cb74b127f3aff491b18e89602dd843b4a1cd111658f4f97 WHIRLPOOL f8d6492c8214861756c96d5f6841bbe77c04ad372044f7c4117e9bd1d1b3508ffc5dd2cb3c9c9bbce8d24f0df911a831d0212cb4d5df3d19b5dbbd9dbfc9a2af
 DIST apache-couchdb-1.3.0.tar.gz 3420515 SHA256 591a2a5b92941cee1bba1e16e5a4978df8a81079a8b2efa766c36540b66a37f7 SHA512 8e44fd9e585abf50e3a0ddeb76a2f4045c881b3097114d0ed2356466d6b00ea78cd6fd57c5cf3ffb17ddeccdc53d0ab060047b442f4e9f9e1daece11372dd46f WHIRLPOOL 0c42a27e045a5b7fcb0b9217bf1ec5a1ee51f6b87663220deb015fb1047e9d67bda421bf5ffeb9c548225e29cf2512607b3dc2d39661d6da106f29c8e80800df
 EBUILD couchdb-1.2.1.ebuild 1589 SHA256 b191b2c2b31e7f159da772476668ffef8e17abe957f99a8790136e126cfc3361 SHA512 e2d4e6ba68d932e6228344de488ef532cf578df971c0806aaca9cdd187bd345af6c2392b151982f94db9453cffa118f1c70b1c1918189f7bad8138c08eb52a78 WHIRLPOOL 31b5614d00f051c1abd0c1d7bae998bcf47908326ad1b3a336786b6cef8cb1293ece7f61eb8885dc5bb06dcf5d4418f3e10ea61d029910109e49f6a13223dfa5
+EBUILD couchdb-1.3.0-r1.ebuild 1717 SHA256 ec0191ea9e9b06e8eea08b815a50910455df0d3b797d1814c547f35053df4948 SHA512 2ac9e0c2b433ae8e8faa10c08f4267fcf5733750de7167246c84056366bbed9e923bfd3cd38426de7273ec42e005929ce7e51d346e9d88b475857955b9fcc95c WHIRLPOOL 6f7bc022cf3455b019fcb5cbba197021213121267109c6c8120d2d12f4f8ef712766cb1e0ea864f03d7f63e72748f2c17b1f4df6054df0c3c0fc3b794c5bb8c8
 EBUILD couchdb-1.3.0.ebuild 1704 SHA256 7dff66863898b1484da0e73df384cb50736d95c2c7fe35acec4d5adc06f03ca4 SHA512 ae6ea6b4f626315f6944003d10a89b8507e2e714c110cbf76bb877766f183a8aa9534aa88a5febf2f4f310eba96e888cdd6c947c5cf2f548111e4d985927c4e0 WHIRLPOOL 9ae31a4aa15c74599a0ce502e0e90586339c155bf252c7002ea277eccd4696fe0949cda938c1caf8be357266a7d5d074aede7d089f92a660e94b3557b42abdc9
-MISC ChangeLog 9533 SHA256 c02dfbfdb1e511035dbdb215253bed0ce48ef3de089708ccfb611d68836f8cbc SHA512 6eb90feefa905e4120ee020ce1ea29d282ff62cdd8b0370c5d9d3b2599a6601cbc82e72f0f502050bddc2b46d8d300fc220a55603c392d37f87d204523e5352b WHIRLPOOL 8af1c5aeb221fd6ad0f26c38856074ddc161930066053539d68e19072b6660ed8634ea22ecbf56de331f2379421bf5c04d96be095a255ed07e445bb624f052c5
+MISC ChangeLog 9711 SHA256 67457a6fcd7f9994d3b7910a078f3cb669ed2c8ad01d49eefab6b9dff4dbb3a6 SHA512 9c523dca27448a3d0a9c901794f1a3d7e38e0d870fea73103555e501c67d4874736ec1599c7906184758cc43cb372ae31b8ec38f9b4c9195ebe5ddd15e9738e5 WHIRLPOOL e3d9918a2f5f29139a9b0bb2a1059e5fee0493a4cd2a9f9351f90ae31e8816ca6c989fd5e720cc44e2043f3cdc302dcc76bf0d2f76826e4b69428fa36b40991c
 MISC metadata.xml 198 SHA256 5caca51bb42a27d79fe99901fc0331653e71cb0a40baa1c387b9d3fc99e007a8 SHA512 ce42b56d5a9225aa9cbf7ddc4f92285df0ceb9eadf9befe0787837f40c6f86dce0b3a9de2b29e14a6c224ce25e6038d7e1bfe5e56ebedd2cb5be87fc9a216d89 WHIRLPOOL 9ce3e5ec80ac4302b609914f7a821fba1bbcead615d535c0d17b9b1e37892c4a9b2cbcbe6a46406e99bb3eb4f5b634277913b34f1f1b3b39d2d51e2c2dcda24e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlGDuoEACgkQxeMuLWsGW/sbegCghWzmpX0GdfbF4caBlzN799SL
-ibcAmQGWNGodrUpwFA1z+H5g95/2umB3
-=xMG9
------END PGP SIGNATURE-----
diff --git a/dev-db/couchdb/couchdb-1.3.0-r1.ebuild b/dev-db/couchdb/couchdb-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..115070d62c70
--- /dev/null
+++ b/dev-db/couchdb/couchdb-1.3.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/couchdb/couchdb-1.3.0-r1.ebuild,v 1.1 2013/05/16 04:06:37 patrick Exp $
+
+EAPI=5
+
+inherit eutils multilib pax-utils user
+
+DESCRIPTION="Apache CouchDB is a distributed, fault-tolerant and schema-free document-oriented database."
+HOMEPAGE="http://couchdb.apache.org/"
+SRC_URI="mirror://apache/couchdb/source/${PV}/apache-${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=">=dev-libs/icu-4.3.1
+		<dev-lang/erlang-16[ssl]
+		>=dev-libs/openssl-0.9.8j:0
+		>=net-misc/curl-7.18.2
+		>=dev-lang/spidermonkey-1.8.5"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/apache-${P}"
+
+pkg_setup() {
+	enewgroup couchdb
+	enewuser couchdb -1 -1 /var/lib/couchdb couchdb
+}
+
+src_prepare() {
+	sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
+}
+
+src_configure() {
+	econf \
+		--with-erlang=/usr/lib/erlang/usr/include \
+		--localstatedir=/var \
+		--with-js-lib=/usr/lib
+	# bug 296609, upstream bug #COUCHDB-621
+	sed -e "s#localdocdir = /usr/share/doc/couchdb#localdocdir = /usr/share/doc/${PF}#" -i Makefile || die "sed failed"
+}
+
+src_compile() {
+	emake
+	# bug 442616
+	pax-mark mr src/couchdb/priv/couchjs
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	fowners couchdb:couchdb \
+		/var/lib/couchdb \
+		/var/log/couchdb
+
+	for f in "${D}"/etc/couchdb/*.ini ; do
+		fowners root:couchdb "${f#${D}}"
+		fperms 660 "${f#${D}}"
+	done
+	fperms 664 /etc/couchdb/default.ini
+
+	newinitd "${FILESDIR}/couchdb.init-4" couchdb
+	newconfd "${FILESDIR}/couchdb.conf-2" couchdb
+
+	sed -i -e "s:LIBDIR:$(get_libdir):" "${D}/etc/conf.d/couchdb"
+}