From 367f0391e0264cab3d2a9cd84e2c08280acceb36 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Wed, 11 Jul 2012 14:09:35 +0000 Subject: [PATCH] pentoo/common/bleeding: my first attempt to stabilize the stable (common) profile --- .../pentoo/bleeding/package.accept_keywords/dev-lang | 1 + .../pentoo/bleeding/package.accept_keywords/dev-python | 1 + .../bleeding/package.accept_keywords/net-analyser | 2 ++ .../bleeding/package.accept_keywords/net-analyzer | 3 +++ .../pentoo/bleeding/package.accept_keywords/net-libs | 1 + .../pentoo/bleeding/package.accept_keywords/net-misc | 10 ++++++++++ .../bleeding/package.accept_keywords/net-wireless | 2 ++ .../pentoo/bleeding/package.accept_keywords/sys-devel | 1 + .../pentoo/bleeding/package.accept_keywords/sys-kernel | 1 + .../pentoo/common/package.accept_keywords/dev-lang | 1 - .../pentoo/common/package.accept_keywords/dev-python | 1 - .../pentoo/common/package.accept_keywords/net-analyzer | 6 ------ .../pentoo/common/package.accept_keywords/net-libs | 1 - .../pentoo/common/package.accept_keywords/net-misc | 10 ++-------- .../pentoo/common/package.accept_keywords/net-wireless | 2 -- .../pentoo/common/package.accept_keywords/sys-devel | 2 -- .../pentoo/common/package.accept_keywords/sys-kernel | 3 --- profiles/pentoo/common/package.use/net-dialup | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/dev-lang create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/dev-python create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/net-analyser create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/net-analyzer create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/net-libs create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/net-misc create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/net-wireless create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/sys-devel create mode 100644 profiles/pentoo/bleeding/package.accept_keywords/sys-kernel delete mode 100644 profiles/pentoo/common/package.accept_keywords/sys-devel diff --git a/profiles/pentoo/bleeding/package.accept_keywords/dev-lang b/profiles/pentoo/bleeding/package.accept_keywords/dev-lang new file mode 100644 index 000000000..50bfdf33e --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/dev-lang @@ -0,0 +1 @@ +~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 new file mode 100644 index 000000000..e7c2a6191 --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/dev-python @@ -0,0 +1 @@ +~dev-python/nltk-2.0.1_rc1 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-analyser b/profiles/pentoo/bleeding/package.accept_keywords/net-analyser new file mode 100644 index 000000000..ebe5a6354 --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-analyser @@ -0,0 +1,2 @@ +~net-analyzer/netcat-110 +~net-analyzer/net-snmp-5.4.3 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer b/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer new file mode 100644 index 000000000..db0d991ab --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-analyzer @@ -0,0 +1,3 @@ +net-analyzer/metacoretex-ng * ~* ** +net-analyzer/metasploit * ~* ** +net-analyzer/w3af * ~* ** diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-libs b/profiles/pentoo/bleeding/package.accept_keywords/net-libs new file mode 100644 index 000000000..35d16ff6c --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-libs @@ -0,0 +1 @@ +=net-libs/libbtbb-9999 ** diff --git a/profiles/pentoo/bleeding/package.accept_keywords/net-misc b/profiles/pentoo/bleeding/package.accept_keywords/net-misc new file mode 100644 index 000000000..331e2f5ef --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-misc @@ -0,0 +1,10 @@ +~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 new file mode 100644 index 000000000..1df4c7e28 --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/net-wireless @@ -0,0 +1,2 @@ +net-wireless/wireless-tools +~net-wireless/wpa_supplicant-1.0 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/sys-devel b/profiles/pentoo/bleeding/package.accept_keywords/sys-devel new file mode 100644 index 000000000..8545d0a67 --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/sys-devel @@ -0,0 +1 @@ +~sys-devel/libtool-2.4 diff --git a/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel b/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel new file mode 100644 index 000000000..5ef37da7c --- /dev/null +++ b/profiles/pentoo/bleeding/package.accept_keywords/sys-kernel @@ -0,0 +1 @@ +=sys-kernel/linux-firmware-99999999 ** diff --git a/profiles/pentoo/common/package.accept_keywords/dev-lang b/profiles/pentoo/common/package.accept_keywords/dev-lang index 80a74f2a4..e61809ff8 100644 --- a/profiles/pentoo/common/package.accept_keywords/dev-lang +++ b/profiles/pentoo/common/package.accept_keywords/dev-lang @@ -1,4 +1,3 @@ -~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 diff --git a/profiles/pentoo/common/package.accept_keywords/dev-python b/profiles/pentoo/common/package.accept_keywords/dev-python index f2a4fbe7e..ee9fa827b 100644 --- a/profiles/pentoo/common/package.accept_keywords/dev-python +++ b/profiles/pentoo/common/package.accept_keywords/dev-python @@ -1,4 +1,3 @@ -~dev-python/nltk-2.0.1_rc1 ~dev-python/pygraphviz-1.1 ~dev-python/pysnmp-3.4.4 ~dev-python/pybloomfiltermmap-0.2.0 diff --git a/profiles/pentoo/common/package.accept_keywords/net-analyzer b/profiles/pentoo/common/package.accept_keywords/net-analyzer index 728df309d..a85a70f7a 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/common/package.accept_keywords/net-analyzer @@ -65,10 +65,8 @@ net-analyzer/linkchecker net-analyzer/maketh net-analyzer/medusa net-analyzer/metacoretex-ng -net-analyzer/metacoretex-ng * ~* ** net-analyzer/metagoofil net-analyzer/metasploit -net-analyzer/metasploit * ~* ** net-analyzer/mosref net-analyzer/mrtg net-analyzer/mrtg-ping-probe @@ -88,12 +86,10 @@ net-analyzer/nessus-bin net-analyzer/nessus-core net-analyzer/nessus-libraries net-analyzer/nessus-plugins -~net-analyzer/netcat-110 net-analyzer/netdiscover net-analyzer/netio net-analyzer/netmap net-analyzer/netperf -~net-analyzer/net-snmp-5.4.3 net-analyzer/nettop net-analyzer/nfdump net-analyzer/nikto @@ -153,7 +149,6 @@ net-analyzer/subdomainer net-analyzer/sussen net-analyzer/symon net-analyzer/syweb -~net-analyzer/tcpdump-4.3.0 net-analyzer/tcpflow net-analyzer/tcpreplay net-analyzer/tcpslice @@ -169,7 +164,6 @@ net-analyzer/unicornscan net-analyzer/upnpwn net-analyzer/vomit net-analyzer/w3af -net-analyzer/w3af * ~* ** net-analyzer/waffit net-analyzer/wafp net-analyzer/wapiti diff --git a/profiles/pentoo/common/package.accept_keywords/net-libs b/profiles/pentoo/common/package.accept_keywords/net-libs index bbd051e83..4234d1b46 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-libs +++ b/profiles/pentoo/common/package.accept_keywords/net-libs @@ -2,6 +2,5 @@ net-libs/libbtbb net-libs/libnids net-libs/libwhisker net-libs/libvidcap -=net-libs/libbtbb-9999 ** =net-libs/libnet-1.0.2a-r4 ~net-libs/netwib-5.38.0 diff --git a/profiles/pentoo/common/package.accept_keywords/net-misc b/profiles/pentoo/common/package.accept_keywords/net-misc index cda79507f..fa2c898ce 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-misc +++ b/profiles/pentoo/common/package.accept_keywords/net-misc @@ -23,9 +23,7 @@ net-misc/cisco-vpnclient-3des net-misc/clipgrab net-misc/clockspeed-conf net-misc/connect -=net-misc/curl-7.25.0-r1 net-misc/datapipe -=net-misc/dhcpcd-5.5.6 net-misc/dibbler net-misc/directvnc app-misc/dradis @@ -58,10 +56,8 @@ net-misc/nat-traverse net-misc/netkit-rusers net-misc/netkit-rwall net-misc/netsed -~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/networkmanager-pptp-0.8.2 +~net-misc/networkmanager-vpnc-0.8.2 net-misc/ntpclient net-misc/nxnode net-misc/nxserver-freeedition @@ -75,7 +71,6 @@ net-misc/proxychains net-misc/proxytunnel net-misc/puf net-misc/rdesktop -~net-misc/rsync-3.0.9 net-misc/s3cmd net-misc/selfdhcp net-misc/ser @@ -86,7 +81,6 @@ net-misc/smbc net-misc/socat net-misc/ssh-installkeys net-misc/strongswan -~net-misc/stunnel-4.44 net-misc/suite3270 net-misc/switzerland net-misc/tcpick diff --git a/profiles/pentoo/common/package.accept_keywords/net-wireless b/profiles/pentoo/common/package.accept_keywords/net-wireless index 7aefd35f6..223f3572d 100644 --- a/profiles/pentoo/common/package.accept_keywords/net-wireless +++ b/profiles/pentoo/common/package.accept_keywords/net-wireless @@ -51,8 +51,6 @@ net-wireless/wavemon net-wireless/wepdecrypt net-wireless/wifi-radar net-wireless/wifiscanner -net-wireless/wireless-tools -~net-wireless/wpa_supplicant-1.0 net-wireless/afrag net-wireless/aircrack-ng net-wireless/btscanner diff --git a/profiles/pentoo/common/package.accept_keywords/sys-devel b/profiles/pentoo/common/package.accept_keywords/sys-devel deleted file mode 100644 index 32aec647f..000000000 --- a/profiles/pentoo/common/package.accept_keywords/sys-devel +++ /dev/null @@ -1,2 +0,0 @@ -~sys-devel/crossdev-20120305 -~sys-devel/libtool-2.4 diff --git a/profiles/pentoo/common/package.accept_keywords/sys-kernel b/profiles/pentoo/common/package.accept_keywords/sys-kernel index 1d04f331d..3d71f13a0 100644 --- a/profiles/pentoo/common/package.accept_keywords/sys-kernel +++ b/profiles/pentoo/common/package.accept_keywords/sys-kernel @@ -1,6 +1,3 @@ -=sys-kernel/linux-firmware-99999999 ** -~sys-kernel/linux-headers-3.3 - #below this line is unversioned on purpose. DO NOT CHANGE sys-kernel/linux-firmware sys-kernel/genkernel diff --git a/profiles/pentoo/common/package.use/net-dialup b/profiles/pentoo/common/package.use/net-dialup index 94e753e0f..ada598e72 100644 --- a/profiles/pentoo/common/package.use/net-dialup +++ b/profiles/pentoo/common/package.use/net-dialup @@ -1,2 +1,2 @@ net-dialup/freeradius threads wpe -net-dialup/ppp atm eap-tls radius dhcp +net-dialup/ppp eap-tls radius dhcp