revision bump for configure fix provided by anarchy@gentoo.org

Package-Manager: portage-2.1_pre7-r2

5 files changed, 692 insertions, 2 deletions

diff --git a/x11-plugins/gaim-encryption/ChangeLog b/x11-plugins/gaim-encryption/ChangeLog
index a86af086f76c..3b0b2ac15a8b 100644
--- a/x11-plugins/gaim-encryption/ChangeLog
+++ b/x11-plugins/gaim-encryption/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/gaim-encryption
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.77 2006/01/30 17:44:00 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/ChangeLog,v 1.78 2006/03/28 19:59:39 gothgirl Exp $
+
+*gaim-encryption-3.0_beta4 (28 Mar 2006)
+
+  28 Mar 2006; kathryn <gothgirl@gentoo.org>
+  +files/gaim-encryption-3.0beta4-configure.patch,
+  +gaim-encryption-3.0_beta4.ebuild:
+  revision bump, configure fix provided by anarchy@gentoo.org
 
   30 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   gaim-encryption-3.0_beta3.ebuild:
diff --git a/x11-plugins/gaim-encryption/Manifest b/x11-plugins/gaim-encryption/Manifest
index a39b7df54da6..15660c851d71 100644
--- a/x11-plugins/gaim-encryption/Manifest
+++ b/x11-plugins/gaim-encryption/Manifest
@@ -1,21 +1,72 @@
-MD5 4227b446264d13fb2ee9ff6a047f97c3 ChangeLog 13813
+MD5 c3f2d35c83fecebc73f8f2f45ce74b39 ChangeLog 14049
+RMD160 a97325a905bfcf986b61094e7796d4f4b41f3b18 ChangeLog 14049
+SHA256 77bee9d7f08d14a5c93ada99b8d26dd2d2fef4269496e60e95e6f695a8b76c80 ChangeLog 14049
 MD5 ff64a30a61d21ad47aab6594e4b1325b files/digest-gaim-encryption-2.32-r1 72
+RMD160 7a83effcc04df344d25ab17eb083fcc2efe4548d files/digest-gaim-encryption-2.32-r1 72
+SHA256 ed81e8e3d0ee7eb6ae41bcdf0643cf7894f594950af22362dba7f1a49d4dc10d files/digest-gaim-encryption-2.32-r1 72
 MD5 69dd2444e1c1a7c90b61128c9912f975 files/digest-gaim-encryption-2.34 72
+RMD160 7adc182e476dbc254b5ffedbd22afb7645287297 files/digest-gaim-encryption-2.34 72
+SHA256 90077c2f11ec3b74c4e8fe9a2a4a8c658f216d16b8c7460077966cde5c371a96 files/digest-gaim-encryption-2.34 72
 MD5 1bba644fecfb18831e18edb3d06f0de5 files/digest-gaim-encryption-2.35 72
+RMD160 22ecba89c59a286107367ea08bc10f7c2f64c27b files/digest-gaim-encryption-2.35 72
+SHA256 325fa06d65197a953d0ed03ab4c573aa2113729311b2821d937d719ac727f773 files/digest-gaim-encryption-2.35 72
 MD5 7921f3ce22b477f7a69db7f51ef56669 files/digest-gaim-encryption-2.36 72
+RMD160 fe012565fe90af4092e892786d3b412591d9ea04 files/digest-gaim-encryption-2.36 72
+SHA256 32179bc93311faa5fef14c17d9d240af3a2c990f84b291bd8338cd37e388e7bc files/digest-gaim-encryption-2.36 72
 MD5 185f9fc2aa864a611189ad3b74bcfbab files/digest-gaim-encryption-2.37 72
+RMD160 fb9071a6a4835bd442ff65edfd0492867bf89540 files/digest-gaim-encryption-2.37 72
+SHA256 cc3705d02e912e08af56a2866e0547f32b8aaab084bb52698625518a4e5e84fd files/digest-gaim-encryption-2.37 72
 MD5 4f47ba1a5d57da23681402f4f6241581 files/digest-gaim-encryption-2.38 72
+RMD160 d1588f5ccf89d2ec0f80a726be5b89545383a8d1 files/digest-gaim-encryption-2.38 72
+SHA256 8ee3d84dfd132800c1d649eb15ba65dfa8d1c247f3e9f1b3f5b16e438afc96be files/digest-gaim-encryption-2.38 72
 MD5 b1fb5bb2c2c89945051c4ba41c73e3a2 files/digest-gaim-encryption-3.0_beta1 76
+RMD160 94a67e8a08f279ade653c2e002fc89495194518b files/digest-gaim-encryption-3.0_beta1 76
+SHA256 402584932f819a2599c19308f1672d591f1dfa3926e89324af476a66a0562cf9 files/digest-gaim-encryption-3.0_beta1 76
 MD5 7858e1ca01e412a6f921ab9d6710114c files/digest-gaim-encryption-3.0_beta2 76
+RMD160 65f43ce9c965aa46f71f473af71e840e7d4d28ee files/digest-gaim-encryption-3.0_beta2 76
+SHA256 e07b6ff1882f7150cdc0baaca029e46048128cec92aa8a9225cadafaf0f3ad38 files/digest-gaim-encryption-3.0_beta2 76
 MD5 028c0bb3959ac89337fbacdcc43c5d9e files/digest-gaim-encryption-3.0_beta3 76
+RMD160 01e060bc3c90787376c1561f576fbdd837921765 files/digest-gaim-encryption-3.0_beta3 76
+SHA256 0f1ef4fdce48aaec69340926ee44b7d54a49155c70521a53e1f1fa66c7c1629d files/digest-gaim-encryption-3.0_beta3 76
+MD5 f29c62d772cc41d0402fa4d3c17333ce files/digest-gaim-encryption-3.0_beta4 274
+RMD160 611edca7e5b75e381e40b42865366cd99951c90a files/digest-gaim-encryption-3.0_beta4 274
+SHA256 a7f770b3ed1b8b5a6333eb45309913aad9bb4024666e59849d648ebf8dc02fe0 files/digest-gaim-encryption-3.0_beta4 274
 MD5 c33a7ee554fd61adb3272fabea5a0487 files/encryption_icon_fix.diff 528
+RMD160 4b69b1992ed27e21caadc7c1634d6e64a89659de files/encryption_icon_fix.diff 528
+SHA256 84e397d026a22e251bb629c35cb078477b07edaeb2b3247015e275dc605265a4 files/encryption_icon_fix.diff 528
+MD5 d1ed62b75600295e0fb8f1bd11aa37b3 files/gaim-encryption-3.0beta4-configure.patch 19212
+RMD160 d38435c52acb502b861c2e1b8de08815b00f0267 files/gaim-encryption-3.0beta4-configure.patch 19212
+SHA256 d9b0357483059e1ac2a17c81ebf07ab0e0623c0b0558e27788eec7140aad6f5f files/gaim-encryption-3.0beta4-configure.patch 19212
 MD5 fd1990d36ce5bb9894308ba2e72ac71b gaim-encryption-2.32-r1.ebuild 973
+RMD160 359a7f998e784efab84bd9bf45a6eae0e76c22f4 gaim-encryption-2.32-r1.ebuild 973
+SHA256 6491579bc45e08c6b5bbc7d81a8619c5913f141e90f8a02401ee91bd9b44e4ed gaim-encryption-2.32-r1.ebuild 973
 MD5 180b65fd7ff3e459281b883a9a3c46bb gaim-encryption-2.34.ebuild 979
+RMD160 075f7a11b8ce902928761ef153fa05b9a901e9e6 gaim-encryption-2.34.ebuild 979
+SHA256 0168b56813735efa31eacee16c798c2d88c878ba12fac25a74ee7f7872acc06d gaim-encryption-2.34.ebuild 979
 MD5 57d582591db88b3ff11256053a27eef5 gaim-encryption-2.35.ebuild 979
+RMD160 2c6a7069efb48415e028a6c7d37fec05d5124e65 gaim-encryption-2.35.ebuild 979
+SHA256 480d22ba1470ff950bad86d8b22d5742017562cf691d7c544b5ec9c8d3cca591 gaim-encryption-2.35.ebuild 979
 MD5 1d87e2e19db2674121a0ac6fd1729946 gaim-encryption-2.36.ebuild 973
+RMD160 f4c3a1a3b7face70e903763bdcca1bfd239bb035 gaim-encryption-2.36.ebuild 973
+SHA256 9a4fa93e935dab984a62ae608f1fb3b4a3ce0ac8303f022038daea1c599ab5da gaim-encryption-2.36.ebuild 973
 MD5 89dc5f0c668b2281d7914d72cc4d2931 gaim-encryption-2.37.ebuild 978
+RMD160 8d983a9c1837400e1bb0aa779b077a2fa5f29d28 gaim-encryption-2.37.ebuild 978
+SHA256 96ea654c8a934aecefa0b14260a6c3394c1e03f7406aa5e463807f10d7a969d5 gaim-encryption-2.37.ebuild 978
 MD5 b45fff756dd5498a00552868cd96765e gaim-encryption-2.38.ebuild 999
+RMD160 1f3a6d6a45ae8d6cac873382f34f90c1c5d99542 gaim-encryption-2.38.ebuild 999
+SHA256 19a2da617fb57add23f01601c53584227b888f14b07206e20d876a83dcd45d8e gaim-encryption-2.38.ebuild 999
 MD5 757b58073867ea176efb65fd8c867363 gaim-encryption-3.0_beta1.ebuild 1122
+RMD160 fb9981d32e302284a8b37682816339ff5f86d79a gaim-encryption-3.0_beta1.ebuild 1122
+SHA256 579eb7f05c942611669a97b96d1f6f171bfeeaef2a875cb76928b7c503eaf7d2 gaim-encryption-3.0_beta1.ebuild 1122
 MD5 ec57a68e7c96bdbfe52234668a1b6cab gaim-encryption-3.0_beta2.ebuild 1077
+RMD160 003d3612935f1130b2696ab3a12962635dcb9114 gaim-encryption-3.0_beta2.ebuild 1077
+SHA256 75ec2ddfcb90a64cbfc09059cade2b7f7fb5ed420233a8f3505846f46d6cda62 gaim-encryption-3.0_beta2.ebuild 1077
 MD5 2396964b1dfd186627c72ed7a88d7f57 gaim-encryption-3.0_beta3.ebuild 1091
+RMD160 3a1749d1ef33f2bb94fdc38796c690aa9720737b gaim-encryption-3.0_beta3.ebuild 1091
+SHA256 db184cd8cc97d5dccce8c8babd88b825ea1d81d829b7182e43fa5002ec15c39b gaim-encryption-3.0_beta3.ebuild 1091
+MD5 ed564acce89d1e43990a8a1f3daf4f96 gaim-encryption-3.0_beta4.ebuild 1124
+RMD160 880981dfec0b6a4aba42d5317ada955e1541ab5a gaim-encryption-3.0_beta4.ebuild 1124
+SHA256 5809b83ac4951e3ebf98482dfe84684e45bb740af5f22b0f129156b722e9d7e3 gaim-encryption-3.0_beta4.ebuild 1124
 MD5 f9adb0cad926cb239205a2b354cbda8b metadata.xml 286
+RMD160 64e5cd11f5b3d8c4714af32da1cf9d2cb23a8b49 metadata.xml 286
+SHA256 3e1e422380a4599a6f9d08a13a59c1675fc7877dcb5f59c1fde77a937fab6292 metadata.xml 286
diff --git a/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta4 b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta4
new file mode 100644
index 000000000000..0151005793c9
--- /dev/null
+++ b/x11-plugins/gaim-encryption/files/digest-gaim-encryption-3.0_beta4
@@ -0,0 +1,3 @@
+MD5 bdfcdaa29971456a46f2b77162fd2ee3 gaim-encryption-3.0beta4.tar.gz 568915
+RMD160 364eaf9eb8788190b9dd6f7d6097fa6f348842fe gaim-encryption-3.0beta4.tar.gz 568915
+SHA256 d4f6e7d7ba082d2ac6d2551deab2bec866065a3c9d305aa141ddf6f240be0211 gaim-encryption-3.0beta4.tar.gz 568915
diff --git a/x11-plugins/gaim-encryption/files/gaim-encryption-3.0beta4-configure.patch b/x11-plugins/gaim-encryption/files/gaim-encryption-3.0beta4-configure.patch
new file mode 100644
index 000000000000..606e087c057f
--- /dev/null
+++ b/x11-plugins/gaim-encryption/files/gaim-encryption-3.0beta4-configure.patch
@@ -0,0 +1,587 @@
+--- configure.ac-orig	2006-03-05 20:33:53.000000000 -0600
++++ configure.ac	2006-03-23 18:13:15.966092544 -0600
+@@ -149,330 +149,263 @@
+ GAIM_DATADIR=`pkg-config --variable=datadir gaim`
+ AC_SUBST(GAIM_DATADIR)
+ 
+-#
+-# Copied from Gaim's configure.ac:
+-# Find the Mozilla NSPR/NSS libs
+-#
+-
+-AC_ARG_WITH(nspr-includes,
+-    [  --with-nspr-includes=PREFIX     Specify location of Mozilla nspr4 includes.],
+-    [with_nspr_includes="$withval"])
+-
+-AC_ARG_WITH(nspr-libs,
+-    [  --with-nspr-libs=PREFIX         Specify location of Mozilla nsp4 libs.],
+-    [with_nspr_libs="$withval"])
+-
+-AC_ARG_WITH(nss-includes,
+-    [  --with-nss-includes=PREFIX      Specify location of Mozilla nss3 includes.],
+-    [with_nss_includes="$withval"])
+-
+-AC_ARG_WITH(nss-libs,
+-    [  --with-nss-libs=PREFIX          Specify location of Mozilla nss3 libs.],
+-    [with_nss_libs="$withval"])
+-
+-if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \
+-    test -n "$with_nss_includes"  || test -n "$with_nss_libs"  ||
+-    test "x$enable_nss" = "xstatic"; then
+-    
+-    nss_manual_check="yes"
+-else
+-    nss_manual_check="no"
+-fi
+-
+-enable_nss="no"
+-
+-if test "x$nss_manual_check" = "xno"; then
+-    PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", have_nss="no")
+-    
+-    if test "x$have_nss" = "xyes"; then
+-        mozilla_nspr="mozilla-nspr"
+-        mozilla_nss="mozilla-nss"
+-        
+-        AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS])
+-        AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL])
+-        
+-        msg_ssl="Mozilla NSS"
+-        enable_nss="yes"
+-    else
+-        nss_manual_check="yes"
+-    fi
+-fi
++dnl #
++dnl # Check for NSS if it's specified, or if GNUTLS checks failed.
++dnl #
++if test "x$enable_nss" != "xno"; then
++
++	AC_ARG_WITH(nspr-includes,
++		[  --with-nspr-includes=PREFIX     Specify location of Mozilla nspr4 includes.],
++		[with_nspr_includes="$withval"])
++
++	AC_ARG_WITH(nspr-libs,
++		[  --with-nspr-libs=PREFIX         Specify location of Mozilla nspr4 libs.],
++		[with_nspr_libs="$withval"])
++
++	AC_ARG_WITH(nss-includes,
++		[  --with-nss-includes=PREFIX      Specify location of Mozilla nss3 includes.],
++		[with_nss_includes="$withval"])
++
++	AC_ARG_WITH(nss-libs,
++		[  --with-nss-libs=PREFIX          Specify location of Mozilla nss3 libs.],
++		[with_nss_libs="$withval"])
++
++
++	if test -n "$with_nspr_includes" || test -n "$with_nspr_libs" || \
++	   test -n "$with_nss_includes"  || test -n "$with_nss_libs"  ||
++	   test "x$enable_nss" = "xstatic"; then
++
++		nss_manual_check="yes"
++	else
++		nss_manual_check="no"
++	fi
++
++	enable_nss="no"
++
++	if test "x$nss_manual_check" = "xno"; then
++		if `$PKG_CONFIG --exists mozilla-nss`; then
++			PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", have_nss="no")
++			mozilla_nspr="mozilla-nspr"
++			mozilla_nss="mozilla-nss"
++		else
++			if `$PKG_CONFIG --exists nss`; then
++				PKG_CHECK_MODULES(NSS, nss, have_nss="yes")
++				mozilla_nspr="nspr"
++				mozilla_nss="nss"
++			fi
++		fi
++
++		if test "x$have_nss" = "xyes"; then
++
++			AC_DEFINE(HAVE_NSS, 1, [Define if you have Mozilla NSS])
++			AC_DEFINE(HAVE_SSL, 1, [Define if you have SSL])
++
++			msg_nss="Mozilla NSS"
++			enable_nss="yes"
++		else
++			nss_manual_check="yes"
++		fi
++	fi
++
++	if test "x$nss_manual_check" = "xyes"; then
++		mozilla_nss=""
++		have_nspr_includes="no"
++
++		if test "x$with_nspr_includes" != "xno"; then
++			CPPFLAGS_save=$CPPFLAGS
++
++			AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)
++			AC_MSG_RESULT("")
++
++			CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
++			AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ])
++			CPPFLAGS=$CPPFLAGS_save
++
++			if test "x$moz_nspr_includes" != "xno" -a \
++			        "x$moz_nspr_includes" != "x"; then
++
++				have_nspr_includes="yes"
++				NSPR_CFLAGS="-I$with_nspr_includes"
++			fi
++		else
++			AC_MSG_CHECKING(for Mozilla nspr4 includes)
++			AC_MSG_RESULT(no)
++
++			enable_nss="no"
++		fi
++
++		have_nspr_libs="no"
++
++		if test "x$with_nspr_libs"     != "xno" -a \
++		        "x$have_nspr_includes" != "xno"; then
++
++			CFLAGS_save=$CFLAGS
++			LDFLAGS_save=$LDFLAGS
++
++			if test "$enable_nss" = "static"; then
++				if test -z "$with_nspr_libs"; then
++					AC_MSG_ERROR(
++						[Static linkage requested, but path to nspr libraries not set.]
++						[Please specify the path to libnspr4.a]
++						[Example: --with-nspr-libs=/usr/lib])
++
++					enable_nss="no"
++				else
++					nsprlibs="$LIBDL $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
++				fi
++			else
++				nsprlibs="$LIBDL -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
++			fi
++
++			AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
++			[
++				LIBS_save=$LIBS
++				CFLAGS="$CFLAGS $NSPR_CFLAGS"
++
++				LIBS="$nsprlibs"
++
++				if test "x$with_nspr_libs" != "x"; then
++					LDFLAGS="$LDFLAGS -L$with_nspr_libs"
++				else
++					LDFLAGS="$LDFLAGS"
++				fi
++
++				AC_TRY_LINK_FUNC(PR_Init,
++					[moz_nspr_libs="yes"],
++					[moz_nspr_libs="no"])
++
++				CFLAGS=$CFLAGS_save
++				LDFLAGS=$LDFLAGS_save
++				LIBS=$LIBS_save
++			])
++
++			if test "x$moz_nspr_libs" != "xno"; then
++				have_nspr_libs="yes"
++				NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
++			else
++				NSPR_CFLAGS=""
++				enable_nss="no"
++			fi
++		else
++			AC_MSG_CHECKING(for Mozilla nspr4 libraries)
++			AC_MSG_RESULT(no)
++		fi
++
++		have_nss_includes="no"
++
++		if test "x$with_nss_includes" != "xno" -a \
++				"x$have_nspr_libs"    != "xno"; then
++
++			CPPFLAGS_save=$CPPFLAGS
++
++			AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
++			AC_MSG_RESULT("")
++
++			if test "x$with_nspr_includes" != "x"; then
++				CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
++			else
++				CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
++			fi
++
++			AC_CHECK_HEADERS(nss.h ssl.h smime.h,
++				[moz_nss_includes="yes"],
++				[moz_nss_includes="no"])
++
++			CPPFLAGS=$CPPFLAGS_save
++
++			if test "x$moz_nss_includes" = "xyes"; then
++				have_nss_includes="yes"
++				NSS_CFLAGS="-I$with_nss_includes"
++			else
++				NSPR_CFLAGS=""
++				NSPR_LIBS=""
++				enable_nss="no"
++			fi
++		else
++			AC_MSG_CHECKING(for Mozilla nss3 includes)
++			AC_MSG_RESULT(no)
++			enable_nss="no"
++		fi
++
++		if test "x$with_nss_libs"     != "xno" -a \
++				"x$have_nss_includes" != "xno"; then
++
++			LDFLAGS_save=$LDFLAGS
++
++			if test "$enable_nss" = "static"; then
++				if test -z "$with_nss_libs"; then
++					AC_MSG_ERROR(
++						[Static linkage requested, but path to nss libraries not set.]
++						[Please specify the path to libnss3.a]
++						[Example: --with-nspr-libs=/usr/lib/mozilla])
++					enable_nss="no"
++				else
++					nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a"
++
++					case "$host" in
++						*solaris*)
++							nsslibs="$nsslibs $with_nss_libs/libfreeb1.a"
++							;;
++					esac
++				fi
++			else
++				nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
++			fi
++
++			AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
++			[
++				LIBS_save=$LIBS
++				LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
++				LIBS="$nsslibs $nsprlibs"
++
++				AC_TRY_LINK_FUNC(NSS_Init,
++					[moz_nss_libs="yes"],
++					[moz_nss_libs="no"])
++
++				if test "x$moz_nss_libs" = "xno"; then
++					nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
++					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
++					AC_TRY_LINK_FUNC(NSS_Init,
++						[moz_nss_libs="yes"],
++						[moz_nss_libs="no"])
++				fi
++
++				LDFLAGS=$LDFLAGS_save
++				LIBS=$LIBS_save
++			])
++
++			if test "x$moz_nss_libs" != "xno"; then
++				AC_DEFINE(HAVE_NSS)
++				AC_DEFINE(HAVE_SSL)
++
++				NSS_LIBS="-L$with_nss_libs $nsslibs"
++
++				if test "$enable_nss" = "static"; then
++					msg_nss="Mozilla NSS (static)"
++				else
++					msg_nss="Mozilla NSS"
++				fi
++
++				enable_nss="yes"
++			else
++				NSS_CFLAGS=""
++				NSPR_CFLAGS=""
++				NSPR_LIBS=""
++				enable_nss="no"
++			fi
++		else
++			AC_MSG_CHECKING(for Mozilla nss libraries)
++			AC_MSG_RESULT(no)
++		fi
++
++		NSS_CFLAGS="$NSPR_CFLAGS $NSS_CFLAGS"
++		NSS_LIBS="$NSPR_LIBS $NSS_LIBS"
++	fi
+ 
+-if test "x$nss_manual_check" = "xyes"; then
+-    mozilla_nss=""
+-    have_nspr_includes="no"
+-
+-    if test "x$with_nspr_includes" != "x"; then
+-        CPPFLAGS_save=$CPPFLAGS
+-        
+-        AC_MSG_CHECKING(for Mozilla nspr4 includes in $with_nspr_includes)
+-        AC_MSG_RESULT()
+-        CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
+-        AC_CHECK_HEADERS(nspr.h prio.h, [ moz_nspr_includes="yes" ],
+-                                        [ moz_nspr_includes="no"])
+-        CPPFLAGS=$CPPFLAGS_save
+-            
+-        if test "x$moz_nspr_includes" != "xno" -a \
+-            "x$moz_nspr_includes" != "x"; then
+-            AC_MSG_CHECKING(again for Mozilla nspr4 includes in $with_nspr_includes)
+-            AC_MSG_RESULT(yes)
+-            
+-            have_nspr_includes="yes"
+-            NSPR_CFLAGS="-I$with_nspr_includes"
+-        else
+-            AC_MSG_CHECKING(again for Mozilla nspr4 includes in $with_nspr_includes)
+-            AC_MSG_RESULT(no)
+-            AC_MSG_ERROR([--with-nspr-includes was specified, but nspr.h and prio.h]
+-                         [were not there.])
+-        fi
+-    else
+-        AC_MSG_CHECKING(for Mozilla nspr4 includes)
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([You need to specify --with-nspr-includes="dir"]
+-                     [(where "dir" is the location of the NSPR headers like prio.h)])
+-    fi
+-    
+-    have_nspr_libs="no"
+-    
+-    if test "x$with_nspr_libs"     != "x" -a \
+-        "x$have_nspr_includes" != "xno"; then
+-        
+-        CFLAGS_save=$CFLAGS
+-        LDFLAGS_save=$LDFLAGS
+-        
+-        if test "$enable_nss" = "static"; then
+-            if test -z "$with_nspr_libs"; then
+-                AC_MSG_ERROR(
+-                    [Static linkage requested, but path to nspr libraries not set.]
+-                    [Please specify the path to libnspr4.a]
+-                    [Example: --with-nspr-libs=/usr/lib])
+-            else
+-                nsprrootlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+-            fi
+-        else
+-            nsprrootlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+-        fi
+-        
+-        nsprlibs="-ldl $nsprrootlibs"
+-        AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
+-            [
+-                LIBS_save=$LIBS
+-                CFLAGS="$CFLAGS $NSPR_CFLAGS"
+-                
+-                LIBS="$nsprlibs"
+-                
+-                if test "x$with_nspr_libs" != "x"; then
+-                    LDFLAGS="$LDFLAGS -L$with_nspr_libs"
+-                else
+-                    LDFLAGS="$LDFLAGS"
+-                fi
+-                
+-                AC_TRY_LINK_FUNC(PR_Init,
+-                    [moz_nspr_libs="yes"],
+-                    [moz_nspr_libs="no"])
+-                
+-                if test "x$moz_nspr_libs" != "xyes"; then
+-                    nsprlibs="$nsprrootlibs"
+-                    LIBS="$nsprlibs"
+-                    AC_TRY_LINK_FUNC(PR_Init,
+-                        [moz_nspr_libs="yes"],
+-                        [moz_nspr_libs="no"])
+-                fi
+-
+-                CFLAGS=$CFLAGS_save
+-                LDFLAGS=$LDFLAGS_save
+-                LIBS=$LIBS_save
+-                ])
+-        
+-        if test "x$moz_nspr_libs" != "xno"; then
+-            have_nspr_libs="yes"
+-            NSPR_LIBS="-L$with_nspr_libs $nsprlibs"
+-        else
+-            AC_MSG_CHECKING(for Mozilla nspr4 libraries)
+-            AC_MSG_RESULT(no)
+-            AC_MSG_ERROR([Error trying to link against the NSPR libraries.]
+-                [Make sure to specify --with-nspr-libs="dir"]
+-                [where "dir" is the location of the NSPR library file,]
+-                [probably libnspr4.so or libnspr4.a])
+-        fi
+-    else
+-        AC_MSG_CHECKING(for Mozilla nspr4 libraries)
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([You need to specify --with-nspr-libs="dir"]
+-                     [where "dir" is the location of the NSPR library file,]
+-                     [probably libnspr4.so or libnspr4.a])
+-    fi
+-    
+-    have_nss_includes="no"
+-    
+-    if test "x$with_nss_includes" != "x" -a \
+-        "x$have_nspr_libs"    != "xno"; then
+-        
+-        CPPFLAGS_save=$CPPFLAGS
+-        
+-        AC_MSG_CHECKING(for Mozilla nss3 includes in $with_nss_includes)
+-        AC_MSG_RESULT()
+-        if test "x$with_nspr_includes" != "x"; then
+-            CPPFLAGS="$CPPFLAGS -I$with_nspr_includes -I$with_nss_includes"
+-        else
+-            CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
+-        fi
+-            
+-        AC_CHECK_HEADERS(nss.h ssl.h smime.h,
+-            [moz_nss_includes="yes"],
+-            [moz_nss_includes="no"])
+-            
+-        CPPFLAGS=$CPPFLAGS_save
+-            
+-        if test "x$moz_nss_includes" = "xyes"; then
+-            AC_MSG_CHECKING(again for Mozilla nss3 includes in $with_nss_includes)
+-            AC_MSG_RESULT(yes)
+-            have_nss_includes="yes"
+-            NSS_CFLAGS="-I$with_nss_includes"
+-        else
+-            AC_MSG_CHECKING(again for Mozilla nss3 includes in $with_nss_includes)
+-            AC_MSG_RESULT(no)
+-            NSPR_CFLAGS=""
+-            NSPR_LIBS=""
+-        fi
+-    else
+-        AC_MSG_CHECKING(for Mozilla nss3 includes)
+-        AC_MSG_RESULT(no)
+-    fi
+-    
+-    if test "x$with_nss_libs" != "x" -a \
+-        "x$have_nss_includes" != "xno"; then
+-        
+-        LDFLAGS_save=$LDFLAGS
+-        
+-        if test "$enable_nss" = "static"; then
+-            if test -z "$with_nss_libs"; then
+-                AC_MSG_ERROR(
+-                    [Static linkage requested, but path to nss libraries not set.]
+-                    [Please specify the path to libnss3.a]
+-                    [Example: --with-nss-libs=/usr/lib/mozilla])
+-            else
+-                nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a"
+-                
+-                case "$host" in
+-                    *solaris*)
+-                        nsslibs="$nsslibs $with_nss_libs/libfreeb1.a"
+-                        ;;
+-                esac
+-            fi
+-        else
+-            nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
+-        fi
+-        
+-        AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
+-            [
+-                LIBS_save=$LIBS
+-                LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+-                LIBS="$nsslibs $nsprlibs"
+-                
+-                AC_TRY_LINK_FUNC(NSS_Init,
+-                    [moz_nss_libs="yes"],
+-                    [moz_nss_libs="no"])
+-                
+-                if test "x$moz_nss_libs" = "xno"; then
+-                    nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
+-                    LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+-                    AC_TRY_LINK_FUNC(NSS_Init,
+-                        [moz_nss_libs="yes"],
+-                        [moz_nss_libs="no"])
+-                fi
+-                
+-                LDFLAGS=$LDFLAGS_save
+-                LIBS=$LIBS_save
+-                ])
+-        
+-        if test "x$moz_nss_libs" != "xno"; then
+-            AC_DEFINE(HAVE_NSS)
+-            AC_DEFINE(HAVE_SSL)
+-            
+-            NSS_LIBS="-L$with_nss_libs $nsslibs"
+-            
+-            if test "$enable_nss" = "static"; then
+-                msg_ssl="Mozilla NSS (static)"
+-            else
+-                msg_ssl="Mozilla NSS"
+-            fi
+-            
+-            enable_nss="yes"
+-        else
+-            NSS_CFLAGS=""
+-            NSPR_CFLAGS=""
+-            NSPR_LIBS=""
+-        fi
+-    else
+-        AC_MSG_ERROR(
+-            [Could not find the Mozilla NSS libraries.]
+-            [Please specify the path to libnss3.a (or libnss3.so)]
+-            [Example: --with-nss-libs=/usr/lib/mozilla]
+-            [and the path to the NSS include files (like nssbase.h)]
+-            [Example: --with-nss-includes=/usr/include/nss])
+-        AC_MSG_CHECKING(for Mozilla nss libraries)
+-        AC_MSG_RESULT(no)
+-    fi
+-    
+-    NSS_CFLAGS="$NSPR_CFLAGS $NSS_CFLAGS"
+-    NSS_LIBS="$NSPR_LIBS $NSS_LIBS"
++	AC_SUBST(NSS_CFLAGS)
++	AC_SUBST(NSS_LIBS)
+ fi
+ 
+-AC_SUBST(NSS_CFLAGS)
+-AC_SUBST(NSS_LIBS)
+-
+-
+-# Old auto-finding code:
+-#
+-# Find the NSPR files
+-#
+-
+-# AC_ARG_WITH(nspr-includes,
+-#     AC_HELP_STRING([--with-nspr-includes=PATH],
+-# 		   [specify directory where nspr.h can be found]))
+-
+-# AC_MSG_CHECKING([for NSPR include files])
+-# possible_nspr_dirs="$with_nspr_includes $prefix /usr /usr/include/mozilla /usr/include/mozilla-1.2.1 /usr/include/mozilla-1.4 /opt/mozilla /usr/local"
+-# check_for_header nspr.h "$possible_nspr_dirs" "include nspr include/nspr"
+-# AC_MSG_RESULT([$result])
+-# CPPFLAGS="-I$result $CPPFLAGS"
+-
+-# AC_ARG_WITH(nspr-libs,
+-#     AC_HELP_STRING([--with-nspr-libs=PATH],
+-# 		   [specify directory where libnspr4.* can be found]))
+-
+-# possible_nspr_dirs="$with_nspr_libs $prefix /lib/mozilla /opt/mozilla /usr/local"
+-# check_for_lib PR_GetError nspr4 "$possible_nspr_dirs" ". lib nspr lib/nspr"
+-# LIBS="-lnspr4 $LIBS"
+-
+-
+-#
+-# Find the NSS files
+-#
+-
+-# AC_ARG_WITH(nss-includes,
+-#     AC_HELP_STRING([--with-nss-includes=PATH],
+-# 		   [specify directory where nssbase.h can be found]))
+-
+-# AC_MSG_CHECKING([for NSS include files])
+-# possible_nss_dirs="$with_nss_includes $prefix /usr /usr/include/mozilla /usr/include/mozilla-1.2.1 /usr/include/mozilla-1.4 /opt/mozilla /usr/local"
+-# check_for_header nssbase.h "$possible_nss_dirs" "include nss include/nss"
+-# AC_MSG_RESULT([$result])
+-# CPPFLAGS="-I$result $CPPFLAGS"
+-
+-# AC_ARG_WITH(nss-libs,
+-#     AC_HELP_STRING([--with-nss-libs=PATH],
+-# 		   [specify directory where libnss.* can be found]))
+-
+-# possible_nss_dirs="$with_nss_libs $prefix /lib/mozilla /opt/mozilla /usr/local"
+-# check_for_lib PK11_GenerateKeyPair nss3 "$possible_nss_dirs" ". lib nss lib/nss"
+-
+-
+-#
+-# Stolen from the gaim configure.ac file
+-#
+-
+ AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([
+ *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+
+ *** development headers installed. The latest version of GTK+ is
diff --git a/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4.ebuild b/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4.ebuild
new file mode 100644
index 000000000000..b241f7e42ad4
--- /dev/null
+++ b/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gaim-encryption/gaim-encryption-3.0_beta4.ebuild,v 1.1 2006/03/28 19:59:39 gothgirl Exp $
+
+inherit flag-o-matic debug eutils
+
+MY_PV="${PV/_beta/beta}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="GAIM Encryption PlugIn"
+HOMEPAGE="http://gaim-encryption.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-im/gaim-1.0.1
+		>=dev-libs/nss-3.11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}/${MY_P}-configure.patch"
+	libtoolize --force --copy || die "failed running libtoolize"
+	aclocal || die "failed running aclocal"
+	WANT_AUTOCONF="2.59" autoconf || die "failed to run autoconf"
+}
+
+src_compile() {
+	strip-flags
+	replace-flags -O? -O2
+	econf || die "failed running configure"
+	emake -j1 || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die "Install failed"
+	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
+}