libnss-mysql: install location back to /usr, because it needs to be on the same parti...

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

diff --git a/sys-auth/libnss-mysql/ChangeLog b/sys-auth/libnss-mysql/ChangeLog
index b4f8ef0b3bbfdb89149ccffcca855dca1f46a3b4..58080ee6fc5ad1204dfc6376017f38aeb0437ac6 100644 (file)
--- a/sys-auth/libnss-mysql/ChangeLog
+++ b/sys-auth/libnss-mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/libnss-mysql
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/ChangeLog,v 1.18 2011/05/28 12:05:24 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/ChangeLog,v 1.19 2011/09/13 07:40:48 hanno Exp $
+
+*libnss-mysql-1.5_p20060915-r2 (13 Sep 2011)
+
+  13 Sep 2011; Hanno Boeck <hanno@gentoo.org>
+  +libnss-mysql-1.5_p20060915-r2.ebuild:
+  Change install location back to /usr/lib, it needs to be on the same
+  partition as libmysql, else boot failures may occur.
 
   28 May 2011; Brent Baude <ranger@gentoo.org>
   libnss-mysql-1.5_p20060915-r1.ebuild:

diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest
index 619f1fbbb77a389a470def0b19753ae6424bdb6c..73e18aedf7a90c2065e449c870181b4fd5ef8b2f 100644 (file)
--- a/sys-auth/libnss-mysql/Manifest
+++ b/sys-auth/libnss-mysql/Manifest
@@ -1,8 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX libnss-mysql-1.5_p20060915-no-automagic-debug.diff 610 RMD160 b58a5007629f456c9d4300853225a51617fe8fb4 SHA1 3a86071747bdce490cf8d2aaa13f51d3e7dfcc9c SHA256 db5a4f5ad01f34db17c1f755ccbd20a8861c00674be2d8ab7b8481afa1d32ecd
-DIST libnss-mysql-1.5.tar.gz 333385 RMD160 3bdce85be6b2985ac9a183eba1d53295b5a4d7be SHA1 4b14859505c67c9830ec9cc7e416bdbf2ee2ed9b SHA256 a2d66cf27c61ac910e5747c642276ce70b79006f8820a90f12f27614a39e245c
 DIST libnss-mysql-20060915.tgz 689970 RMD160 fd63f11cbbe6218ce4678f2798c8faf3e660facf SHA1 4ded39c70eaf28fad9ec67c2f0d08cfb10e58e81 SHA256 d0705ab7a185146d050a9ef486c4af03d66fb61fb511c4e0d29714b4c3e5848f
-EBUILD libnss-mysql-1.5.ebuild 1029 RMD160 caee7cc20c70b9efb29ccc9f6d009b06e19df446 SHA1 e9c3d09a3a941ed1d58838f10ad371f1b93cd91b SHA256 03d8579d0b258050d13c25bb7558e1b95be9ca4ef831503729a91c6363cea088
 EBUILD libnss-mysql-1.5_p20060915-r1.ebuild 1132 RMD160 d03bdb2485f597b159b6b46f337cad521d1b7929 SHA1 d8e2bca0b65dbefbbae70ddbe47d05c6d6207422 SHA256 dae7baa74c712c175d943499b40dd830b34f3441f4e9dcfb809f07616c48a4e3
-EBUILD libnss-mysql-1.5_p20060915.ebuild 1033 RMD160 d0ebc349fa2448bade9781d6cf5eeadf658e06d2 SHA1 3fd20f86dd37f06ef2c5246d89b3382e9522ef2e SHA256 a598d4218aef626daa669c44c55019785b3cc021b2ea7ca1b4c00d0a05d848cd
-MISC ChangeLog 5039 RMD160 0e3f0ce762a3ada3e4c26622dedead590bf7c5d2 SHA1 a73c30fad2ee3fdd98f27277e6aeeab9bc5bdaf1 SHA256 506d75c292d7668d944310fbc7c136a6975c5c19fdade03dfb1393e2f0cebd0b
+EBUILD libnss-mysql-1.5_p20060915-r2.ebuild 1336 RMD160 7ab5623e051a585f6bb4166d82634e9e9290f669 SHA1 02c2acde070091ed3b3aca60ad5f64b9293882e4 SHA256 1f2c255c34465ddda8744e66050469b2c1599aa76e1d0add2940f168f10ff3bd
+MISC ChangeLog 5298 RMD160 425058e333e77c3d42041f8ba50aeaeac369654e SHA1 5a3491bec36c5c7e811bd0c5f4f30f95afd0fe0d SHA256 80d7af23aa59230f54638c45b0508c3f55cbadd683aa6576fc98407e94b5ad8c
 MISC metadata.xml 217 RMD160 f84c44fc99eda7f7db0181fccdc31d69de65a339 SHA1 30b6b28e8929568dac50a3dfe8dc2ea3c6c418fc SHA256 ebdc143a57263b72de2078a7c3ace9c21134cf18ab231bd639df01e8fcafc049
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCAAGBQJObwkAAAoJEKWIAHK7tR5Cni4QAIkYnkIllzIq1TwoMAt8nd33
+7vekY1s5zvRP90tl7KsPPUg5KZYtznD6GqQ9srH4QjDC5e6Ox7L5DIVcf0yHRR18
+I0BTDdERMoHhkVwmG0jMPJd+XnVs5W8yPp77BNBecSh5CH/YxgA8YcA+d0G857yF
+PueRIC0mZ/m/xiQPoOuCARhdTitLmyFj0xHcF0oUJ0cuqBbIq4mI5nKXCxedWj+X
+H5oAe341Bmgk4iXAuhdszicBx6cTBWFbU9y09+gATd48m2DeFKNiPqkW7uURQ94u
+yPnCZxXz+tjBWt/b5keKuSAEMoXGFW6o8XoHh7BCNUZsQ9bum3J6x3Hca6Mp7pEL
+hkgylPMgwgsp2ISj8D7PquZl0PSxaHXBRNlMzKcUQ3IbQ01UCwWzTt5mKc2moKRK
+p7BS+ZT0uo45lTxJ9ppUGqzncPH100CIRykHC15Ah5JqIytUKdQBq1yvn1RA8c5q
+HAB5xBfbGQS0ucx9K5FOvk2D8xlGXa1+3RbFLmreVItdAOI1lsUnvN+4v3cFhhcK
+8QMhHDnH+PxXhSjj0ozqYC2wGX8/eqOLEyPIZXNOlijh5xzUuinnM+nC30dwebuo
+23dZPl2DtwPDR4xYZkIEFI+7G3CIvtCLSHOAq1CHHlOcVf+oFeocHH55zGZnwN2u
+2Gb08KSFwaP4y2YpRoDV
+=J2eU
+-----END PGP SIGNATURE-----

diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5.ebuild
deleted file mode 100644 (file)
index cc9e564..0000000
--- a/sys-auth/libnss-mysql/libnss-mysql-1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/libnss-mysql-1.5.ebuild,v 1.10 2007/12/30 03:22:27 chtekk Exp $
-
-inherit multilib
-
-KEYWORDS="amd64 ppc ~sparc x86"
-
-DESCRIPTION="NSS MySQL Library."
-HOMEPAGE="http://libnss-mysql.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/mysql"
-RDEPEND="${DEPEND}"
-
-src_install() {
-       dodir "/etc"
-       dodir "/usr/$(get_libdir)"
-       einstall libdir="${D}/usr/$(get_libdir)"
-
-       newdoc sample/README README.sample
-       dodoc AUTHORS DEBUGGING FAQ INSTALL NEWS README THANKS \
-               TODO UPGRADING ChangeLog
-
-       for subdir in sample/{linux,freebsd,complex,minimal} ; do
-               docinto "${subdir}"
-               dodoc "${subdir}/"{*.sql,*.cfg}
-       done
-}
-
-pkg_postinst() {
-       einfo "As of version 1.3, the [section] lines in the configuration files"
-       einfo "are meaningless and will be ignored. Remove them to avoid extra"
-       einfo "parsing overhead."
-}

diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild
similarity index 59%
rename from sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915.ebuild
rename to sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild
index 0b8adb5ec45ee2778e1f34aedcc5892283be3cf4..38a758fa8d84003185709351c9717da2b24cc031 100644 (file)
--- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915.ebuild
+++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915.ebuild,v 1.1 2010/02/23 12:43:44 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r2.ebuild,v 1.1 2011/09/13 07:40:48 hanno Exp $
 
 EAPI=2
 
-inherit multilib
+inherit eutils multilib autotools
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
@@ -18,10 +18,18 @@ IUSE="debug"
 DEPEND="virtual/mysql"
 S="${WORKDIR}/${PN}"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-no-automagic-debug.diff
+       eautoconf
+}
+
 src_configure() {
-       # authentication libraries don't belong into usr,
-       # please don't change this
-       econf --libdir="/$(get_libdir)" \
+       # Usually, authentication libraries don't belong into usr.
+       # But here, it's required that the lib is in the same dir
+       # as libmysql, because else failures may occur on boot if
+       # udev tries to access a user / group that doesn't exist
+       # on the system before /usr is mounted.
+       econf --libdir="/usr/$(get_libdir)" \
                $(use_enable debug)
 }