Merge remote-tracking branch 'upstream/master'

21 files changed, 1146 insertions, 8 deletions

diff --git a/conf/intel/portage/package.use/00-kogaion.package.use b/conf/intel/portage/package.use/00-kogaion.package.use
index bc0016e..aa8f26b 100644
--- a/conf/intel/portage/package.use/00-kogaion.package.use
+++ b/conf/intel/portage/package.use/00-kogaion.package.use
@@ -760,7 +760,7 @@ sys-cluster/vzctl vanilla-kernel vz-kernel ploop
 # and it's better to not ship with gtk
 sys-devel/distcc -avahi -gtk
 sys-devel/gcc objc objc++ objc-gc graphite go -gtk
-sys-devel/base-gcc objc objc++ objc-gc graphite -gtk
+sys-devel/base-gcc objc objc++ objc-gc graphite go -gtk
 
 # No fuck git by default!
 sys-devel/gettext -git
diff --git a/conf/intel/portage/profile/package.use.mask/00-kogaion.mask b/conf/intel/portage/profile/package.use.mask/00-kogaion.mask
index ff957bc..37d3879 100644
--- a/conf/intel/portage/profile/package.use.mask/00-kogaion.mask
+++ b/conf/intel/portage/profile/package.use.mask/00-kogaion.mask
@@ -4,7 +4,7 @@ kde-base/solid -networkmanager
 # need to unmask its use flag
 media-gfx/blender -python_single_target_python3_3 -python_targets_python3_3
 
-# http://bugs.kogaion.org/show_bug.cgi?id=4115
+# http://bugs.rogentos.ro/show_bug.cgi?id=4115
 media-sound/audacity -ffmpeg
 
 # USE=systemd unmasking, no need to keep them masked
diff --git a/conf/intel/repo/kogaion-testing/packages.db.critical b/conf/intel/repo/kogaion-testing/packages.db.critical
index 07642ab..a881010 100644
--- a/conf/intel/repo/kogaion-testing/packages.db.critical
+++ b/conf/intel/repo/kogaion-testing/packages.db.critical
@@ -1,4 +1,4 @@
-sys-devel/base-gcc:4.7
+sys-devel/base-gcc:4.8
 >=sys-apps/portage-2.2.0_alpha142
 >sys-libs/glibc-2.16.9999
 >=sys-apps/entropy-205
diff --git a/conf/intel/repo/kogaion-testing/packages.db.system_mask b/conf/intel/repo/kogaion-testing/packages.db.system_mask
index f4bb5fc..e042d93 100644
--- a/conf/intel/repo/kogaion-testing/packages.db.system_mask
+++ b/conf/intel/repo/kogaion-testing/packages.db.system_mask
@@ -2,7 +2,7 @@ app-admin/equo
 app-misc/kogaion-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/base-gcc:4.7
+sys-devel/base-gcc:4.8
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
diff --git a/conf/intel/repo/kogaion-tight/packages.db.critical b/conf/intel/repo/kogaion-tight/packages.db.critical
index 07642ab..a881010 100644
--- a/conf/intel/repo/kogaion-tight/packages.db.critical
+++ b/conf/intel/repo/kogaion-tight/packages.db.critical
@@ -1,4 +1,4 @@
-sys-devel/base-gcc:4.7
+sys-devel/base-gcc:4.8
 >=sys-apps/portage-2.2.0_alpha142
 >sys-libs/glibc-2.16.9999
 >=sys-apps/entropy-205
diff --git a/conf/intel/repo/kogaion-tight/packages.db.system_mask b/conf/intel/repo/kogaion-tight/packages.db.system_mask
index f4bb5fc..e042d93 100644
--- a/conf/intel/repo/kogaion-tight/packages.db.system_mask
+++ b/conf/intel/repo/kogaion-tight/packages.db.system_mask
@@ -2,7 +2,7 @@ app-admin/equo
 app-misc/kogaion-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/base-gcc:4.7
+sys-devel/base-gcc:4.8
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
diff --git a/conf/intel/repo/kogaionlinux.ro/packages.db.critical b/conf/intel/repo/kogaionlinux.ro/packages.db.critical
index 07642ab..a881010 100644
--- a/conf/intel/repo/kogaionlinux.ro/packages.db.critical
+++ b/conf/intel/repo/kogaionlinux.ro/packages.db.critical
@@ -1,4 +1,4 @@
-sys-devel/base-gcc:4.7
+sys-devel/base-gcc:4.8
 >=sys-apps/portage-2.2.0_alpha142
 >sys-libs/glibc-2.16.9999
 >=sys-apps/entropy-205
diff --git a/conf/intel/repo/kogaionlinux.ro/packages.db.system_mask b/conf/intel/repo/kogaionlinux.ro/packages.db.system_mask
index f4bb5fc..e042d93 100644
--- a/conf/intel/repo/kogaionlinux.ro/packages.db.system_mask
+++ b/conf/intel/repo/kogaionlinux.ro/packages.db.system_mask
@@ -2,7 +2,7 @@ app-admin/equo
 app-misc/kogaion-version
 dev-db/sqlite
 sys-apps/entropy
-sys-devel/base-gcc:4.7
+sys-devel/base-gcc:4.8
 sys-libs/db:4.8
 virtual/cron   
 # virtual/linux-binary
diff --git a/conf/intel/repo/kogaionlinux/packages.db.critical b/conf/intel/repo/kogaionlinux/packages.db.critical
new file mode 100644
index 0000000..a881010
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.critical
@@ -0,0 +1,4 @@
+sys-devel/base-gcc:4.8
+>=sys-apps/portage-2.2.0_alpha142
+>sys-libs/glibc-2.16.9999
+>=sys-apps/entropy-205
diff --git a/conf/intel/repo/kogaionlinux/packages.db.fallback_mirrors b/conf/intel/repo/kogaionlinux/packages.db.fallback_mirrors
new file mode 100644
index 0000000..45fc20f
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.fallback_mirrors
@@ -0,0 +1,6 @@
+# Our fallback mirror is pkg.rogentos.ro
+pkg.rogentos.ro
+best.rogentos.ro
+dl.rogentos.ro
+r.rogentos.ro
+redir.rogentos.ro
diff --git a/conf/intel/repo/kogaionlinux/packages.db.keywords b/conf/intel/repo/kogaionlinux/packages.db.keywords
new file mode 100644
index 0000000..6d656fd
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.keywords
@@ -0,0 +1,7 @@
+sys-apps/portage ~x86 ~amd64
+dev-lang/python:3.3 ~x86 ~amd64
+
+# GNOME 3.12 mask
+>=sys-power/upower-0.99.0 ~x86 ~amd64
+# Allow systemd and upower 0.99 friendly version
+=xfce-extra/xfce4-power-manager-1.2.0_p20140527 ~amd64 ~x86 amd64 x86
diff --git a/conf/intel/repo/kogaionlinux/packages.db.lic_whitelist b/conf/intel/repo/kogaionlinux/packages.db.lic_whitelist
new file mode 100644
index 0000000..a740a3c
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.lic_whitelist
@@ -0,0 +1,770 @@
+3DFX
+3proxy
+3ware
+4F
+7plus
+9wm
+ACME
+ACML
+aczoom
+Adaptec
+adobe-ps
+AdobePS
+Adobe-SourceCode
+AECA
+aewm
+AFL-2.0
+AFL-2.1
+AFL-3.0
+AFTERSTEP
+AICCU
+Aladdin
+Allegro
+amiwm
+AMPAS
+AMS
+ANTL
+Apache-1.1
+Apache-2.0
+APL-1.0
+appres
+APSL-2
+aquafont
+arj
+Arphic
+Artistic
+Artistic-2
+as-is
+astrolog
+astromenace
+ATOK
+AURA
+BAEKMUK
+bass
+BCS
+bdftopcf
+BEER-WARE
+beforelight
+bigresproto
+bioapi
+bitmap
+BitstreamVera
+BitTorrent
+blackshades
+Blitz-Artistic
+bonnie
+Boost-1.0
+BSD
+BSD-2
+BSD-4
+BSD-4
+bungie-marathon
+BWidget
+BZIP2
+C3
+cadsoft
+Caldera
+canada-med
+CAOSL
+ccp4
+CCPL-Attribution-2.0
+CCPL-Attribution-3.0
+CCPL-Attribution-NoDerivs-2.5
+CCPL-Attribution-NonCommercial-NoDerivs-2.0
+CCPL-Attribution-NonCommercial-NoDerivs-2.5
+CCPL-Attribution-ShareAlike-2.0
+CCPL-Attribution-ShareAlike-2.5
+CCPL-Attribution-ShareAlike-3.0
+CCPL-Attribution-ShareAlike-NonCommercial-2.5
+CCPL-ShareAlike-1.0
+CDDL
+CDDL-Schily
+cdegroot
+CDF
+CeCILL-2
+Cenon
+CGL
+charm
+chasen
+circlemud
+cisco-vpn-client
+Clarified-Artistic
+clustalw
+CMake
+CMASS-M3
+cmigemo
+CNRI
+CNRI-QUIXOTE-2.4
+codehaus-classworlds
+codehaus-groovy
+colt
+compositeproto
+Conexant
+cos
+CPL-0.5
+CPL-1.0
+CRACKLIB
+crafty
+crazney
+cryptopp
+CS-1.0
+CyberNeko-1.0
+damageproto
+DB
+dbgphp
+DCC
+DEC-M3
+DES
+dgen-sdl
+dlj-1.1
+dmxproto
+dom4j
+DSL
+DSNIFF
+DUMB-0.9.2
+dvibook
+EAPL
+ECWPL
+EDB
+editres
+eGenixPublic
+eGenixPublic-1.1
+ElementTree
+Elm
+Emacs
+encodings
+EPL
+EPL-1.0
+EPSON
+eternal_lands
+evieext
+Exolab
+FastCGI
+FDL-1.1
+FDL-1.2
+FDL-1.3+
+FESTIVAL
+FIPL-1.0
+fixesproto
+FLEX
+FLTK
+FML-1
+fmod
+folding-at-home
+font-adobe-100dpi
+font-adobe-75dpi
+font-adobe-utopia-100dpi
+font-adobe-utopia-75dpi
+font-adobe-utopia-type1
+font-alias
+font-arabic-misc
+font-bh-100dpi
+font-bh-75dpi
+font-bh-lucidatypewriter-100dpi
+font-bh-lucidatypewriter-75dpi
+font-bh-ttf
+font-bh-type1
+font-bitstream-100dpi
+font-bitstream-75dpi
+font-bitstream-speedo
+font-bitstream-type1
+fontcacheproto
+fontconfig
+font-cronyx-cyrillic
+font-cursor-misc
+font-daewoo-misc
+font-dec-misc
+font-ibm-type1
+font-isas-misc
+font-jis-misc
+font-micro-misc
+font-misc-cyrillic
+font-misc-ethiopic
+font-misc-meltho
+font-misc-misc
+font-mutt-misc
+font-schumacher-misc
+font-screen-cyrillic
+font-sony-misc
+fontsproto
+font-sun-misc
+fonttosfnt
+font-util
+font-winitzki-cyrillic
+font-xfree86-type1
+fping
+FreeArt
+freedist
+freemarker
+freetts
+Frodo
+fslsfonts
+fstobdf
+FTL
+FVWM
+galaxyhack
+GAlib
+gamess
+gccmakedep
+gcc-runtime-library-exception-3.1
+GDLS
+gips_iLBClicense.pdf
+glest-data
+glimpse
+glproto
+glut
+GLX
+GMGPL
+gnuplot
+GPL-1
+GPL-2
+GPL-2+
+GPL-2-with-exceptions
+GPL-2-with-linking-exception
+GPL-2-with-MySQL-FLOSS-exception
+GPL-3
+GPL-3+
+grass-ipafonts
+guild
+HPL
+HYDRA
+hylafax
+hyperic
+HyperSpec
+iASL
+IBM
+IBM-J1.4
+IBM-J1.5
+ICE
+iceauth
+ico
+icu
+IDPL
+imagemagick
+imake
+immon-sflow
+Indir
+Inform
+Info-ZIP
+inputproto
+Interbase-1.0
+ipadic
+IPL-1
+IRPDL
+ISC
+isc-dhcp
+ITS4
+JamesClark
+jardinains
+JasPer
+jaxen
+jcraft
+jdepend
+JDOM
+jlex
+JNIC
+JPython
+jrockit
+kbproto
+KenMacLeod
+Kermit
+knights-demo
+kvirc
+lam-mpi
+LDP
+LDP-1a
+less
+levee
+LFS
+LGPL-2
+LGPL-2+
+LGPL-2.1
+LGPL-2.1+
+LGPL-2.1-linking-exception
+LGPL-2.1-UUST
+LGPL-3
+LGPL-3+
+lha
+libdmx
+libdomainkeys-1.1
+libdrm
+libf2c
+libffi
+libfontenc
+libFS
+libgcc
+LIBGLOSS
+libICE
+liblbxutil
+liboldX
+libSM
+libstdc++
+libX11
+libXau
+libXaw
+libXcomposite
+libXcursor
+libXdamage
+libXdmcp
+libXevie
+libXext
+libXfixes
+libXfont
+libXfontcache
+libXft
+libXi
+libXinerama
+libxkbfile
+libxkbui
+libXmu
+libXp
+libXpm
+libXprintAppUtil
+libXprintUtil
+libxproxy
+libXrandr
+libXrender
+libXres
+libXScrnSaver
+libXt
+libXTrap
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86misc
+libXxf86vm
+LICENSE-BITSTREAM
+lisp2wish
+listres
+LLGPL-2.1
+LOKI-EULA
+LPPL-1.2
+LPPL-1.3
+LPPL-1.3b
+LPPL-1.3c
+lsof
+luit
+maestro
+MagickWand
+makedepend
+MakeIndex
+mapm
+marginalhacks
+mayadoc-5.0
+MBROLA
+mekanix
+meme
+Memonix
+metapackage
+MILO
+mindterm
+Mini-XML
+MIT
+mkfontdir
+mkfontscale
+mmix
+molmol
+molscript
+MonetDBPL-1.1
+mongrel
+mopac7
+Moria
+MOTIF
+Mozart
+MPEG4
+MPL-1.0
+MPL-1.1
+mplus-fonts
+mserv
+MSF-1.2
+Ms-PL
+mx4j
+myspell-en_CA-JRossBeresford
+myspell-en_CA-KevinAtkinson
+myspell-et_EE-IEL
+myspell-hyph_sk_SK-TiborBako
+myspell-ispell-GeoffKuenning
+myspell-lt_LT-AlbertasAgejevas
+myspell-ru_RU-ALexanderLebedev
+myspell-th_cs_CZ-PavelRychlySmrz
+namd
+NCSA-HDF
+nemerle
+nethack
+netlogo
+netperf
+NewArtisans
+NEWLIB
+newton
+nhc98
+No-Problem-Bugroff
+Norvig
+NPL-1.1
+oclock
+OFL
+OFL-1.1
+OGL-1.0a
+OGTSL
+openafs-krb5
+openafs-krb5-a
+openknights
+OPENLDAP
+openmarket
+openpbs
+OpenSoftware
+openspml
+openssl
+OpenSymphony-1.1
+OPERA-9
+OPL
+OracleDB
+OSI-Approved
+OSIRIS
+OSL-1.1
+OSL-2.0
+OTN
+otter
+Palm-SDK
+PAM
+Parallels
+paraview
+PathfinderPL-1.1
+PBZIP2
+PDB
+PDFLite
+PEL
+penguzzle
+perforce
+petrify
+pgasync
+PHP
+PHP-2.02
+PHP-3
+PHP-3.01
+phrack
+PICO
+PicoContainer
+pixman
+pkcrack
+PLAN9
+pmd
+POMPOM
+poster
+POSTGRESQL
+Princeton
+printproto
+proxymngr
+PSF-2
+PSF-2.2
+PSF-2.3
+PSF-2.4
+PSTT
+public-domain
+pymol
+pysqlite
+PYTHON
+qeradiant
+qlogic-fibre-channel-firmware
+qpage
+QPL
+QPL-1.0
+qpopper
+queen
+qwt
+randrproto
+RDist
+REALbasic
+recordproto
+renderproto
+Resounding
+resourceproto
+rgb
+RiceBSD
+richardson
+ringtonetools
+Roadrunner
+RSA-MD2
+RSA-MD4
+RSA-MD5
+RSA-PKCS11
+rstart
+Ruby
+ruby-debug
+satan
+saxpath
+scilab
+Scintilla
+scripts
+scrnsaverproto
+selfhtml
+Sendmail
+Sendmail-Open-Source
+sessreg
+setxkbmap
+SGI-B
+SGI-B-1.1
+SGMLUG
+showfont
+SIFT
+SIL-freeware
+singular
+sip
+SixXS
+Sleepycat
+Smart-Link
+smproxy
+SNNS-4.2
+SOPLA-2.3
+sparky
+Spice-1.1
+SPL
+Spread-1.0
+ssh
+sslwrap
+staden
+Stanford
+stardock-images
+stix
+Subversion
+Sudo
+sun-asis-javamake
+sun-bcla-j2ee
+sun-bcla-j2ee-deployment
+sun-bcla-j2me
+sun-bcla-jai
+sun-bcla-jimi
+sun-bcla-jmf
+sun-bcla-jmi
+sun-bcla-jms
+sun-bcla-jsapi
+sun-bcla-jsr101
+sun-bcla-jta
+sun-bcla-jvmstat
+sun-j2sl
+sun-j2sl-6
+sun-jrl
+sun-jsr67
+sun-jsr93
+sun-openlook
+sun-rpc
+SVFL
+tacc
+t-coffee
+tcp_wrappers_license
+TeX
+trac
+trapproto
+truecrypt-collective-1.0
+truecrypt-collective-1.3
+twm
+UCAR-Unidata
+unicode
+unRAR
+ut2003-demo
+util-macros
+ValveSDK
+ventrilo
+VGBA
+videoproto
+vienna-rna
+viewres
+VIGRA
+vim
+visual
+vlgothic
+Volano
+VOSTROM
+W3C
+W3C-document
+w3m
+WarpPipe
+WebMO
+Werken-1.1.1.1
+werken.xpath
+whitehead
+WordNet-1.6
+worldofpadman
+WTFPL-2
+wxWinFDL-3
+wxWinLL-3
+X11
+x11perf
+XAnim
+xauth
+xbacklight
+xbattle
+xbiff
+xbitmaps
+xboing
+xcalc
+XCIN
+xclipboard
+xcmiscproto
+xcmsdb
+xconsole
+xcursorgen
+xcursor-themes
+xdbedizzy
+Xdebug
+xditview
+xdm
+xdpyinfo
+xdriinfo
+xearth
+xedit
+XeTeX
+xev
+xextproto
+xeyes
+xf86bigfontproto
+xf86dga
+xf86dgaproto
+xf86driproto
+xf86-input-acecad
+xf86-input-aiptek
+xf86-input-calcomp
+xf86-input-citron
+xf86-input-digitaledge
+xf86-input-dmc
+xf86-input-dynapro
+xf86-input-elo2300
+xf86-input-elographics
+xf86-input-evdev
+xf86-input-fpit
+xf86-input-hyperpen
+xf86-input-jamstudio
+xf86-input-joystick
+xf86-input-keyboard
+xf86-input-magellan
+xf86-input-magictouch
+xf86-input-microtouch
+xf86-input-mouse
+xf86-input-mutouch
+xf86-input-palmax
+xf86-input-penmount
+xf86-input-spaceorb
+xf86-input-summa
+xf86-input-tek4957
+xf86-input-ur98
+xf86-input-vmmouse
+xf86-input-void
+xf86miscproto
+xf86rushproto
+xf86-video-amd
+xf86-video-apm
+xf86-video-ark
+xf86-video-ati
+xf86-video-chips
+xf86-video-cirrus
+xf86-video-cyrix
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-glint
+xf86-video-i128
+xf86-video-i740
+xf86-video-i810
+xf86-video-impact
+xf86-video-imstt
+xf86-video-mga
+xf86-video-neomagic
+xf86-video-newport
+xf86-video-nsc
+xf86-video-nv
+xf86-video-rendition
+xf86-video-s3
+xf86-video-s3virge
+xf86-video-savage
+xf86-video-siliconmotion
+xf86-video-sis
+xf86-video-sisusb
+xf86-video-sunbw2
+xf86-video-suncg14
+xf86-video-suncg3
+xf86-video-suncg6
+xf86-video-sunffb
+xf86-video-sunleo
+xf86-video-suntcx
+xf86-video-tdfx
+xf86-video-tga
+xf86-video-trident
+xf86-video-tseng
+xf86-video-v4l
+xf86-video-vermilion
+xf86-video-vesa
+xf86-video-vga
+xf86-video-via
+xf86-video-vmware
+xf86-video-voodoo
+xf86-video-xgi
+xf86vidmodeproto
+xfd
+xfindproxy
+xfontsel
+xfs
+xfsinfo
+xfwp
+xgamma
+xgc
+xhost
+Ximian-logos
+xineramaproto
+xinit
+xkbcomp
+xkbdata
+xkbevd
+xkbprint
+xkbutils
+xkill
+xload
+xlogo
+xlsatoms
+xlsclients
+xlsfonts
+xmag
+xmame
+xman
+xmessage
+xmh
+xmlformat
+xmodmap
+xmore
+xorg-cf-files
+xorg-docs
+xorg-server
+xorg-sgml-doctools
+xphelloworld
+xplsprinters
+xpr
+xprehashprinterlist
+xprop
+xproto
+xproxymanagementproto
+xrandr
+xrdb
+xref.lisp
+xrefresh
+xrx
+xset
+xsetmode
+xsetpointer
+xsetroot
+xshipwars
+xsm
+xstdcmap
+xtrans
+xtrap
+xvidtune
+xvinfo
+xwd
+xwininfo
+xwud
+YAZ
+ZBL
+ZendFramework-1.1
+zend-optimizer
+ZLIB
+zoo
+ZORK
+ZPL
+ZSH
diff --git a/conf/intel/repo/kogaionlinux/packages.db.mask b/conf/intel/repo/kogaionlinux/packages.db.mask
new file mode 100644
index 0000000..a18282a
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.mask
@@ -0,0 +1,2 @@
+# Mask apache using MPM worker for now
+www-servers/apache[threads]
diff --git a/conf/intel/repo/kogaionlinux/packages.db.mirrors b/conf/intel/repo/kogaionlinux/packages.db.mirrors
new file mode 100644
index 0000000..17672fc
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.mirrors
@@ -0,0 +1,8 @@
+# these are all the same
+http://dl.rogentos.ro/entropy
+http://best.rogentos.ro/entropy
+http://redir.rogentos.ro/entropy
+# This will be used as last resort, and must stay here
+http://pkg.rogentos.ro
+# this is in case our DNS goes down
+http:///mirrors/kogaionlinux/entropy
diff --git a/conf/intel/repo/kogaionlinux/packages.db.missing_deps_blacklist b/conf/intel/repo/kogaionlinux/packages.db.missing_deps_blacklist
new file mode 100644
index 0000000..9d8fca4
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.missing_deps_blacklist
@@ -0,0 +1,5 @@
+dev-lang/gnat-gcc:4.2
+dev-lang/gnat-gcc:4.3
+dev-lang/gnat-gcc:4.4
+dev-lang/gnat-gcc:4.5
+dev-lang/gnat-gcc:4.6
diff --git a/conf/intel/repo/kogaionlinux/packages.db.post_update.sh b/conf/intel/repo/kogaionlinux/packages.db.post_update.sh
new file mode 100644
index 0000000..2770480
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.post_update.sh
@@ -0,0 +1,84 @@
+#!/bin/sh
+# Entropy Framework 1.0
+# Entropy Client post repository update (equo update <repoid>) script
+# -- called every time repositories are updated --
+#
+# This is a sample file shipped with client repositories which contains
+# per-repository post repository update hook. More precisely, this script is
+# triggered when entropy updates repositories. As stated, this script is PER-
+# repository and it's shipped with it.
+# It MUST return 0, any different value will be considered as critical error.
+#
+# This script must be called with specific arguments explained here below:
+#
+#     # sh packages.db.post_upgrade.sh [REPOSITORY_ID] [ROOT] [ENTROPY_BRANCH]
+#
+# example:
+#
+#     # sh packages.db.post_branch.sh "kogaionlinux.ro" "/" "5"
+#
+# PLEASE NOTE: this script is called automatically by entropy and, unless
+# requested otherwise, it should be NEVER EVER called by user.
+
+[ "$(id -u)" != "0" ] && echo && echo "Skipping update script, you are not root" && exit 0
+
+[ -z "$3" ] && echo "not enough parameters" && exit 1
+
+REPO_ID=$1
+ROOT=$2
+BRANCH=$3
+
+configure_correct_binutils() {
+    # configure correct binutils
+    # new profile needs to be configured
+    echo
+    binutils_dir="${ROOT}/etc/env.d/binutils"
+    if [ -d "${binutils_dir}" ]; then
+        binutils_profile=$(find "${binutils_dir}" -name "$(uname -m)*" | \
+            sort | tail -n 1 | xargs basename)
+        echo "trying to set binutils profile ${binutils_profile}"
+        binutils-config ${binutils_profile}
+    else
+        echo "binutils directory ${binutils_dir} not found"
+        echo "cannot properly set binutils profile"
+        rc=1
+    fi
+}
+
+if [ ! -f "/usr/$(uname -m)-pc-linux-gnu/bin/ld" ]; then
+	configure_correct_binutils
+fi
+
+autoconfl_file="${ROOT}/etc/env.d/00-entropy-autoconflict"
+if [ -e "${autoconfl_file}" ]; then
+	rm -f "${autoconfl_file}"
+fi
+
+# 2012-04-23 (remove in 12 months)
+# fixup wrong disabled USE deps matching
+tmp_path=$(mktemp)
+if [ -z "${tmp_path}" ]; then
+	exit 1
+fi
+cat << EOF >> "${tmp_path}"
+--- a/usr/lib/entropy/lib/entropy/db/skel.py
++++ b/usr/lib/entropy/lib/entropy/db/skel.py
+@@ -4651,7 +4651,9 @@ class EntropyRepositoryBase(TextInterface, EntropyRepositoryPluginStore):
+             else:
+                 # for compatibility reasons with older Entropy versions,
+                 # use flags not in pkguse are considered disabled.
+-                pkguse.add(use)
++                en_use = use[1:]
++                if en_use not in pkguse:
++                    pkguse.add(use)
+             disabled_use.add(use)
+ 
+         enabled_not_satisfied = enabled_use - pkguse
+EOF
+
+( cd "${ROOT}/" && patch -N -r - -p1 < "${tmp_path}" 2>&1 > /dev/null ) # ignore any outcome
+rm -f "${tmp_path}"
+
+exit 0
+
+### CUT HERE ###
diff --git a/conf/intel/repo/kogaionlinux/packages.db.post_upgrade.sh b/conf/intel/repo/kogaionlinux/packages.db.post_upgrade.sh
new file mode 100644
index 0000000..b655687
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.post_upgrade.sh
@@ -0,0 +1,133 @@
+#!/bin/sh
+
+[ -z "$4" ] && echo "not enough parameters" && exit 1
+
+REPO_ID=$1
+ROOT=$2
+OLD_BRANCH=$3
+NEW_BRANCH=$4
+
+echo -e "
+>> requirements for this branch:
+   app-admin/eselect-python
+   sys-devel/base-gcc:<latest>
+>> Entropy post-upgrade migration script
+>> Repository: "${REPO_ID}"
+>> Root: "${ROOT}"
+>> Old branch: "${OLD_BRANCH}"
+>> New branch: "${NEW_BRANCH}"
+
+>> ATTENTION ATTENTION ATTENTION
+>> - If you are upgrading from a previous branch (say, 4)
+>>   and you are a NetworkManager user, make sure to have
+>>   your users inside the "netdev" group.
+>> - If you compile stuff manually, it is strongly
+>>   suggested to install "lafilefixer" and execute:
+>>     # lafilefixer --justfixit
+>> ATTENTION ATTENTION ATTENTION
+
+"
+
+### CUT HERE ###
+
+fix_lib64_symlinks() {
+	if [ -L ${ROOT}/lib64 ] ; then
+		echo "removing /lib64 symlink and moving lib to lib64..."
+		echo "dont hit ctrl-c until this is done"
+		rm ${ROOT}/lib64
+		# now that lib64 is gone, nothing will run without calling ld.so
+		# directly. luckily the window of brokenness is almost non-existant
+		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
+		# all better :)
+		ldconfig
+		ln -s lib64 ${ROOT}/lib
+		echo "done! :-)"
+		echo "fixed broken lib64/lib symlink in ${ROOT}"
+	fi
+	if [ -L ${ROOT}/usr/lib64 ] ; then
+		rm ${ROOT}/usr/lib64
+		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
+		ln -s lib64 ${ROOT}/usr/lib
+		echo "fixed broken lib64/lib symlink in ${ROOT}/usr"
+	fi
+	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
+		rm ${ROOT}/usr/X11R6/lib64
+		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
+		ln -s lib64 ${ROOT}/usr/X11R6/lib
+		echo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
+	fi
+}
+
+three_four_to_five() {
+
+    local rc=0
+
+    # switch Python to latest available, 2.7
+    eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 --ignore 3.3 --ignore 3.4
+    [ "${?}" != "0" ] && echo "eselect-python not available" && rc=1
+
+    # configure correct binutils
+    # new profile needs to be configured
+    binutils_dir="${ROOT}/etc/env.d/binutils"
+    if [ -d "${binutils_dir}" ]; then
+        binutils_profile=$(find "${binutils_dir}" -name "$(uname -m)*" | \
+            sort | tail -n 1 | xargs basename)
+        echo "trying to set binutils profile ${binutils_profile}"
+        binutils-config ${binutils_profile}
+    else
+        echo "binutils directory ${binutils_dir} not found"
+        echo "cannot properly set binutils profile"
+        rc=1
+    fi
+
+    # set proper eselect esd engine
+    if [ -f "${ROOT}/usr/bin/esdcompat" ]; then
+        eselect esd list | grep PulseAudio | cut -d"[" -f 2 | \
+            cut -d"]" -f 1 | xargs eselect esd set &> /dev/null
+    fi
+
+    # make sure working eselect boost is selected
+    e_boost_mod="${ROOT}/usr/share/eselect/modules/boost.eselect"
+    if [ -f "${e_boost_mod}" ]; then
+        eselect boost update &> /dev/null
+    fi
+
+    # move alsa conf to new location
+    [ -f "${ROOT}/etc/modprobe.d/alsa" ] && \
+        mv "${ROOT}/etc/modprobe.d/alsa" "${ROOT}/etc/modprobe.d/alsa.conf"
+
+    # try to mount /boot, ignore all the possible bullshit
+    # [ "${ROOT}" = "/" ] && mount /boot &> /dev/null
+    # setup grub.conf, if found
+    [ -f "${ROOT}boot/grub/grub.conf" ] && \
+        sed -i 's/CONSOLE=\/dev\/tty1/console=tty1/g' "${ROOT}/boot/grub/grub.conf"
+
+    # setup grub.conf, if found, change nox into gentoo=nox
+    [ -f "${ROOT}boot/grub/grub.conf" ] && \
+        sed -i 's/ nox / gentoo=nox /g' "${ROOT}/boot/grub/grub.conf"
+
+    # setup /etc/localtime correctly
+    if [ -f "${ROOT}etc/timezone" ]; then
+        tzdata=$(cat "${ROOT}etc/timezone")
+        rm -f "${ROOT}etc/localtime" && ln -sf "/usr/share/zoneinfo/${tzdata}" "${ROOT}etc/localtime"
+    fi
+
+    # always add udev to sysinit
+    rc-update add udev sysinit &> /dev/null
+    exit ${rc}
+}
+
+# run this in any case, it will fix symlinks setup
+if [ "$(uname -m)" = "x86_64" ]; then
+	fix_lib64_symlinks
+fi
+
+# migration script from branch 4 to 5
+[ "${OLD_BRANCH}" = "4" ] && [ "${NEW_BRANCH}" = "5" ] && three_four_to_five
+
+# migration script from branch 3.5 to 5
+[ "${OLD_BRANCH}" = "3.5" ] && [ "${NEW_BRANCH}" = "5" ] && three_four_to_five
+
+echo "migration switch not found"
+exit 1
+
diff --git a/conf/intel/repo/kogaionlinux/packages.db.repo_updates b/conf/intel/repo/kogaionlinux/packages.db.repo_updates
new file mode 100644
index 0000000..416103e
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.repo_updates
@@ -0,0 +1,96 @@
+move app-admin/liboobs dev-libs/liboobs
+move app-portage/etcproposals app-portage/etc-proposals
+move net-misc/nm-applet gnome-extra/nm-applet
+move media-video/xbmc media-tv/xbmc
+
+# Drop openoffice completely in favour of libreoffice
+move app-office/openoffice app-office/libreoffice
+move app-office/openoffice-l10n-af app-office/libreoffice-l10n-af
+move app-office/openoffice-l10n-ar app-office/libreoffice-l10n-ar
+move app-office/openoffice-l10n-as app-office/libreoffice-l10n-as
+move app-office/openoffice-l10n-ast app-office/libreoffice-l10n-ast
+move app-office/openoffice-l10n-be_BY app-office/libreoffice-l10n-be_BY
+move app-office/openoffice-l10n-bg app-office/libreoffice-l10n-bg
+move app-office/openoffice-l10n-bn app-office/libreoffice-l10n-bn
+move app-office/openoffice-l10n-br app-office/libreoffice-l10n-br
+move app-office/openoffice-l10n-bs app-office/libreoffice-l10n-bs
+move app-office/openoffice-l10n-ca app-office/libreoffice-l10n-ca
+move app-office/openoffice-l10n-cs app-office/libreoffice-l10n-cs
+move app-office/openoffice-l10n-da app-office/libreoffice-l10n-da
+move app-office/openoffice-l10n-de app-office/libreoffice-l10n-de
+move app-office/openoffice-l10n-dz app-office/libreoffice-l10n-dz
+move app-office/openoffice-l10n-el app-office/libreoffice-l10n-el
+move app-office/openoffice-l10n-en_GB app-office/libreoffice-l10n-en_GB
+move app-office/openoffice-l10n-en_ZA app-office/libreoffice-l10n-en_ZA
+move app-office/openoffice-l10n-eo app-office/libreoffice-l10n-eo
+move app-office/openoffice-l10n-es app-office/libreoffice-l10n-es
+move app-office/openoffice-l10n-et app-office/libreoffice-l10n-et
+move app-office/openoffice-l10n-fi app-office/libreoffice-l10n-fi
+move app-office/openoffice-l10n-fr app-office/libreoffice-l10n-fr
+move app-office/openoffice-l10n-ga app-office/libreoffice-l10n-ga
+move app-office/openoffice-l10n-gl app-office/libreoffice-l10n-gl
+move app-office/openoffice-l10n-gu app-office/libreoffice-l10n-gu
+move app-office/openoffice-l10n-he app-office/libreoffice-l10n-he
+move app-office/openoffice-l10n-hi app-office/libreoffice-l10n-hi
+move app-office/openoffice-l10n-hi_IN app-office/libreoffice-l10n-hi_IN
+move app-office/openoffice-l10n-hr app-office/libreoffice-l10n-hr
+move app-office/openoffice-l10n-hu app-office/libreoffice-l10n-hu
+move app-office/openoffice-l10n-it app-office/libreoffice-l10n-it
+move app-office/openoffice-l10n-ja app-office/libreoffice-l10n-ja
+move app-office/openoffice-l10n-km app-office/libreoffice-l10n-km
+move app-office/openoffice-l10n-ko app-office/libreoffice-l10n-ko
+move app-office/openoffice-l10n-ku app-office/libreoffice-l10n-ku
+move app-office/openoffice-l10n-lt app-office/libreoffice-l10n-lt
+move app-office/openoffice-l10n-lv app-office/libreoffice-l10n-lv
+move app-office/openoffice-l10n-meta app-office/libreoffice-l10n-meta
+move app-office/openoffice-l10n-mk app-office/libreoffice-l10n-mk
+move app-office/openoffice-l10n-ml app-office/libreoffice-l10n-ml
+move app-office/openoffice-l10n-ml_IN app-office/libreoffice-l10n-ml_IN
+move app-office/openoffice-l10n-mr app-office/libreoffice-l10n-mr
+move app-office/openoffice-l10n-mr_IN app-office/libreoffice-l10n-mr_IN
+move app-office/openoffice-l10n-my app-office/libreoffice-l10n-my
+move app-office/openoffice-l10n-nb app-office/libreoffice-l10n-nb
+move app-office/openoffice-l10n-ne app-office/libreoffice-l10n-ne
+move app-office/openoffice-l10n-nl app-office/libreoffice-l10n-nl
+move app-office/openoffice-l10n-nn app-office/libreoffice-l10n-nn
+move app-office/openoffice-l10n-nr app-office/libreoffice-l10n-nr
+move app-office/openoffice-l10n-ns app-office/libreoffice-l10n-ns
+move app-office/openoffice-l10n-oc app-office/libreoffice-l10n-oc
+move app-office/openoffice-l10n-om app-office/libreoffice-l10n-om
+move app-office/openoffice-l10n-or app-office/libreoffice-l10n-or
+move app-office/openoffice-l10n-or_IN app-office/libreoffice-l10n-or_IN
+move app-office/openoffice-l10n-pa_IN app-office/libreoffice-l10n-pa_IN
+move app-office/openoffice-l10n-pl app-office/libreoffice-l10n-pl
+move app-office/openoffice-l10n-pt app-office/libreoffice-l10n-pt
+move app-office/openoffice-l10n-pt_BR app-office/libreoffice-l10n-pt_BR
+move app-office/openoffice-l10n-ro app-office/libreoffice-l10n-ro
+move app-office/openoffice-l10n-ru app-office/libreoffice-l10n-ru
+move app-office/openoffice-l10n-rw app-office/libreoffice-l10n-rw
+move app-office/openoffice-l10n-sh app-office/libreoffice-l10n-sh
+move app-office/openoffice-l10n-si app-office/libreoffice-l10n-si
+move app-office/openoffice-l10n-sk app-office/libreoffice-l10n-sk
+move app-office/openoffice-l10n-sl app-office/libreoffice-l10n-sl
+move app-office/openoffice-l10n-sr app-office/libreoffice-l10n-sr
+move app-office/openoffice-l10n-ss app-office/libreoffice-l10n-ss
+move app-office/openoffice-l10n-st app-office/libreoffice-l10n-st
+move app-office/openoffice-l10n-sv app-office/libreoffice-l10n-sv
+move app-office/openoffice-l10n-sw_TZ app-office/libreoffice-l10n-sw_TZ
+move app-office/openoffice-l10n-ta app-office/libreoffice-l10n-ta
+move app-office/openoffice-l10n-te app-office/libreoffice-l10n-te
+move app-office/openoffice-l10n-te_IN app-office/libreoffice-l10n-te_IN
+move app-office/openoffice-l10n-tg app-office/libreoffice-l10n-tg
+move app-office/openoffice-l10n-th app-office/libreoffice-l10n-th
+move app-office/openoffice-l10n-ti_ER app-office/libreoffice-l10n-ti_ER
+move app-office/openoffice-l10n-tr app-office/libreoffice-l10n-tr
+move app-office/openoffice-l10n-ts app-office/libreoffice-l10n-ts
+move app-office/openoffice-l10n-ug app-office/libreoffice-l10n-ug
+move app-office/openoffice-l10n-uk app-office/libreoffice-l10n-uk
+move app-office/openoffice-l10n-ur_IN app-office/libreoffice-l10n-ur_IN
+move app-office/openoffice-l10n-uz app-office/libreoffice-l10n-uz
+move app-office/openoffice-l10n-ve app-office/libreoffice-l10n-ve
+move app-office/openoffice-l10n-vi app-office/libreoffice-l10n-vi
+move app-office/openoffice-l10n-xh app-office/libreoffice-l10n-xh
+move app-office/openoffice-l10n-zh_CN app-office/libreoffice-l10n-zh_CN
+move app-office/openoffice-l10n-zh_TW app-office/libreoffice-l10n-zh_TW
+move app-office/openoffice-l10n-zu app-office/libreoffice-l10n-zu
+move app-office/libreoffice-bin app-office/libreoffice
diff --git a/conf/intel/repo/kogaionlinux/packages.db.restricted b/conf/intel/repo/kogaionlinux/packages.db.restricted
new file mode 100644
index 0000000..39121c8
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.restricted
@@ -0,0 +1,7 @@
+# Server side packages.db.restricted file
+# List here atoms (either package key or package key : slot) that should be
+# considered legally sensible such as libdvdcss and friends
+
+media-libs/libdvdcss
+media-libs/amd64codecs
+media-libs/win32codecs
diff --git a/conf/intel/repo/kogaionlinux/packages.db.system_mask b/conf/intel/repo/kogaionlinux/packages.db.system_mask
new file mode 100644
index 0000000..e042d93
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.system_mask
@@ -0,0 +1,15 @@
+app-admin/equo
+app-misc/kogaion-version
+dev-db/sqlite
+sys-apps/entropy
+sys-devel/base-gcc:4.8
+sys-libs/db:4.8
+virtual/cron   
+# virtual/linux-binary
+sys-auth/pambase
+
+# glibc cannot be removed, it's part of the system
+# nowadays it's not even a system pkg because
+# virtual/libc wraps it.
+# This makes sure we always block glibc
+sys-libs/glibc
diff --git a/conf/intel/repo/kogaionlinux/packages.db.webservices b/conf/intel/repo/kogaionlinux/packages.db.webservices
new file mode 100644
index 0000000..cc980c7
--- /dev/null
+++ b/conf/intel/repo/kogaionlinux/packages.db.webservices
@@ -0,0 +1 @@
+https://packages.rogentos.ro/service