Rename console use flag to ncurses to match standard and remove evil custom-cflags use flag

Package-Manager: portage-2.1.2.2

4 files changed, 38 insertions, 53 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index d460bb4c255b..0e151c125df4 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.12 2007/05/26 19:49:49 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.13 2007/05/26 20:34:30 tester Exp $
+
+  26 May 2007; Olivier Crête <tester@gentoo.org> pidgin-2.0.0.ebuild,
+  pidgin-2.0.1.ebuild:
+  Rename console use flag to ncurses to match standard and remove evil
+  custom-cflags use flag
 
 *pidgin-2.0.1 (26 May 2007)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f0f1779aa036..2fb9737cd19c 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -7,18 +7,18 @@ RMD160 f126c8410896bb7933cc81e05ebae9f5b83af0c7 files/pidgin-2.0.0-cchar_t-undec
 SHA256 a0c33e57f509bc87a84903689ef7ce4a33b615e79658e5bbf83bf9cc7077efea files/pidgin-2.0.0-cchar_t-undeclared.patch 278
 DIST pidgin-2.0.0.tar.bz2 7521328 RMD160 1e387bb098bb985c5aa46deedc5eb4450579ae4e SHA1 7bfe348abc25307845e8de1d0fe2b761293ab071 SHA256 d700a95fbce796b4a9e5c2fb07aad8c24402f38a795c8eb51a44e000a8400cff
 DIST pidgin-2.0.1.tar.bz2 7682458 RMD160 ea3d3a29bdad659a9a8c07a66365be51b42bcef8 SHA1 1b88284bbe89300a4c7227b4ea0a6f907d36dea3 SHA256 80f9908a604600950de8894e8107ba8f449543034e0220382d0c9f7361d151fc
-EBUILD pidgin-2.0.0.ebuild 7771 RMD160 fd7034ea8fce592fb0d71f2d2fd030fe4313eb4b SHA1 504ff8d15e8d998276e0d3d8e62e384efe84ab92 SHA256 b3893c343c5af641a520a01aac4f64d5563e4a58c7f2c408a0a6776c5c495d7c
-MD5 7af421b86d3a7fa779408a1852a2753d pidgin-2.0.0.ebuild 7771
-RMD160 fd7034ea8fce592fb0d71f2d2fd030fe4313eb4b pidgin-2.0.0.ebuild 7771
-SHA256 b3893c343c5af641a520a01aac4f64d5563e4a58c7f2c408a0a6776c5c495d7c pidgin-2.0.0.ebuild 7771
-EBUILD pidgin-2.0.1.ebuild 7852 RMD160 ff30c025b3aa34ba00fcef2de30aae8f852a2931 SHA1 4631c21b0e76ce261d3f12862062bc44277538d3 SHA256 3f2a56e2832130f49847d191b6f203fb44d8f6a514e8d382348c1bb1cf48ee7a
-MD5 bf06ab7fa621d152a3f02958997f3c0c pidgin-2.0.1.ebuild 7852
-RMD160 ff30c025b3aa34ba00fcef2de30aae8f852a2931 pidgin-2.0.1.ebuild 7852
-SHA256 3f2a56e2832130f49847d191b6f203fb44d8f6a514e8d382348c1bb1cf48ee7a pidgin-2.0.1.ebuild 7852
-MISC ChangeLog 1734 RMD160 d6ad8acbd8cf0c22a19cf2774beb42e781471061 SHA1 0cec418e733748077089b8254fadacd4814ecfb4 SHA256 646d93267941fd5f0530d116ef05ef677b4e98bded680c243284b1c548e51951
-MD5 398a54937514b38d8afe37b298821f54 ChangeLog 1734
-RMD160 d6ad8acbd8cf0c22a19cf2774beb42e781471061 ChangeLog 1734
-SHA256 646d93267941fd5f0530d116ef05ef677b4e98bded680c243284b1c548e51951 ChangeLog 1734
+EBUILD pidgin-2.0.0.ebuild 7444 RMD160 a40a25ef123ddb4b42a6e92eeffaedb74424b857 SHA1 2cc23a8f7058d189875573a5d734d027e8e5b8c4 SHA256 a02967839dfd37989b6b46d0c5ed49073090e4a4eff4fb8a30eaac7e8edfeeeb
+MD5 c865dde3dd44e6e02af418e43521a486 pidgin-2.0.0.ebuild 7444
+RMD160 a40a25ef123ddb4b42a6e92eeffaedb74424b857 pidgin-2.0.0.ebuild 7444
+SHA256 a02967839dfd37989b6b46d0c5ed49073090e4a4eff4fb8a30eaac7e8edfeeeb pidgin-2.0.0.ebuild 7444
+EBUILD pidgin-2.0.1.ebuild 7526 RMD160 8b670338416bc121cd27700a4980ed556c815181 SHA1 02403bb9e7d45aef191c2ebdf9853061e72ff8e9 SHA256 700a3d0749b2b9958ec7645cd430bd27e3e5817a0696002910f0cba8e152723d
+MD5 618a9caf6a7d331fe66d93823b25b540 pidgin-2.0.1.ebuild 7526
+RMD160 8b670338416bc121cd27700a4980ed556c815181 pidgin-2.0.1.ebuild 7526
+SHA256 700a3d0749b2b9958ec7645cd430bd27e3e5817a0696002910f0cba8e152723d pidgin-2.0.1.ebuild 7526
+MISC ChangeLog 1925 RMD160 bb3fcc089616ce06418797d6993fa35fdf8a9fc0 SHA1 d62d51336968dc77947547ef96d514a891b91a37 SHA256 fdcf5273774ca6805774eceaede40afca08d8b34876f0c6d6604ef30efbe1870
+MD5 e2e2407f57137c46ec3cd5f67cbe64ac ChangeLog 1925
+RMD160 bb3fcc089616ce06418797d6993fa35fdf8a9fc0 ChangeLog 1925
+SHA256 fdcf5273774ca6805774eceaede40afca08d8b34876f0c6d6604ef30efbe1870 ChangeLog 1925
 MISC metadata.xml 458 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd SHA1 7dc17a356911852b3f5867e3629ef02a46adb675 SHA256 4457ab0d5db90f61e9d916879c32d1e0a7c6d15f2f7c955a17e5e31cb0777ba9
 MD5 bba7b9e682937ac5182b872b00b19d93 metadata.xml 458
 RMD160 dca91f12277688e0a35ab2aefc0d46c8c70facbd metadata.xml 458
@@ -32,7 +32,7 @@ SHA256 4497649139e101148737beee7286ec99251c0f212d04d0870ff7b4b467b7e34a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFGWI98+IXOQtHLm/gRAmMCAJ0ffF7Ictv2b/Z83/njDgyOtfUC5gCdHoUG
-yPy93Y46XSRYf7MkWrtae/U=
-=SVsG
+iD8DBQFGWJoP+IXOQtHLm/gRArClAJwIpofULWDTaejOV837o1KzzkbUNACeIneT
+MMB7fBuszb1w8qmIPPzu29A=
+=H6Zo
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/pidgin-2.0.0.ebuild b/net-im/pidgin/pidgin-2.0.0.ebuild
index 474f1dbf47e9..a73c04a3097e 100644
--- a/net-im/pidgin/pidgin-2.0.0.ebuild
+++ b/net-im/pidgin/pidgin-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.0.ebuild,v 1.6 2007/05/25 09:16:49 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.0.ebuild,v 1.7 2007/05/26 20:34:30 tester Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console groupwise prediction" # mono"
+IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell ssl qq msn gadu"
+IUSE="${IUSE} gtk sasl ncurses groupwise prediction" # mono"
 IUSE="${IUSE} krb4"
 
 RDEPEND="
@@ -111,14 +111,6 @@ print_pidgin_warning() {
 	ewarn "Please read the pidgin FAQ at http://developer.pidgin.im/wiki/FAQ"
 	ewarn
 	einfo
-	if  use custom-cflags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
 }
 
 pkg_setup() {
@@ -140,7 +132,7 @@ pkg_setup() {
 	die "Configure failed"
 	fi
 
-	if use console &&  ! built_with_use sys-libs/ncurses unicode; then
+	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
 		eerror
 		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
 		eerror "to build finch the console client of pidgin."
@@ -148,9 +140,9 @@ pkg_setup() {
 		die "Configure failed"
 	fi
 
-	if ! use gtk && ! use console; then
+	if ! use gtk && ! use ncurses; then
 		einfo
-		elog "As you did not pick gtk or console use flag, building"
+		elog "As you did not pick gtk or ncurses use flag, building"
 		elog "console only."
 		einfo
 	fi
@@ -173,9 +165,7 @@ src_unpack() {
 
 src_compile() {
 	# Stabilize things, for your own good
-	if ! use custom-cflags; then
-		strip-flags
-	fi
+	strip-flags
 	replace-flags -O? -O2
 
 	# -msse2 doesn't play nice on gcc 3.2
@@ -232,10 +222,10 @@ src_compile() {
 			myconf="${myconf} --x-includes=/usr/include/X11"
 	fi
 
-	if ! use console && ! use gtk; then
+	if ! use ncurses && ! use gtk; then
 		myconf="${myconf} --enable-consoleui"
 	else
-		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
+		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
 	fi
 
 	econf \
diff --git a/net-im/pidgin/pidgin-2.0.1.ebuild b/net-im/pidgin/pidgin-2.0.1.ebuild
index 17ccef311612..b6352c847bea 100644
--- a/net-im/pidgin/pidgin-2.0.1.ebuild
+++ b/net-im/pidgin/pidgin-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.1.ebuild,v 1.1 2007/05/26 19:49:49 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.0.1.ebuild,v 1.2 2007/05/26 20:34:30 tester Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib autotools perl-app gnome2
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver custom-cflags spell ssl qq msn gadu"
-IUSE="${IUSE} gtk sasl console groupwise prediction zephyr" # mono"
+IUSE="avahi bonjour cjk crypt dbus debug doc eds gadu gnutls gstreamer meanwhile networkmanager nls perl silc startup-notification tcl tk xscreensaver spell ssl qq msn gadu"
+IUSE="${IUSE} gtk sasl ncurses groupwise prediction zephyr" # mono"
 
 RDEPEND="
 	bonjour? ( !avahi? ( net-misc/howl )
@@ -110,14 +110,6 @@ print_pidgin_warning() {
 	ewarn "Please read the pidgin FAQ at http://developer.pidgin.im/wiki/FAQ"
 	ewarn
 	einfo
-	if  use custom-cflags; then
-		einfo "Note that you have chosen NOT TO FILTER UNSTABLE C[XX]FLAGS."
-		einfo "DO NOT file bugs with GENTOO or UPSTREAM while using custom-cflags"
-		einfo
-	else
-		einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-		einfo
-	fi
 }
 
 pkg_setup() {
@@ -139,7 +131,7 @@ pkg_setup() {
 	die "Configure failed"
 	fi
 
-	if use console &&  ! built_with_use sys-libs/ncurses unicode; then
+	if use ncurses &&  ! built_with_use sys-libs/ncurses unicode; then
 		eerror
 		eerror "You need to rebuild sys-libs/ncurses with USE=unicode in order"
 		eerror "to build finch the console client of pidgin."
@@ -147,7 +139,7 @@ pkg_setup() {
 		die "Configure failed"
 	fi
 
-	if ! use gtk && ! use console; then
+	if ! use gtk && ! use ncurses ; then
 		einfo
 		elog "As you did not pick gtk or console use flag, building"
 		elog "console only."
@@ -173,9 +165,7 @@ src_unpack() {
 
 src_compile() {
 	# Stabilize things, for your own good
-	if ! use custom-cflags; then
-		strip-flags
-	fi
+	strip-flags
 	replace-flags -O? -O2
 
 	# -msse2 doesn't play nice on gcc 3.2
@@ -236,10 +226,10 @@ src_compile() {
 			myconf="${myconf} --x-includes=/usr/include/X11"
 	fi
 
-	if ! use console && ! use gtk; then
+	if ! use ncurses && ! use gtk; then
 		myconf="${myconf} --enable-consoleui"
 	else
-		myconf="${myconf} $(use_enable console consoleui) $(use_enable gtk gtkui)"
+		myconf="${myconf} $(use_enable ncurses consoleui) $(use_enable gtk gtkui)"
 	fi
 
 	econf \