diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-11-11 02:18:49 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2012-11-11 02:18:49 +0000 |
| commit | 5014d897c6597da3f7997b2e55b4386d186cc40d (patch) | |
| tree | 3b0b8646ffa864fede725a4c6caf5365c1d6a108 /dev-db | |
| parent | stable ppc, bug #439518 (diff) | |
| download | gentoo-2-5014d897c6597da3f7997b2e55b4386d186cc40d.tar.gz gentoo-2-5014d897c6597da3f7997b2e55b4386d186cc40d.tar.bz2 gentoo-2-5014d897c6597da3f7997b2e55b4386d186cc40d.zip | |
Fix bug #419429 (build failure with Python 3 selected), thanks to Julian for the patch. Also fix a missing 'use logger' in the init script.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/drizzle/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/drizzle/drizzle-7.2.4.ebuild | 10 | ||||
| -rw-r--r-- | dev-db/drizzle/files/drizzle.init.d.2 | 3 |
3 files changed, 16 insertions, 4 deletions
diff --git a/dev-db/drizzle/ChangeLog b/dev-db/drizzle/ChangeLog index 10d444c94e86..3fc833f0337d 100644 --- a/dev-db/drizzle/ChangeLog +++ b/dev-db/drizzle/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-db/drizzle # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.32 2012/11/11 02:04:53 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/ChangeLog,v 1.33 2012/11/11 02:18:49 flameeyes Exp $ + + 11 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> drizzle-7.2.4.ebuild, + files/drizzle.init.d.2: + Fix bug #419429 (build failure with Python 3 selected), thanks to Julian for + the patch. Also fix a missing 'use logger' in the init script. 11 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> -drizzle-7.2.3.ebuild: Remove old version. diff --git a/dev-db/drizzle/drizzle-7.2.4.ebuild b/dev-db/drizzle/drizzle-7.2.4.ebuild index 58392c5ec35f..b86d99de1b08 100644 --- a/dev-db/drizzle/drizzle-7.2.4.ebuild +++ b/dev-db/drizzle/drizzle-7.2.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2.4.ebuild,v 1.1 2012/11/11 01:59:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.2.4.ebuild,v 1.2 2012/11/11 02:18:49 flameeyes Exp $ EAPI=5 -inherit flag-o-matic libtool autotools eutils pam user versionator +inherit python flag-o-matic libtool autotools eutils pam user versionator MY_P="${P}-alpha" S="${WORKDIR}/${MY_P}" @@ -37,6 +37,7 @@ RDEPEND="tcmalloc? ( dev-util/google-perftools ) !dev-db/libdrizzle" DEPEND="${RDEPEND} + =dev-lang/python-2* sys-devel/gettext dev-util/intltool dev-util/gperf @@ -46,12 +47,17 @@ DEPEND="${RDEPEND} pkg_setup() { enewuser drizzle -1 -1 /dev/null nogroup + python_set_active_version 2 + python_pkg_setup } src_prepare() { epatch "${FILESDIR}"/${PN}-7.2.3-libtool.patch epatch "${FILESDIR}"/${PN}-7.2.3+automake-1.12.patch epatch "${FILESDIR}"/${PN}-7.2.4+boost-1.50.patch + + python_convert_shebangs -r 2 . + eautoreconf } diff --git a/dev-db/drizzle/files/drizzle.init.d.2 b/dev-db/drizzle/files/drizzle.init.d.2 index 8be486a64221..9d1609a0e4d2 100644 --- a/dev-db/drizzle/files/drizzle.init.d.2 +++ b/dev-db/drizzle/files/drizzle.init.d.2 @@ -2,7 +2,7 @@ # Copyright 1999-2012 Pavel Stratil, senbonzakura.eu # Some functions were taken from debian init script. Licensed under GPL-2 # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/files/drizzle.init.d.2,v 1.1 2012/11/11 01:59:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/files/drizzle.init.d.2,v 1.2 2012/11/11 02:18:49 flameeyes Exp $ ######################### ### Construct vars ###### @@ -86,6 +86,7 @@ checkconfig() { depend() { use localmount + use logger use gearmand use memcached |