Add nis support, from bug #131303

Package-Manager: portage-2.1_pre9-r4

3 files changed, 19 insertions, 15 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 36b547966ede..34e34a8811fa 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.304 2006/04/28 00:13:53 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.305 2006/05/05 12:33:11 caleb Exp $
+
+  05 May 2006; Caleb Tennis <caleb@gentoo.org> qt-3.3.6.ebuild:
+  Add nis support, from bug #131303
 
   28 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-qt-4.1.1,
   Manifest:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 084d40de794b..4fe98db8a2cd 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,7 +1,7 @@
-AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 size 5623
+AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 size 5623
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 files/0001-dnd_optimization.patch 5623
-SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439 files/0001-dnd_optimization.patch 5623
+SHA256 b8c330553cce93475913494a241d6a27fe07bc1b8ef880b9c565342efa7857e1 files/0001-dnd_optimization.patch 5623
 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1 size 7289
 MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d files/0002-dnd_active_window_fix.patch 7289
@@ -10,10 +10,10 @@ AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edef
 MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 files/0037-dnd-timestamp-fix.patch 2138
 SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d files/0037-dnd-timestamp-fix.patch 2138
-AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c size 2551
+AUX 0038-dragobject-dont-prefer-unknown.patch 2551 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 SHA1 3a2371a520d800904350bb9e6e445d6b3092bb88 SHA256 6f91a102c81eca3191df63a6d3b79794587199f0485ffe5d42fc20fa063d53be size 2551
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
 RMD160 0a89aec1a6f9672a927029ca01a1bd8573552745 files/0038-dragobject-dont-prefer-unknown.patch 2551
-SHA256 b5c0d00d1ac84302bc2123ccdfdab473cd0daf12f4ba70d6318084d9f744242c files/0038-dragobject-dont-prefer-unknown.patch 2551
+SHA256 6f91a102c81eca3191df63a6d3b79794587199f0485ffe5d42fc20fa063d53be files/0038-dragobject-dont-prefer-unknown.patch 2551
 AUX qt-3.3.4-0047-fix-kmenu-widget.diff 992 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce SHA1 d67e34b540c2f19e7e3e3715535a6732f447b22c SHA256 0dadffc3218b04eb327baf51c1f681843046cdf07a52b943f46373cd8384c275 size 992
 MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
 RMD160 bada5e23043d314b15f3af1eda70c8833112ebce files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
@@ -76,10 +76,10 @@ EBUILD qt-3.3.4-r9.ebuild 10631 RMD160 1080607694ae4b40bf71fbe272da9dd05d5b08f1
 MD5 4ee80ec5a3442194b166e2de3325b443 qt-3.3.4-r9.ebuild 10631
 RMD160 1080607694ae4b40bf71fbe272da9dd05d5b08f1 qt-3.3.4-r9.ebuild 10631
 SHA256 3dd1864497d83fce1d07a9ab1aafbf002731c73e74db82ba864937ce7cf06fd2 qt-3.3.4-r9.ebuild 10631
-EBUILD qt-3.3.6.ebuild 10511 RMD160 dda4601a98589c6ac02ca27823e0a03e12a9e5bf SHA1 804db10d594e650ee42c2ac0cf1f44b8a686f4ed SHA256 15401e982ff57ff4b47167a15c29dacd95f5ab4cf44dc39eb38e07f6799dd432 size 10511
-MD5 c745137313c4ea8dd201e9e4bfe17403 qt-3.3.6.ebuild 10511
-RMD160 dda4601a98589c6ac02ca27823e0a03e12a9e5bf qt-3.3.6.ebuild 10511
-SHA256 15401e982ff57ff4b47167a15c29dacd95f5ab4cf44dc39eb38e07f6799dd432 qt-3.3.6.ebuild 10511
+EBUILD qt-3.3.6.ebuild 10582 RMD160 c2070b64b9532595b8ba67c6e09032193db8f8cc SHA1 bb90f6914075fc3a065381cb7e84d7cd7c882cba SHA256 469917566fd65e94824c9821b1b13f06029bb9832565113eb305fa916ac04ee2 size 10582
+MD5 89e833edcc86131631514ddd92ee51fc qt-3.3.6.ebuild 10582
+RMD160 c2070b64b9532595b8ba67c6e09032193db8f8cc qt-3.3.6.ebuild 10582
+SHA256 469917566fd65e94824c9821b1b13f06029bb9832565113eb305fa916ac04ee2 qt-3.3.6.ebuild 10582
 EBUILD qt-4.1.1.ebuild 6351 RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e SHA1 2d520da0a8ed8f5158bd7bf6f363fc81987f3c6a SHA256 b67eda7a5fa11318f3887762ab3625832b0ea77a3e7ecd02ae84f9c9eefeefbd size 6351
 MD5 dec77c41b5849f0ebdcde7fa9ea25690 qt-4.1.1.ebuild 6351
 RMD160 f301ece0c483410df03fb22be0e381f2e3e5a18e qt-4.1.1.ebuild 6351
@@ -88,10 +88,10 @@ EBUILD qt-4.1.2.ebuild 6461 RMD160 f5cac2738578e6fc647dd3cbb3e21a84ee492132 SHA1
 MD5 692b5aa2fc04e211ef9db4967a3c3334 qt-4.1.2.ebuild 6461
 RMD160 f5cac2738578e6fc647dd3cbb3e21a84ee492132 qt-4.1.2.ebuild 6461
 SHA256 25158ad3db1efbae7f85d6089461feefda4a4fb332811b911f04a66efdbdf9f1 qt-4.1.2.ebuild 6461
-MISC ChangeLog 8847 RMD160 9a39d43553b61de21066b45cc6b16ed1375cacdc SHA1 556d4ba23b57160acfe23169de87916dc6bb9e2d SHA256 bb36471e2b80f40fa784571d1ee029a0bf1adc74744c5544145c1d0ad194ea9f size 8847
-MD5 045249e47925852e1676476443eead48 ChangeLog 8847
-RMD160 9a39d43553b61de21066b45cc6b16ed1375cacdc ChangeLog 8847
-SHA256 bb36471e2b80f40fa784571d1ee029a0bf1adc74744c5544145c1d0ad194ea9f ChangeLog 8847
+MISC ChangeLog 8946 RMD160 e6d21320d63bee3f0a79f41adc4c2cd639527368 SHA1 052c4743959d79359703448913ca86b5beb509d7 SHA256 00c9bf1378ffc4b48a0ba69f733e427c952cf86290026e049f544b8b366d45a7 size 8946
+MD5 d6250bd17dfdab73efd2ca0a0939cc2a ChangeLog 8946
+RMD160 e6d21320d63bee3f0a79f41adc4c2cd639527368 ChangeLog 8946
+SHA256 00c9bf1378ffc4b48a0ba69f733e427c952cf86290026e049f544b8b366d45a7 ChangeLog 8946
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 size 156
 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156
diff --git a/x11-libs/qt/qt-3.3.6.ebuild b/x11-libs/qt/qt-3.3.6.ebuild
index 648d0a70ae93..101a6c84e66e 100644
--- a/x11-libs/qt/qt-3.3.6.ebuild
+++ b/x11-libs/qt/qt-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6.ebuild,v 1.7 2006/04/13 12:02:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.6.ebuild,v 1.8 2006/05/05 12:33:11 caleb Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -17,7 +17,7 @@ LICENSE="|| ( QPL-1.0 GPL-2 )"
 
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="cups debug doc examples firebird gif ipv6 mysql nas odbc opengl postgres sqlite xinerama immqt immqt-bc"
+IUSE="cups debug doc examples firebird gif ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
 DEPEND="|| ( ( x11-libs/libXcursor
 			x11-libs/libXi
@@ -158,6 +158,7 @@ src_compile() {
 
 	# unixODBC support is now a PDEPEND on dev-db/qt-unixODBC; see bug 14178.
 	use nas		&& myconf="${myconf} -system-nas-sound"
+	use nis		&& myconf="${myconf} -nis" || myconf="${myconf} -no-nis"
 	use gif		&& myconf="${myconf} -qt-gif" || myconf="${myconf} -no-gif"
 	use mysql	&& myconf="${myconf} -plugin-sql-mysql -I/usr/include/mysql -L/usr/$(get_libdir)/mysql" || myconf="${myconf} -no-sql-mysql"
 	use postgres	&& myconf="${myconf} -plugin-sql-psql -I/usr/include/postgresql/server -I/usr/include/postgresql/pgsql -I/usr/include/postgresql/pgsql/server" || myconf="${myconf} -no-sql-psql"