From 3f716f1116220ecfaada36cdee9d384cacbd36d1 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Wed, 11 Jul 2012 21:42:33 +0000 Subject: [PATCH] profile: various fixes (no downgrades, etc) --- profiles/pentoo/bleeding/package.accept_keywords/dev-lang | 1 - .../pentoo/bleeding/package.accept_keywords/dev-python | 1 - .../pentoo/bleeding/package.accept_keywords/net-analyzer | 3 --- profiles/pentoo/bleeding/package.accept_keywords/net-misc | 7 ------- .../pentoo/bleeding/package.accept_keywords/net-wireless | 2 -- .../pentoo/bleeding/package.accept_keywords/sys-kernel | 2 -- profiles/pentoo/common/package.accept_keywords/dev-lang | 2 +- profiles/pentoo/common/package.accept_keywords/dev-python | 1 + .../pentoo/common/package.accept_keywords/net-analyzer | 2 ++ profiles/pentoo/common/package.accept_keywords/net-misc | 3 +++ .../pentoo/common/package.accept_keywords/net-wireless | 3 +++ .../{bleeding => common}/package.accept_keywords/sys-devel | 0 12 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 profiles/pentoo/bleeding/package.accept_keywords/dev-lang delete mode 100644 profiles/pentoo/bleeding/package.accept_keywords/dev-python delete mode 100644 profiles/pentoo/bleeding/package.accept_keywords/net-wireless rename profiles/pentoo/{bleeding => common}/package.accept_keywords/sys-devel (100%) diff --git a/profiles/pentoo/bleeding/package.accept_keywords/dev-lang b/profiles/pentoo/bleeding/package.accept_keywords/dev-lang deleted file mode 100644 index 50bfdf33e..000000000 --- a/profiles/pentoo/bleeding/package.accept_keywords/dev-lang +++ /dev/null @@ -1 +0,0 @@ -~dev-lang/lua-5.1.4 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/dev-python b/profiles/pentoo/bleeding/package.accept_keywords/dev-python deleted file mode 100644 index e7c2a6191..000000000 --- a/profiles/pentoo/bleeding/package.accept_keywords/dev-python +++ /dev/null @@ -1 +0,0 @@ -~dev-python/nltk-2.0.1_rc1 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer b/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer index 11d385be9..ca34b7c3b 100644 --- a/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer @@ -2,8 +2,5 @@ net-analyzer/metacoretex-ng * ~* ** net-analyzer/metasploit * ~* ** ~net-analyzer/netcat-110 -~net-analyzer/net-snmp-5.4.3 - -~net-analyzer/tcpdump-4.3.0 net-analyzer/w3af * ~* ** diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-misc b/profiles/pentoo/bleeding/package.accept_keywords/net-misc index 8f1a4337d..441a9d0cc 100644 --- a/profiles/pentoo/bleeding/package.accept_keywords/net-misc +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-misc @@ -1,12 +1,5 @@ =net-misc/curl-7.25.0-r1 - -~net-misc/dhcpcd-5.5.6 - ~net-misc/networkmanager-0.9.4.0 ~net-misc/networkmanager-openvpn-0.9.4.0 ~net-misc/networkmanager-pptp-0.9.4.0 ~net-misc/networkmanager-vpnc-0.9.4.0 - -~net-misc/rsync-3.0.9 - -~net-misc/stunnel-4.44 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-wireless b/profiles/pentoo/bleeding/package.accept_keywords/net-wireless deleted file mode 100644 index 1df4c7e28..000000000 --- a/profiles/pentoo/bleeding/package.accept_keywords/net-wireless +++ /dev/null @@ -1,2 +0,0 @@ -net-wireless/wireless-tools -~net-wireless/wpa_supplicant-1.0 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel b/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel index 6edbf5d20..5ef37da7c 100644 --- a/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel +++ b/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel @@ -1,3 +1 @@ =sys-kernel/linux-firmware-99999999 ** - -~sys-kernel/linux-headers-3.3 diff --git a/profiles/pentoo/common/package.accept_keywords/dev-lang b/profiles/pentoo/common/package.accept_keywords/dev-lang index e61809ff8..49ca44789 100644 --- a/profiles/pentoo/common/package.accept_keywords/dev-lang +++ b/profiles/pentoo/common/package.accept_keywords/dev-lang @@ -1,4 +1,4 @@ - +~dev-lang/lua-5.1.4 # stabilising ruby 1.9 on x86, waiting for the bug # https://bugs.gentoo.org/show_bug.cgi?id=411507 =dev-lang/ruby-1.9.3_p125 =dev-ruby/rubygems-1.8.24 diff --git a/profiles/pentoo/common/package.accept_keywords/dev-python b/profiles/pentoo/common/package.accept_keywords/dev-python index ee9fa827b..d963220d1 100644 --- a/profiles/pentoo/common/package.accept_keywords/dev-python +++ b/profiles/pentoo/common/package.accept_keywords/dev-python @@ -3,3 +3,4 @@ ~dev-python/pybloomfiltermmap-0.2.0 ~dev-python/pycrypto-2.5 ~dev-python/Impacket-0.9.6.0 +~dev-python/nltk-2.0.1_rc1 diff --git a/profiles/pentoo/common/package.accept_keywords/net-analyzer b/profiles/pentoo/common/package.accept_keywords/net-analyzer index a85a70f7a..b0e1801d3 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/common/package.accept_keywords/net-analyzer @@ -1,3 +1,4 @@ +~net-analyzer/tcpdump-4.3.0 ~net-analyzer/netwox-5.38.0 ~net-analyzer/aimsniff-0.9-r2 ~net-analyzer/hunt-1.5-r1 @@ -10,6 +11,7 @@ ~net-analyzer/netwag-5.38.0 ~net-analyzer/arpantispoofer-1.0.1.32 ~net-analyzer/upnpscan-0.4 +~net-analyzer/net-snmp-5.4.3 net-analyzer/thc-ipv6 net-analyzer/nmap diff --git a/profiles/pentoo/common/package.accept_keywords/net-misc b/profiles/pentoo/common/package.accept_keywords/net-misc index fa2c898ce..622faf38f 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-misc +++ b/profiles/pentoo/common/package.accept_keywords/net-misc @@ -1,6 +1,9 @@ ~net-misc/raccess-0.7 +~net-misc/rsync-3.0.9 ~net-misc/sipsak-0.9.6_p1 ~net-misc/nemesis-1.4 +~net-misc/dhcpcd-5.5.6 +~net-misc/stunnel-4.44 #below here likely needs cleanup net-misc/6tunnel diff --git a/profiles/pentoo/common/package.accept_keywords/net-wireless b/profiles/pentoo/common/package.accept_keywords/net-wireless index 223f3572d..225ba5e5e 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-wireless +++ b/profiles/pentoo/common/package.accept_keywords/net-wireless @@ -1,4 +1,7 @@ ~net-wireless/airsnort-0.2.7e +~net-wireless/wpa_supplicant-1.0 + +net-wireless/wireless-tools #below here likely needs cleanup net-wireless/acx diff --git a/profiles/pentoo/bleeding/package.accept_keywords/sys-devel b/profiles/pentoo/common/package.accept_keywords/sys-devel similarity index 100% rename from profiles/pentoo/bleeding/package.accept_keywords/sys-devel rename to profiles/pentoo/common/package.accept_keywords/sys-devel