From ea9c45ba3ea8786f9cbfd30628b08cf20deef296 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 29 Feb 2012 18:27:38 +0100 Subject: [PATCH 01/30] [intel/repo] mask >=dev-lang/python-3.0 due to "dev-lang/python" deps --- conf/intel/repo/sabayon-limbo/packages.db.mask | 9 +++++++-- conf/intel/repo/sabayonlinux.org/packages.db.mask | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/conf/intel/repo/sabayon-limbo/packages.db.mask b/conf/intel/repo/sabayon-limbo/packages.db.mask index 0d63a96..b4893a9 100644 --- a/conf/intel/repo/sabayon-limbo/packages.db.mask +++ b/conf/intel/repo/sabayon-limbo/packages.db.mask @@ -1,2 +1,7 @@ -# Notify OSD must die with GNOME3 -x11-misc/notify-osd +# Mask apache using MPM worker for now +www-servers/apache[threads] + + +# 2012-02-29: mask Python 3, many packages are now +# featuring dependencies like "dev-lang/python" +>=dev-lang/python-3.0 diff --git a/conf/intel/repo/sabayonlinux.org/packages.db.mask b/conf/intel/repo/sabayonlinux.org/packages.db.mask index a18282a..b4893a9 100644 --- a/conf/intel/repo/sabayonlinux.org/packages.db.mask +++ b/conf/intel/repo/sabayonlinux.org/packages.db.mask @@ -1,2 +1,7 @@ # Mask apache using MPM worker for now www-servers/apache[threads] + + +# 2012-02-29: mask Python 3, many packages are now +# featuring dependencies like "dev-lang/python" +>=dev-lang/python-3.0 From 4ada2880ba4ea5730dc22424baf5d31c3f423694 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 29 Feb 2012 21:49:19 +0000 Subject: [PATCH 02/30] [portage] remove sci-libs/hdf5 from temp. masked packages --- conf/intel/portage/package.mask | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/intel/portage/package.mask b/conf/intel/portage/package.mask index b05099f..ff4fed4 100644 --- a/conf/intel/portage/package.mask +++ b/conf/intel/portage/package.mask @@ -10,7 +10,6 @@ sci-biology/mira media-fonts/acroread-asianfonts >dev-lang/erlang-13.2.4 >=app-portage/portpeek-1.9.70 -sci-libs/hdf5 # 2012-02-02 Joost Ruis: Current 3.5.x is RC not want yet >app-office/libreoffice-3.4.5.2 From 685920f662110caf66d0e7e27434ec59d7663b1c Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 29 Feb 2012 21:52:40 +0000 Subject: [PATCH 03/30] [portage] disable cxx and fortran flags on sci-libs/hdf5, they conflict with previous set threads use --- conf/intel/portage/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 21f0164..08147a1 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -767,7 +767,7 @@ dev-games/physfs hog media-libs/svgalib -kernel-helper app-misc/tuxcmd-modules gnome unrar media-sound/cmus mikmod -sci-libs/hdf5 -mpi threads szip +sci-libs/hdf5 -cxx -fortran -mpi threads szip virtual/mpi romio sys-cluster/openmpi romio media-libs/libpng apng From 4b1bde590603694e89ccfde6500503ff19f78cb0 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Thu, 1 Mar 2012 13:56:20 +0000 Subject: [PATCH 04/30] [entropy] add dep_rewrite rule for sci-mathematics/rkward --- conf/noarch/entropy/packages.server.dep_rewrite | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/noarch/entropy/packages.server.dep_rewrite b/conf/noarch/entropy/packages.server.dep_rewrite index 67fe662..b311311 100644 --- a/conf/noarch/entropy/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages.server.dep_rewrite @@ -146,6 +146,7 @@ kde-misc/quickaccess (.*)kde-base/kde-l10n(.*) kde-misc/steamcompanion (.*)kde-base/kde-l10n(.*) kde-misc/serverstatuswidget (.*)kde-base/kde-l10n(.*) media-sound/soundkonverter (.*)kde-base/kde-l10n(.*) +sci-mathematics/rkward (.*)kde-base/kde-l10n(.*) # net-dns/avahi dep rewrites app-crypt/seahorse (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 From da1185affc1403e09116042170a1fe79d5714fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Thu, 1 Mar 2012 16:02:28 +0100 Subject: [PATCH 05/30] [intel/portage] disable -lxde on x11-misc/obconf to fix bug 3066 This flag doesn't seem to be needed with x11-misc/obconf-2.0.3_p20111019. Removing it allows obconf to work, when run from menu, in LXDE and non-LXDE Openbox sessions. --- conf/intel/portage/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 08147a1..8dc587b 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -846,7 +846,7 @@ kde-base/kdepim-runtime -linguas_ar -linguas_ca -linguas_cs -linguas_da -linguas net-im/telepathy-connection-managers -icq -yahoo net-im/empathy gnome app-emulation/winetricks -gtk -x11-misc/obconf lxde +x11-misc/obconf -lxde media-plugins/gst-plugins-meta mms net-ftp/proftpd authfile dev-lang/parrot pcre From ed38fac9f300c363e41e6392c81fca2e7e468a23 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 1 Mar 2012 16:17:22 +0100 Subject: [PATCH 06/30] [armv7l/repo] keyword more stuff --- .../sabayonlinux.org/packages.db.keywords | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords b/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords index 86f315e..03c380d 100644 --- a/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords +++ b/conf/armv7l/repo/sabayonlinux.org/packages.db.keywords @@ -89,12 +89,32 @@ media-video/gnome-video-effects ~arm app-admin/apg ~arm net-im/telepathy-connection-managers ~arm sys-apps/lsb-release ~arm - Date: Thu, 1 Mar 2012 21:54:59 +0000 Subject: [PATCH 07/30] [portage] disable cdr on media-gfx/gthumb to be able to merge this in --- conf/intel/portage/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 8dc587b..4765f8f 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -207,6 +207,7 @@ media-gfx/gimageview mng media-gfx/gimp aalib mng wmf smp media-gfx/gphoto2 aalib media-gfx/greycstoration fftw +media-gfx/gthumb -cdr slideshow media-gfx/imagemagick fftw gs perl media-gfx/k3d 3ds media-gfx/kphotoalbum kipi From 8f8ecf4f8f5333bdb2d294956274e6ade60ed0dc Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Fri, 2 Mar 2012 16:20:57 +0000 Subject: [PATCH 08/30] [portage] enable mysql flag on www-apps/rt --- conf/intel/portage/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 4765f8f..fb1244b 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -424,6 +424,7 @@ sys-libs/db -java virtual/opencl video_cards_nvidia +www-apps/rt mysql www-apps/trac mysql postgres vhosts sqlite www-client/midori sqlite From aee7377070e523afb456a7616823bb35d3c9b8b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sat, 3 Mar 2012 14:47:35 +0100 Subject: [PATCH 09/30] [intel/portage] enable drawing flag on x11-misc/shutter --- conf/intel/portage/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index fb1244b..146a797 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -764,7 +764,7 @@ dev-util/geany-plugins enchant gtkspell kde-base/kdesdk-misc extras dev-java/antlr script app-misc/sphinx mysql -x11-misc/shutter webphoto +x11-misc/shutter drawing webphoto dev-games/physfs hog media-libs/svgalib -kernel-helper app-misc/tuxcmd-modules gnome unrar From 8c10b603b117f74eff01c7744a9e68398cc9cbde Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 4 Mar 2012 17:33:32 +0100 Subject: [PATCH 10/30] [intel/repo] add packages.db.webservice to sabayon-limbo repo (was missing) --- conf/intel/repo/sabayon-limbo/packages.db.webservices | 1 + 1 file changed, 1 insertion(+) create mode 100644 conf/intel/repo/sabayon-limbo/packages.db.webservices diff --git a/conf/intel/repo/sabayon-limbo/packages.db.webservices b/conf/intel/repo/sabayon-limbo/packages.db.webservices new file mode 100644 index 0000000..3059b1e --- /dev/null +++ b/conf/intel/repo/sabayon-limbo/packages.db.webservices @@ -0,0 +1 @@ +https://packages.sabayon.org/service From 8f2ea67d52a1634fcec00e9cc8c6cd6971e860e5 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 4 Mar 2012 18:29:43 +0100 Subject: [PATCH 11/30] [armv7l,intel] move CCACHE_DIR to /var/ccache since /var/tmp is tmpfs --- conf/armv7l/portage/make.conf.hardfp | 1 + conf/armv7l/portage/make.conf.softfp | 1 + conf/intel/portage/make.conf.amd64 | 1 + conf/intel/portage/make.conf.x86 | 1 + 4 files changed, 4 insertions(+) diff --git a/conf/armv7l/portage/make.conf.hardfp b/conf/armv7l/portage/make.conf.hardfp index 8b1e634..ef1e8b4 100644 --- a/conf/armv7l/portage/make.conf.hardfp +++ b/conf/armv7l/portage/make.conf.hardfp @@ -13,6 +13,7 @@ ACCEPT_KEYWORDS="~arm arm" FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug" MAKEOPTS="-j16 -s" CCACHE_SIZE="50G" +CCACHE_DIR="/var/ccache" # Global USE flags USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis" diff --git a/conf/armv7l/portage/make.conf.softfp b/conf/armv7l/portage/make.conf.softfp index e03bbba..69380ab 100644 --- a/conf/armv7l/portage/make.conf.softfp +++ b/conf/armv7l/portage/make.conf.softfp @@ -13,6 +13,7 @@ ACCEPT_KEYWORDS="~arm arm" FEATURES="ccache distcc distcc-pump parallel-fetch protect-owned splitdebug" MAKEOPTS="-j16 -s" CCACHE_SIZE="50G" +CCACHE_DIR="/var/ccache" # Global USE flags USE="alsa cpudetection dbus flac goom joystick mp3 theora threads truetype xvid vorbis vorbis" diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64 index 923523e..650e18e 100644 --- a/conf/intel/portage/make.conf.amd64 +++ b/conf/intel/portage/make.conf.amd64 @@ -13,6 +13,7 @@ MAKEOPTS="-j16 -s" ACCEPT_KEYWORDS="~amd64" FEATURES="ccache parallel-fetch protect-owned splitdebug" CCACHE_SIZE="50G" +CCACHE_DIR="/var/ccache" LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh" diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86 index 89bf294..efceeb0 100644 --- a/conf/intel/portage/make.conf.x86 +++ b/conf/intel/portage/make.conf.x86 @@ -13,6 +13,7 @@ MAKEOPTS="-j16 -s" FEATURES="ccache parallel-fetch protect-owned splitdebug" ACCEPT_KEYWORDS="~x86" CCACHE_SIZE="50G" +CCACHE_DIR="/var/ccache" LINGUAS="en en_US af ar az bg bn br bs ca cs cy da de el en_GB eo es et eu fa fi fr fy ga gl he hi hr hu is it ja kk km ko lt lv mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr sr@Latn ss sv ta tg tr uk uz vi zh_CN zh_TW es_AR es_ES fy_NL ga_IE gu gu_IN nb_NO nn_NO pt_PT sv_SE zh" From e1585797cb40bc2ec75bbbb1e3a0b589165218b5 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 7 Mar 2012 11:19:41 +0000 Subject: [PATCH 12/30] [portage] enable fts use on gnome-extra/zeitgeist-extensions --- conf/intel/portage/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 146a797..4957256 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -170,6 +170,7 @@ gnome-extra/avant-window-navigator-extras gnome gnome-extra/evolution-data-server ldap kerberos gnome-extra/gnome-games -sudoku gnome-extra/libgsf gnome +gnome-extra/zeitgeist-extensions fts kde-base/gwenview kipi semantic-desktop # move kde-base/kde-l10n-meta kde-base/kde-l10n From 81842f377e5d17dc0161843ee32cb1f740f333a3 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 7 Mar 2012 12:27:59 +0000 Subject: [PATCH 13/30] [portage] remove a temp. mask --- conf/intel/portage/package.mask | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/intel/portage/package.mask b/conf/intel/portage/package.mask index ff4fed4..9b2e0f7 100644 --- a/conf/intel/portage/package.mask +++ b/conf/intel/portage/package.mask @@ -5,7 +5,6 @@ app-i18n/anthy-ss app-i18n/atokx2 app-vim/cvscommand app-vim/vcscommand -app-shells/scsh sci-biology/mira media-fonts/acroread-asianfonts >dev-lang/erlang-13.2.4 From 332b6e81fbef8c51b71b4b264f3f446501d7a698 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 7 Mar 2012 14:23:41 +0000 Subject: [PATCH 14/30] [portage] remove E17 -9999 stuf --- conf/intel/portage/package.mask | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/conf/intel/portage/package.mask b/conf/intel/portage/package.mask index 9b2e0f7..edea5fa 100644 --- a/conf/intel/portage/package.mask +++ b/conf/intel/portage/package.mask @@ -236,14 +236,3 @@ gnustep-apps/terminal # 2012-02-15 Joost Ruis: Only use pymol from our overlay since it has depends on python-tk sci-chemistry/pymol::gentoo - -# 2012-02-28 Migrating to versioned E17 ->=dev-libs/embryo-9999 ->=dev-libs/eeze-9999 ->=dev-libs/ecore-9999 ->=dev-libs/e_dbus-9999 ->=dev-libs/eina-9999 ->=media-libs/edje-9999 ->=dev-libs/efreet-9999 ->=media-libs/evas-9999 ->=dev-libs/eet-9999 From 1fbfe2150082f304bfa4282341f4ed3961b7bf19 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Thu, 8 Mar 2012 10:03:48 +0100 Subject: [PATCH 15/30] [net-misc/dropbox] added librsync-bundled, see bug 3118 --- conf/intel/portage/package.use | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 4957256..41e1689 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -336,6 +336,9 @@ net-libs/libpcap -bluetooth net-mail/dbmail sqlite3 net-mail/tpop3d mbox maildir +# See bug 3118 +net-misc/dropbox librsync-bundled + net-misc/aria2 metalink bittorrent xmlrpc # bluetooth use flag is useless net-misc/networkmanager nss -dhclient modemmanager -bluetooth connection-sharing dhcpcd introspection -gnutls wimax From 4817d52110244819d339c293ef4f6912025ab200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sun, 11 Mar 2012 15:52:56 +0100 Subject: [PATCH 16/30] [portage] unmask media-video/imagination (no ~x86) --- conf/intel/portage/package.keywords | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/intel/portage/package.keywords b/conf/intel/portage/package.keywords index 38632a5..7b94b64 100644 --- a/conf/intel/portage/package.keywords +++ b/conf/intel/portage/package.keywords @@ -33,3 +33,6 @@ dev-embedded/avr-libc * ~* -x86 -~x86 -amd64 -~amd64 media-plugins/gst-plugins-assrender ** # ~x86 arch missing media-video/hwdecode-demos ** ~x86 ~amd64 + +# ~x86 arch missing +=media-video/imagination-3* ** From 14bf8bf2b38c7555a17bb2f6ec7719eb8cab3931 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 11 Mar 2012 16:32:32 +0100 Subject: [PATCH 17/30] [conf/*] Disable Graphite and -ftree-vectorize due to x11-libs/qt-* (and maybe others) instabilities --- conf/armv7l/portage/make.conf.hardfp | 3 ++- conf/armv7l/portage/make.conf.softfp | 3 ++- conf/intel/portage/make.conf.amd64 | 5 +++-- conf/intel/portage/make.conf.x86 | 5 +++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/conf/armv7l/portage/make.conf.hardfp b/conf/armv7l/portage/make.conf.hardfp index ef1e8b4..36c2bef 100644 --- a/conf/armv7l/portage/make.conf.hardfp +++ b/conf/armv7l/portage/make.conf.hardfp @@ -1,4 +1,5 @@ -GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" +# Temp disable Graphite due to known x11-libs/qt bugs +# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" FPUABI="-mfloat-abi=hard" CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI} ${GRAPHITE}" diff --git a/conf/armv7l/portage/make.conf.softfp b/conf/armv7l/portage/make.conf.softfp index 69380ab..80d36be 100644 --- a/conf/armv7l/portage/make.conf.softfp +++ b/conf/armv7l/portage/make.conf.softfp @@ -1,4 +1,5 @@ -GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" +# Temp disable Graphite due to known x11-libs/qt-* bugs +# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" FPUABI="-mfloat-abi=softfp" CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 ${FPUABI} ${GRAPHITE}" diff --git a/conf/intel/portage/make.conf.amd64 b/conf/intel/portage/make.conf.amd64 index 650e18e..d4890c0 100644 --- a/conf/intel/portage/make.conf.amd64 +++ b/conf/intel/portage/make.conf.amd64 @@ -2,8 +2,9 @@ # Please consult /etc/make.conf.example for a more detailed example # Compiler stuff -GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" -CFLAGS="-O2 -ftree-vectorize -march=x86-64 -pipe ${GRAPHITE}" +# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" +# Temp disable Graphite and -ftree-vectorize due to x11-libs/qt-* instabilities +CFLAGS="-O2 -march=x86-64 -pipe" # -ftree-vectorize ${GRAPHITE}" CHOST="x86_64-pc-linux-gnu" CXXFLAGS="${CFLAGS}" LDFLAGS="-Wl,-O1 -Wl,--as-needed" diff --git a/conf/intel/portage/make.conf.x86 b/conf/intel/portage/make.conf.x86 index efceeb0..b29cb87 100644 --- a/conf/intel/portage/make.conf.x86 +++ b/conf/intel/portage/make.conf.x86 @@ -2,8 +2,9 @@ # Please consult /etc/make.conf.example for a more detailed example # Compiler stuff -GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" -CFLAGS="-O2 -ftree-vectorize -march=i686 -pipe ${GRAPHITE}" +# GRAPHITE="-floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block" +# Temp disable Graphite and -ftree-vectorize due to x11-libs/qt-* instabilities +CFLAGS="-O2 -march=i686 -pipe" # -ftree-vectorize ${GRAPHITE}" CHOST="i686-pc-linux-gnu" CXXFLAGS="${CFLAGS}" LDFLAGS="-Wl,-O1 -Wl,--as-needed" From 880e17e1f55619214b6499364c56c66211ce0656 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Mon, 12 Mar 2012 09:06:02 +0000 Subject: [PATCH 18/30] [portage] enable both mmx and sse on dev-util/biew --- conf/intel/portage/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 41e1689..7e2664d 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -133,6 +133,7 @@ virtual/mysql embedded dev-tcltk/tclxml expat dev-vcs/bzr bash-completion curl sftp +dev-util/biew mmx sse dev-util/codeblocks contrib dev-util/eclipse-sdk java6 dev-util/glade -gnome From 72710d9c37a00682fd4e839a7035c303c6141988 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Mon, 12 Mar 2012 09:07:32 +0000 Subject: [PATCH 19/30] [portage] AdobeFlash-10.3 license --- conf/intel/portage/package.license | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intel/portage/package.license b/conf/intel/portage/package.license index a753e24..6ea6107 100644 --- a/conf/intel/portage/package.license +++ b/conf/intel/portage/package.license @@ -34,6 +34,6 @@ games-action/heretic2-demo LOKI-EULA net-im/skype skype-eula sci-electronics/eagle cadsoft sci-geosciences/googleearth googleearth -www-plugins/adobe-flash AdobeFlash-10.1 +www-plugins/adobe-flash AdobeFlash-10.3 www-plugins/google-talkplugin google-talkplugin dev-java/oracle-jdk-bin Oracle-BCLA-JavaSE From c29f368ce4bd8b0949fb07141a421e72d1d554ca Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Mon, 12 Mar 2012 17:54:19 +0000 Subject: [PATCH 20/30] [portage] enable bzip2 use on app-crypt/gnupg as requested in bug #3131 --- conf/intel/portage/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 7e2664d..54c71af 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -556,7 +556,7 @@ app-cdr/brasero -css media-tv/mythtv -css # DO NOT FUCKING REMOVE THIS -app-crypt/gnupg static +app-crypt/gnupg static bzip2 # Inflate lighttpd www-servers/lighttpd fastcgi lua memcache xattr From 5079908eed983a2af1e4e9ed5e10d0957b90fc17 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Mon, 12 Mar 2012 18:30:27 +0000 Subject: [PATCH 21/30] [portage] use static-libs on dev-libs/pth, requered for app-crypt/gnupg --- conf/intel/portage/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 54c71af..8080c16 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -101,6 +101,7 @@ dev-libs/gdl gnome # 2010-04-6, trying to disable USE="mono" from gmime dev-libs/gmime -mono dev-libs/libmcs -kde +dev-libs/pth static-libs dev-libs/soprano clucene redland -java dev-libs/xerces-c xqilla icu dev-libs/xmlrpc-c curl From 48f6f87c8b82cb217d847158a0168a71f811de38 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Mon, 12 Mar 2012 22:31:44 +0100 Subject: [PATCH 22/30] [sci-misc/emc] Added simulator USE flag. rtai is no longer among dependencies. --- conf/intel/portage/package.use | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 8080c16..2971f82 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -387,6 +387,9 @@ sci-libs/vtk tk mpi sci-mathematics/maxima latex sci-mathematics/octave fftw curl +# We don't want rtai +sci-misc/emc simulator + sci-visualization/fityk gnuplot wxwindows sci-visualization/gnuplot gd wxwidgets sci-visualization/grace fftw From 92b19bf54f8ce01835baa7b7e2dc09d1c6440527 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Tue, 13 Mar 2012 18:41:41 +0000 Subject: [PATCH 23/30] [entropy] add dep_rewrite rule for media-gfx/kpovmodeler --- conf/noarch/entropy/packages.server.dep_rewrite | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/noarch/entropy/packages.server.dep_rewrite b/conf/noarch/entropy/packages.server.dep_rewrite index b311311..9f0b1d3 100644 --- a/conf/noarch/entropy/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages.server.dep_rewrite @@ -147,6 +147,7 @@ kde-misc/steamcompanion (.*)kde-base/kde-l10n(.*) kde-misc/serverstatuswidget (.*)kde-base/kde-l10n(.*) media-sound/soundkonverter (.*)kde-base/kde-l10n(.*) sci-mathematics/rkward (.*)kde-base/kde-l10n(.*) +media-gfx/kpovmodeler (.*)kde-base/kde-l10n(.*) # net-dns/avahi dep rewrites app-crypt/seahorse (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 From 57451dcdd54621872e7e09826ab0c7708783630d Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Wed, 14 Mar 2012 13:23:30 +0000 Subject: [PATCH 24/30] [entropy] add dep_rewrite for dev-util/kdevelop-php --- conf/noarch/entropy/packages.server.dep_rewrite | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/noarch/entropy/packages.server.dep_rewrite b/conf/noarch/entropy/packages.server.dep_rewrite index 9f0b1d3..b437190 100644 --- a/conf/noarch/entropy/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages.server.dep_rewrite @@ -148,6 +148,7 @@ kde-misc/serverstatuswidget (.*)kde-base/kde-l10n(.*) media-sound/soundkonverter (.*)kde-base/kde-l10n(.*) sci-mathematics/rkward (.*)kde-base/kde-l10n(.*) media-gfx/kpovmodeler (.*)kde-base/kde-l10n(.*) +dev-util/kdevelop-php (.*)kde-base/kde-l10n(.*) # net-dns/avahi dep rewrites app-crypt/seahorse (.*)net-dns/avahi(.*) \1net-dns/avahi-base\2 From 3c87ea20675f4f45e9ff82570ce6fa38088c4140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Wed, 14 Mar 2012 16:07:22 +0100 Subject: [PATCH 25/30] [portage] revert "unmask media-video/imagination (no ~x86)" - added in Portage This reverts commit 4817d52110244819d339c293ef4f6912025ab200. --- conf/intel/portage/package.keywords | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/intel/portage/package.keywords b/conf/intel/portage/package.keywords index 7b94b64..38632a5 100644 --- a/conf/intel/portage/package.keywords +++ b/conf/intel/portage/package.keywords @@ -33,6 +33,3 @@ dev-embedded/avr-libc * ~* -x86 -~x86 -amd64 -~amd64 media-plugins/gst-plugins-assrender ** # ~x86 arch missing media-video/hwdecode-demos ** ~x86 ~amd64 - -# ~x86 arch missing -=media-video/imagination-3* ** From 218d4d8217c82e267503d3933ddbe69441b604c9 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Thu, 15 Mar 2012 08:37:57 +0000 Subject: [PATCH 26/30] [portage] enable iostats on app-admin/conky as requested in bug #3087 --- conf/intel/portage/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 2971f82..517f004 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -2,7 +2,7 @@ app-accessibility/dasher gnome -app-admin/conky audacious hddtemp imlib lua lua-imlib lua-cairo mpd thinkpad -ipv6 +app-admin/conky audacious hddtemp imlib iostats lua lua-imlib lua-cairo mpd thinkpad -ipv6 app-arch/advancecomp mng app-arch/file-roller -nautilus From 28875bc55a8ac4596d6fce383b78a4730488a0c1 Mon Sep 17 00:00:00 2001 From: Danilo Pianini Date: Sat, 17 Mar 2012 17:20:39 +0100 Subject: [PATCH 27/30] [intel/portage] added "java" use flag to app-benchmarks/bootchart (see bug 3138) --- conf/intel/portage/package.use | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/intel/portage/package.use b/conf/intel/portage/package.use index 517f004..0dcef72 100644 --- a/conf/intel/portage/package.use +++ b/conf/intel/portage/package.use @@ -894,3 +894,6 @@ app-misc/recoll -fam inotify # dev-db/mongodb should use V8. Allows to fix bug 3069 dev-db/mongodb v8 + +# See bug 3138 +app-benchmarks/bootchart java From 3ef493dbaaefa3d3d64b8c7c9e45b30094060418 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Mon, 19 Mar 2012 13:57:09 +0000 Subject: [PATCH 28/30] [entropy] add dep_rewrite rule for dev-python/python-poppler-qt4 --- conf/noarch/entropy/packages.server.dep_rewrite | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/noarch/entropy/packages.server.dep_rewrite b/conf/noarch/entropy/packages.server.dep_rewrite index b437190..c222e0d 100644 --- a/conf/noarch/entropy/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages.server.dep_rewrite @@ -43,6 +43,7 @@ dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2 gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2 +dev-python:python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 # Fix enigmail deps, to point to our split pinentry packages x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2 From 0009fbe52d396e4ffddc950bd6d29359aa43623f Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Mon, 19 Mar 2012 14:39:30 +0000 Subject: [PATCH 29/30] [entropy] fix a typo in dep_rewrite --- conf/noarch/entropy/packages.server.dep_rewrite | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/noarch/entropy/packages.server.dep_rewrite b/conf/noarch/entropy/packages.server.dep_rewrite index c222e0d..3591fce 100644 --- a/conf/noarch/entropy/packages.server.dep_rewrite +++ b/conf/noarch/entropy/packages.server.dep_rewrite @@ -43,7 +43,7 @@ dev-tex/pstplus (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-text/kbibtex (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 app-misc/recoll (.*)app-text/poppler(.*) \1app-text/poppler-base\2 gnome-extra/gnome-commander (.*)app-text/poppler(.*) \1app-text/poppler-base\2 -dev-python:python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 +dev-python/python-poppler-qt4 (.*)app-text/poppler(.*)(\[.*\]) \1app-text/poppler-qt4\2 # Fix enigmail deps, to point to our split pinentry packages x11-plugins/enigmail (.*)app-crypt/pinentry(.*)\[gtk\] \1app-crypt/pinentry-gtk2\2 From 960b7cb5147f6726a31dab7e3562c1b77b634e78 Mon Sep 17 00:00:00 2001 From: Joost Ruis Date: Tue, 20 Mar 2012 18:27:54 +0000 Subject: [PATCH 30/30] [portage] unmask libreoffice --- conf/intel/portage/package.mask | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/intel/portage/package.mask b/conf/intel/portage/package.mask index edea5fa..b26741e 100644 --- a/conf/intel/portage/package.mask +++ b/conf/intel/portage/package.mask @@ -10,10 +10,6 @@ media-fonts/acroread-asianfonts >dev-lang/erlang-13.2.4 >=app-portage/portpeek-1.9.70 -# 2012-02-02 Joost Ruis: Current 3.5.x is RC not want yet ->app-office/libreoffice-3.4.5.2 ->app-office/libreoffice-l10n-meta-3.4.5.2 - # Joost Ruis: Bumping this breaks Blender. Impossible to rebuild Blender unless Gentoo bug 384239 is fixed >media-libs/openjpeg-1.3-r3