Bug #335772: Disable always-enabled DEBUG option (my previous commit failed).

Package-Manager: portage-2.2_rc75/cvs/Linux x86_64

4 files changed, 71 insertions, 12 deletions

diff --git a/sys-auth/libnss-mysql/ChangeLog b/sys-auth/libnss-mysql/ChangeLog
index e2894fbcf34c..f00b24dd755e 100644
--- a/sys-auth/libnss-mysql/ChangeLog
+++ b/sys-auth/libnss-mysql/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/libnss-mysql
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/ChangeLog,v 1.14 2010/02/23 12:43:44 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/libnss-mysql/ChangeLog,v 1.15 2010/09/08 23:13:40 robbat2 Exp $
+
+*libnss-mysql-1.5_p20060915-r1 (08 Sep 2010)
+
+  08 Sep 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +libnss-mysql-1.5_p20060915-r1.ebuild,
+  +files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff:
+  Bug #335772: Disable always-enabled DEBUG option.
 
 *libnss-mysql-1.5_p20060915 (23 Feb 2010)
 
diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest
index a41dde4c5f06..21c5c040a87b 100644
--- a/sys-auth/libnss-mysql/Manifest
+++ b/sys-auth/libnss-mysql/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+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 1136 RMD160 e92785b0e0dc830f361cc79cd4604d25f32d5759 SHA1 5ffe433046fe3c86db268eb359ac90a1a417276c SHA256 e58e43c222774608dcabc86a271faaae0470e32e60acdb73071886072e568fb2
 EBUILD libnss-mysql-1.5_p20060915.ebuild 1033 RMD160 d0ebc349fa2448bade9781d6cf5eeadf658e06d2 SHA1 3fd20f86dd37f06ef2c5246d89b3382e9522ef2e SHA256 a598d4218aef626daa669c44c55019785b3cc021b2ea7ca1b4c00d0a05d848cd
-MISC ChangeLog 4394 RMD160 01d9ee61dc1620a0c59a74d2102434484e372eb5 SHA1 b0338caaba363a13b8dfb58348355713bbf22c8a SHA256 dbd536aa4e6f17c9af8af12a25f5281846fb660fa93ce8168bb7b11bc12fb4df
+MISC ChangeLog 4650 RMD160 b0e2d3d041f88c5bbe63613abcfed8b66a5f1e60 SHA1 fda56248a9919883dd96f13428309402176df907 SHA256 1ee65236dfcc0bf4710a73c58ca3c44ae2bda425156c57b8c1dac537e252f666
 MISC metadata.xml 217 RMD160 f84c44fc99eda7f7db0181fccdc31d69de65a339 SHA1 30b6b28e8929568dac50a3dfe8dc2ea3c6c418fc SHA256 ebdc143a57263b72de2078a7c3ace9c21134cf18ab231bd639df01e8fcafc049
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuDzYUACgkQr2QksT29OyDQeQCfZ7gl1kfoFGULXrn4hLJWxZR/
-9ywAmwfXRBj2w7SptHWnq7Ncwr+0e2fN
-=OJsz
------END PGP SIGNATURE-----
diff --git a/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff
new file mode 100644
index 000000000000..292ae9e19476
--- /dev/null
+++ b/sys-auth/libnss-mysql/files/libnss-mysql-1.5_p20060915-no-automagic-debug.diff
@@ -0,0 +1,14 @@
+diff -NuarwPbB libnss-mysql.orig/configure.in libnss-mysql/configure.in
+--- libnss-mysql.orig/configure.in	2005-09-04 03:34:00.000000000 +0000
++++ libnss-mysql/configure.in	2010-09-08 18:12:24.577317098 +0000
+@@ -38,7 +38,9 @@
+ AC_ARG_WITH(mysql,
+             [  --with-mysql=DIR        Location of your MySQL installation])
+ AC_ARG_ENABLE(debug,
+-            [  --enable-debug          Enable debug (see DEBUGGING)],
++            [  --enable-debug          Enable debug (see DEBUGGING)])
++
++AS_IF([test "x$enable_debug" = "xyes"],
+             [AC_DEFINE([DEBUG], 1, [Enable debug])])
+ 
+ case "$target_os" in
diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r1.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r1.ebuild
new file mode 100644
index 000000000000..795ce46a20f5
--- /dev/null
+++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2010 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-r1.ebuild,v 1.1 2010/09/08 23:13:40 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils multilib autotools
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DESCRIPTION="NSS MySQL Library."
+HOMEPAGE="http://libnss-mysql.sourceforge.net/"
+SRC_URI="http://libnss-mysql.sourceforge.net/snapshot/${PN}-${PV/1.5_p/}.tgz"
+LICENSE="GPL-2"
+SLOT="0"
+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)" \
+		$(use_enable debug)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	find "${D}" -name '*.la' -delete
+
+	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
+}