[gentoo-commits] repo/gentoo:master commit in: games-board/four-in-a-row/

[Pacho Ramos]

commit: a02ca0c85bd7c4f5ee12f72f88cdb37b31c6b185
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  8 08:08:48 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:19:42 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a02ca0c8

games-board/four-in-a-row: Drop old

Package-Manager: portage-2.2.24

 games-board/four-in-a-row/Manifest |  1 -
 .../four-in-a-row/four-in-a-row-3.14.2.ebuild  | 33 --
 2 files changed, 34 deletions(-)

diff --git a/games-board/four-in-a-row/Manifest 
b/games-board/four-in-a-row/Manifest
index 773c4d4..d9f7df2 100644
--- a/games-board/four-in-a-row/Manifest
+++ b/games-board/four-in-a-row/Manifest
@@ -1,2 +1 @@
-DIST four-in-a-row-3.14.2.tar.xz 1964984 SHA256 
32138122d807657b5adb58cf093129587ad1ea057242946acb2168eb797fcb99 SHA512 
f19901d866c16fa961dff174a5393b882bbcf6612b39df5501c3153f8e428e6b934cc5f24d7d8902bb0b2a7c86699e7e42fda3c1d39366a7ef932eb6f768c407
 WHIRLPOOL 
2a3cdd899e6f745c1498197d6542e511715cfd24f517d71920d83ac1f7126181f84460ad9255b847ccdc6f04117c3e118fd7590ec046532b625fb96e6292f3f8
 DIST four-in-a-row-3.16.2.tar.xz 1933500 SHA256 
bf42edfed65c5d9614cdf54dac40d17d3b100b0f56bc047b7812f0bb3564a5ae SHA512 
bbeda27f372e9466e46196141d4784124d2ca92628a459d5959b5463c9be55c305e968eb25376ceaa883252fef96ef7466aa20b87f838806c1a7d9c6c2881c7a
 WHIRLPOOL 
ae4eddd70a1584e3f9a0f194f515beea75356550444b05e0966b230b96f81bf9362083d6f389cb92d06a8a1c0bfa329cfba987b1748c43ac95eb91e892c3292d

diff --git a/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild 
b/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild
deleted file mode 100644
index 61e2271..000
--- a/games-board/four-in-a-row/four-in-a-row-3.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome-games
-
-DESCRIPTION="Make lines of the same color to win"
-HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row";
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-   dev-libs/glib:2
-   >=gnome-base/librsvg-2.32
-   >=media-libs/libcanberra-0.26[gtk3]
-   >=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-   app-text/yelp-tools
-   dev-util/appdata-tools
-   >=dev-util/intltool-0.50
-   virtual/pkgconfig
-"
-
-src_configure() {
-   gnome-games_src_configure APPDATA_VALIDATE=$(type -P true)
-}

[gentoo-commits] proj/gnome: New branch: pacho-gnome-3.18

[Pacho Ramos]

commit: 
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:23:11 2015 +

New branch: pacho-gnome-3.18

[gentoo-commits] proj/gnome:pacho-gnome-3.18 commit in: games-board/four-in-a-row/

[Pacho Ramos]

commit: 289309a6b852d1d33a37edbaade5d2d7fabae7e6
Author: Pacho Ramos  gmail  com>
AuthorDate: Sun Nov  8 08:25:13 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:25:13 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=289309a6

games-board/four-in-a-row: Version bump

Package-Manager: portage-2.2.24
Manifest-Sign-Key: 0x09A5A940A188FBD4

 .../four-in-a-row/four-in-a-row-3.18.2.ebuild  | 29 ++
 1 file changed, 29 insertions(+)

diff --git a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild 
b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
new file mode 100644
index 000..115c3c7
--- /dev/null
+++ b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Make lines of the same color to win"
+HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-libs/glib:2
+   >=gnome-base/librsvg-2.32
+   >=media-libs/libcanberra-0.26[gtk3]
+   >=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+   app-text/yelp-tools
+   dev-libs/appstream-glib
+   >=dev-util/intltool-0.50
+   virtual/pkgconfig
+"

[gentoo-commits] proj/gnome:master commit in: games-board/four-in-a-row/

[Pacho Ramos]

commit: 49296c9f9441a7733b0f3a50577b691ee0d87cae
Author: Pacho Ramos  gmail  com>
AuthorDate: Sun Nov  8 08:27:27 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:27:27 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=49296c9f

games-board/four-in-a-row: Version bump

Package-Manager: portage-2.2.24
Manifest-Sign-Key: 0x09A5A940A188FBD4

 .../four-in-a-row/four-in-a-row-3.18.2.ebuild  | 29 ++
 1 file changed, 29 insertions(+)

diff --git a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild 
b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
new file mode 100644
index 000..115c3c7
--- /dev/null
+++ b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Make lines of the same color to win"
+HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-libs/glib:2
+   >=gnome-base/librsvg-2.32
+   >=media-libs/libcanberra-0.26[gtk3]
+   >=x11-libs/gtk+-3.13.2:3
+"
+DEPEND="${RDEPEND}
+   app-text/yelp-tools
+   dev-libs/appstream-glib
+   >=dev-util/intltool-0.50
+   virtual/pkgconfig
+"

[gentoo-commits] proj/gnome: Branch deleted: pacho-gnome-3.18

[Pacho Ramos]

commit: 
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:28:31 2015 +

Branch deleted: pacho-gnome-3.18

[gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/

[Hans de Graaff]

commit: 0443462fe29c445d704a3b8a59418cf0bdc8f5bd
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Nov  8 08:34:33 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 08:34:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0443462f

net-p2p/gtk-gnutella: cleanup

Package-Manager: portage-2.2.20.1

 net-p2p/gtk-gnutella/Manifest  |  1 -
 net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild | 86 --
 2 files changed, 87 deletions(-)

diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 85b9e2b..aaeed41 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,3 +1,2 @@
 DIST gtk-gnutella-1.1.3.tar.bz2 19504243 SHA256 
2659ddb846f60d13789674e926a71bbb4a8b9d3ca98c6b034a95eaa073531405 SHA512 
df143b6e89b0a4c6e8ddbba24ddcab3603f04e7df1fab7d389241a112c6cd3297e4837dfc0d225289997b99867a5466a5b8697c68ef2bdc5817261fbc103d505
 WHIRLPOOL 
fe1a1375e75204bdf92c9690f1885211dc456c2cc466f4d7e47c865fc0e1c77ce07d27b58ff2e53c4c28214d055878c7d805f0b79043748e1448c6b8ac398c82
-DIST gtk-gnutella-1.1.4.tar.bz2 19546318 SHA256 
6ae259ff9d5f20a2d10dba66ed6cbe5b56552307a6e8bc36df053b70aff4c956 SHA512 
e09fde0e1f8a701e099f91768e032d022f6e9d41cdb4cc7833f1e7ba0e2795bc102c6b835960eb69e577ffc1426c42f6e1682ebadb8c5a643a796f88ff204ac6
 WHIRLPOOL 
a9e63865896444c2ba22e9cf4302f5da5f6bdcec257cc87c618c3c3514cbf924e0eb6df7909b21ad5798650a577adf38cb37806810fd3f6a7f67be5f7a7cc8f1
 DIST gtk-gnutella-1.1.5.tar.bz2 19552392 SHA256 
c332043a885ba302841a261c118264d903627fd21b062c99538db7dc7dada8a5 SHA512 
eb94ef5cbc447ebf75d16eb24f0a4d88197a9b79f842fe73f963af3ba5985cc4ce99605d29e33123754d9a509218b71acc684df27a075c3947278211c1b204e5
 WHIRLPOOL 
c5bc302dd7bd92eac2298c52b557723b473a930a7e1b40cddc74424bef7acf0a9b90f27ba503dc40038c925047dfcf6f80ca8de2f0e20a6429d70267de3ada49

diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild 
b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild
deleted file mode 100644
index 154b509..000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-IUSE="nls dbus ssl +gtk"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/";
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-
-RDEPEND="
-   dev-libs/glib:2
-   sys-libs/zlib
-   gtk? ( >=x11-libs/gtk+-2.2.1:2 )
-   dbus? ( >=sys-apps/dbus-0.35.2 )
-   ssl? ( >=net-libs/gnutls-2.2.5 )
-   nls? ( >=sys-devel/gettext-0.11.5 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   strip-linguas -i po
-
-   echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-   for ling in ${LINGUAS}; do
-   echo $ling >> po/LINGUAS
-   done
-}
-
-src_configure() {
-   # There is no option to turn off optimization through the build.sh
-   # script.
-   sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh 
|| die
-
-   # The build script does not support the equivalent --enable
-   # options so we must construct the configuration by hand.
-
-   local myconf
-
-   if ! use nls; then
-   myconf="${myconf} --disable-nls"
-   fi
-
-   if ! use dbus; then
-   myconf="${myconf} --disable-dbus"
-   fi
-
-   if ! use ssl; then
-   myconf="${myconf} --disable-gnutls"
-   fi
-
-   if use gtk; then
-   myconf="${myconf} --gtk2"
-   else
-   myconf="${myconf} --topless"
-   fi
-
-   ./build.sh \
-   --configure-only \
-   --prefix="/usr" \
-   --cc=$(tc-getCC) \
-   ${myconf}
-}
-
-src_compile() {
-   # Build system is not parallel-safe, bug 500760
-   emake -j1
-}
-
-src_install() {
-   dodir /usr/bin
-   emake INSTALL_PREFIX="${D}" install || die "Install failed"
-   dodoc AUTHORS ChangeLog README TODO
-
-   # Touch the symbols file into the future to avoid warnings from
-   # gtk-gnutella later on, since we will most likely strip the binary.
-   touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" 
|| die
-}

[gentoo-commits] proj/gnome:master commit in: sys-apps/gnome-disk-utility/

[Pacho Ramos]

commit: fba156761ad9144eac25615644f3312f56ca574d
Author: Pacho Ramos  gmail  com>
AuthorDate: Sun Nov  8 08:38:43 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:38:43 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=fba15676

sys-apps/gnome-disk-utility: Version bump

Package-Manager: portage-2.2.24
Manifest-Sign-Key: 0x09A5A940A188FBD4

 .../gnome-disk-utility-3.18.2.ebuild   | 47 ++
 1 file changed, 47 insertions(+)

diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild 
b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild
new file mode 100644
index 000..606a2f1
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility";
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat gnome systemd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+COMMON_DEPEND="
+   >=dev-libs/glib-2.31:2[dbus]
+   >=sys-fs/udisks-2.1.1:2
+   >=x11-libs/gtk+-3.16.0:3
+   >=app-arch/xz-utils-5.0.5
+   >=app-crypt/libsecret-0.7
+   dev-libs/libpwquality
+   systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+   >=media-libs/libdvdread-4.2.0
+   >=media-libs/libcanberra-0.1[gtk3]
+   >=x11-libs/libnotify-0.7:=
+   >=x11-themes/gnome-icon-theme-symbolic-2.91
+   fat? ( sys-fs/dosfstools )
+   gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+DEPEND="${COMMON_DEPEND}
+   >=dev-util/intltool-0.50.2
+   dev-libs/appstream-glib
+   dev-libs/libxslt
+   virtual/pkgconfig
+"
+
+src_configure() {
+   gnome2_src_configure \
+   $(use_enable gnome gsd-plugin) \
+   $(use_enable systemd libsystemd)
+}

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: /

[Michał Górny]

commit: 9efd3bf8f1941073dcc333fa53057bd51aa1de89
Author: Julian Ospald  gentoo  org>
AuthorDate: Sat Nov  7 20:24:36 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov  7 20:24:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9efd3bf8

Merge remote-tracking branch 'github/pr/331'

 net-libs/http-parser/http-parser-2.6.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/, eclass/

[Michał Górny]

commit: 8b5b817be61b8f851e5d37f97615223bf6b07082
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  6 22:41:52 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:41:05 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b5b817b

python-utils-r1.eclass: Obtain library path from the interpreter

Obtain library path as concatenation of LIBDIR and LDLIBRARY config
variables (from sysconfig module) rather than hardcoding it in the
eclass. This improves maintainability and fixes compatibility with
ABIFLAGS-enabled Python 3.3+.

 eclass/python-utils-r1.eclass   | 21 +++--
 eclass/tests/python-utils-r1.sh |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index a0274f6..ec85d8a 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -151,7 +151,8 @@ _python_impl_supported() {
 # The path to Python library.
 #
 # Set and exported on request using python_export().
-# Valid only for CPython.
+# Valid only for CPython. Requires a proper build-time dependency
+# on the Python implementation.
 #
 # Example value:
 # @CODE
@@ -289,20 +290,12 @@ python_export() {
fi
;;
PYTHON_LIBPATH)
-   local libname
-   case "${impl}" in
-   python*)
-   libname=lib${impl}
-   ;;
-   *)
-   die "${impl} lacks a dynamic 
library"
-   ;;
-   esac
-
-   local path=${EPREFIX}/usr/$(get_libdir)
-
-   export 
PYTHON_LIBPATH=${path}/${libname}$(get_libname)
+   export PYTHON_LIBPATH=$("${PYTHON}" -c 'import 
os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), 
sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") 
else "")')
debug-print "${FUNCNAME}: PYTHON_LIBPATH = 
${PYTHON_LIBPATH}"
+
+   if [[ ! ${PYTHON_LIBPATH} ]]; then
+   die "${impl} lacks a (usable) dynamic 
library"
+   fi
;;
PYTHON_CFLAGS)
local val

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index dc6676b..e54550d 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -66,8 +66,8 @@ test_var PYTHON python2_7 /usr/bin/python2.7
 test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
 if [[ -x /usr/bin/python2.7 ]]; then
test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+   test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)"
 fi
-test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
 
@@ -77,8 +77,8 @@ test_var PYTHON_SITEDIR python3_4 
/usr/lib/python3.4/site-packages
 if [[ -x /usr/bin/python3.4 ]]; then
abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; 
print(sysconfig.get_config_var("ABIFLAGS"))')
test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}"
+   test_var PYTHON_LIBPATH python3_4 
"/usr/lib*/libpython3.4${abiflags}$(get_libname)"
 fi
-test_var PYTHON_LIBPATH python3_4 /usr/lib/libpython3.4$(get_libname)
 test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
 test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
 

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/

[Michał Górny]

commit: ea4e80de8b42fe508d870a6dcb1a87fa7f880362
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov  7 09:28:21 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:40:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4e80de

python-utils-r1.eclass: set PYTHON locally in python_export()

Ensure that PYTHON is always set inside python_export() for convenience.
If it wasn't requested for explicit export, make it a local variable.

 eclass/python-utils-r1.eclass | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index a80bdf4..69166cf 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -248,6 +248,12 @@ python_export() {
esac
debug-print "${FUNCNAME}: implementation: ${impl}"
 
+   # make sure it doesn't leave our function unless desired
+   if ! has PYTHON "${@}"; then
+   local PYTHON
+   fi
+   export PYTHON=${EPREFIX}/usr/bin/${impl}
+
for var; do
case "${var}" in
EPYTHON)
@@ -255,7 +261,7 @@ python_export() {
debug-print "${FUNCNAME}: EPYTHON = ${EPYTHON}"
;;
PYTHON)
-   export PYTHON=${EPREFIX}/usr/bin/${impl}
+   # already exported above
debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
;;
PYTHON_SITEDIR)

[gentoo-commits] proj/gnome:master commit in: games-puzzle/gnome-klotski/

[Pacho Ramos]

commit: 4d71574ce913bbd969c41bf865a77f8ab4bd0f47
Author: Pacho Ramos  gmail  com>
AuthorDate: Sun Nov  8 08:41:51 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:41:51 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4d71574c

games-puzzle/gnome-klotski: Version bump

Package-Manager: portage-2.2.24
Manifest-Sign-Key: 0x09A5A940A188FBD4

 .../gnome-klotski/gnome-klotski-3.18.2.ebuild  | 36 ++
 1 file changed, 36 insertions(+)

diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild 
b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
new file mode 100644
index 000..59a0b5b
--- /dev/null
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Slide blocks to solve the puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Klotski";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=gnome-base/librsvg-2.32.0
+   >=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+   $(vala_depend)
+   app-text/yelp-tools
+   dev-libs/appstream-glib
+   >=dev-util/intltool-0.50
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   gnome-games_src_prepare
+   vala_src_prepare
+}

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/, eclass/tests/

[Michał Górny]

commit: d0d5a5a6eefccb6485afdc204707064508311cba
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 08:27:50 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:42:17 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d5a5a6

python-utils-r1.eclass: Support getting PYTHON_CONFIG path

 eclass/python-utils-r1.eclass   | 47 +
 eclass/tests/python-utils-r1.sh |  2 ++
 2 files changed, 49 insertions(+)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e8de6b9..68926ab 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -190,6 +190,20 @@ _python_impl_supported() {
 # -lpython2.7
 # @CODE
 
+# @ECLASS-VARIABLE: PYTHON_CONFIG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Path to the python-config executable.
+#
+# Set and exported on request using python_export().
+# Valid only for CPython. Requires a proper build-time dependency
+# on the Python implementation and on pkg-config.
+#
+# Example value:
+# @CODE
+# /usr/bin/python2.7-config
+# @CODE
+
 # @ECLASS-VARIABLE: PYTHON_PKG_DEP
 # @DEFAULT_UNSET
 # @DESCRIPTION:
@@ -323,6 +337,22 @@ python_export() {
export PYTHON_LIBS=${val}
debug-print "${FUNCNAME}: PYTHON_LIBS = 
${PYTHON_LIBS}"
;;
+   PYTHON_CONFIG)
+   local flags val
+
+   case "${impl}" in
+   python*)
+   flags=$("${PYTHON}" -c 'import 
sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")')
+   val=${PYTHON}${flags}-config
+   ;;
+   *)
+   die "${impl}: obtaining ${var} 
not supported"
+   ;;
+   esac
+
+   export PYTHON_CONFIG=${val}
+   debug-print "${FUNCNAME}: PYTHON_CONFIG = 
${PYTHON_CONFIG}"
+   ;;
PYTHON_PKG_DEP)
local d
case ${impl} in
@@ -443,6 +473,23 @@ python_get_LIBS() {
echo "${PYTHON_LIBS}"
 }
 
+# @FUNCTION: python_get_PYTHON_CONFIG
+# @USAGE: []
+# @DESCRIPTION:
+# Obtain and print the PYTHON_CONFIG location for the given
+# implementation. If no implementation is provided, ${EPYTHON} will be
+# used.
+#
+# Please note that this function can be used with CPython only.
+# It requires Python installed, and therefore proper build-time
+# dependencies need be added to the ebuild.
+python_get_PYTHON_CONFIG() {
+   debug-print-function ${FUNCNAME} "${@}"
+
+   python_export "${@}" PYTHON_CONFIG
+   echo "${PYTHON_CONFIG}"
+}
+
 # @FUNCTION: python_get_scriptdir
 # @USAGE: []
 # @DESCRIPTION:

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 457756d..b683c51 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -67,6 +67,7 @@ if [[ -x /usr/bin/python2.7 ]]; then
test_var PYTHON_SITEDIR python2_7 "/usr/lib*/python2.7/site-packages"
test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)"
+   test_var PYTHON_CONFIG python2_7 /usr/bin/python2.7-config
 fi
 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
@@ -78,6 +79,7 @@ if [[ -x /usr/bin/python3.4 ]]; then
test_var PYTHON_SITEDIR python3_4 "/usr/lib*/python3.4/site-packages"
test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}"
test_var PYTHON_LIBPATH python3_4 
"/usr/lib*/libpython3.4${abiflags}$(get_libname)"
+   test_var PYTHON_CONFIG python3_4 "/usr/bin/python3.4${abiflags}-config"
 fi
 test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
 test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/

[Michał Górny]

commit: dc67356c18e3e5f6fdcbee6e893777e4e953f232
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 08:30:37 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:42:24 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc67356c

python-utils-r1.eclass: Reuse PYTHON_CONFIG in python_wrapper_setup()

 eclass/python-utils-r1.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 68926ab..33cee1b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -877,8 +877,8 @@ python_wrapper_setup() {
rm -f "${workdir}"/bin/2to3 || die
rm -f "${workdir}"/pkgconfig/python{,2,3}.pc || die
 
-   local EPYTHON PYTHON
-   python_export "${impl}" EPYTHON PYTHON
+   local EPYTHON PYTHON PYTHON_CONFIG
+   python_export "${impl}" EPYTHON PYTHON PYTHON_CONFIG
 
local pyver pyother
if python_is_python3; then
@@ -906,7 +906,7 @@ python_wrapper_setup() {
if [[ ${EPYTHON} == python* ]]; then
cat > "${workdir}/bin/python-config" <<-_EOF_
#!/bin/sh
-   exec "${PYTHON}-config" "\${@}"
+   exec "${PYTHON_CONFIG}" "\${@}"
_EOF_
cp "${workdir}/bin/python-config" \
"${workdir}/bin/python${pyver}-config" || die

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/, eclass/

[Michał Górny]

commit: 37f1067316c4059554c6fde35c026e01e1d4d493
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  6 22:21:37 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:40:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f10673

python-utils-r1.eclass: Obtain include directory from the interpreter

Obtain the Python include directory using the distutils.sysconfig module
of the Python interpreter rather than hardcoding values for it. This
makes the code more maintainable, and clears the way for re-enabling
ABIFLAGS on new Python versions.

 eclass/python-utils-r1.eclass   | 21 +++--
 eclass/tests/python-utils-r1.sh | 17 +
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 69166cf..a0274f6 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -138,6 +138,7 @@ _python_impl_supported() {
 # The path to Python include directory.
 #
 # Set and exported on request using python_export().
+# Requires a proper build-time dependency on the Python implementation.
 #
 # Example value:
 # @CODE
@@ -279,21 +280,13 @@ python_export() {
debug-print "${FUNCNAME}: PYTHON_SITEDIR = 
${PYTHON_SITEDIR}"
;;
PYTHON_INCLUDEDIR)
-   local dir
-   case "${impl}" in
-   python*)
-   dir=/usr/include/${impl}
-   ;;
-   pypy|pypy3)
-   
dir=/usr/$(get_libdir)/${impl}/include
-   ;;
-   *)
-   die "${impl} lacks header files"
-   ;;
-   esac
-
-   export PYTHON_INCLUDEDIR=${EPREFIX}${dir}
+   export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 
'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())')
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = 
${PYTHON_INCLUDEDIR}"
+
+   # Jython gives a non-existing directory
+   if [[ ! -d ${PYTHON_INCLUDEDIR} ]]; then
+   die "${impl} does not install any 
header files!"
+   fi
;;
PYTHON_LIBPATH)
local libname

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index bd05e9e..dc6676b 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -64,7 +64,9 @@ inherit python-utils-r1
 test_var EPYTHON python2_7 python2.7
 test_var PYTHON python2_7 /usr/bin/python2.7
 test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
-test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+if [[ -x /usr/bin/python2.7 ]]; then
+   test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+fi
 test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
@@ -72,7 +74,10 @@ test_var PYTHON_SCRIPTDIR python2_7 
/usr/lib/python-exec/python2.7
 test_var EPYTHON python3_4 python3.4
 test_var PYTHON python3_4 /usr/bin/python3.4
 test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages
-test_var PYTHON_INCLUDEDIR python3_4 /usr/include/python3.4
+if [[ -x /usr/bin/python3.4 ]]; then
+   abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; 
print(sysconfig.get_config_var("ABIFLAGS"))')
+   test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}"
+fi
 test_var PYTHON_LIBPATH python3_4 /usr/lib/libpython3.4$(get_libname)
 test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
 test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
@@ -86,14 +91,18 @@ test_var PYTHON_SCRIPTDIR jython2_7 
/usr/lib/python-exec/jython2.7
 test_var EPYTHON pypy pypy
 test_var PYTHON pypy /usr/bin/pypy
 test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
-test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include
+if [[ -x /usr/bin/pypy ]]; then
+   test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include"
+fi
 test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
 test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
 
 test_var EPYTHON pypy3 pypy3
 test_var PYTHON pypy3 /usr/bin/pypy3
 test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages
-test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
+if [[ -x /usr/bin/pypy3 ]]; then
+   test_var PYTHON

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: dev-lang/python/

[Michał Górny]

commit: 6d325f34dd4e9bd2a777d5a5bfb025bd788f38ea
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  6 21:58:01 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:42:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d325f34

dev-lang/python: Re-enable ABIFLAGS on python3.3+

Disable the ABIFLAGS removal that was introduced on python3.2+ for
'aesthetic reasons'. This caused Gentoo Python installations to
unnecessarily diverge from upstream and promote bad development
practices.

 dev-lang/python/python-3.3.5-r3.ebuild | 328 +
 dev-lang/python/python-3.4.3-r3.ebuild | 307 ++
 dev-lang/python/python-3.5.0-r2.ebuild | 313 +++
 3 files changed, 948 insertions(+)

diff --git a/dev-lang/python/python-3.3.5-r3.ebuild 
b/dev-lang/python/python-3.3.5-r3.ebuild
new file mode 100644
index 000..497a255
--- /dev/null
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 
toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="${PV}-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/";
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+   
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
+   mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses 
+readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   >=sys-libs/zlib-1.1.3
+   virtual/libffi
+   virtual/libintl
+   !build? (
+   gdbm? ( sys-libs/gdbm[berkdb] )
+   ncurses? (
+   >=sys-libs/ncurses-5.2
+   readline? ( >=sys-libs/readline-4.1 )
+   )
+   sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   tk? (
+   >=dev-lang/tk-8.0
+   dev-tcltk/blt
+   dev-tcltk/tix
+   )
+   xml? ( >=dev-libs/expat-2.1 )
+   )
+   !!https://bugs.gentoo.org/show_bug.cgi?id=50309
+   if is-flagq -O3; then
+   is-flagq -fstack-protector-all && replace-flags -O3 -O2
+   use hardened && replace-flags -O3 -O2
+   fi
+
+   # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+   tc-export CXX
+   # The configure script fails to use pkg-config correctly.
+   # http://bugs.python.org/issue15506
+   export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+   # Set LDFLAGS so we link modules with -lpython3.2 correctly.
+   # Needed on FreeBSD unless Python 3.2 is already installed.
+   # Please query BSD team before removing this!
+   append-ldflags "-L."
+
+   local dbmliborder
+   if use gdbm; then
+   dbmliborder+="${dbmliborder:+:}gdbm"
+   fi
+
+   BUILD_DIR="${WORKDIR}/${CHOST}"
+   mkdir -p "${BUILD_DIR}" || die
+   cd "${BUILD_DIR}" || die
+
+   ECONF_SOURCE="${S}" OPT="" \
+   econf \
+   --with-fpectl \
+   --enable-shared \
+   $(use_enable ipv6) \
+   $(use_with threads) \
+   --infodir='${prefix}/share/info' \
+   --mandir='${prefix}/share/man' \
+   --with-computed-gotos \
+   --with-dbmliborder="${dbmliborder}" \
+   --with-libc="" \
+   --enable-loadable-sqlite-extensions \
+   --with-system-expat \
+   --with-system-ffi
+
+   if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" 
pyconfig.h; then
+   eerror "configure has detected that the sem_open function is 
broken."
+   eerror "Please ensure that /dev/shm is mounted as a tmpfs with 
mode 1777."
+   die "Broken sem_open function (bug 496328)"
+   fi
+}
+
+src_compile() {
+   # Avoid invoking pgen for cross-compiles.
+   touch Include/graminit.h Python/graminit.c || die
+
+   

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/, eclass/

[Michał Górny]

commit: 1248bd1b81e953ca592ee70b614eb9e5787ea365
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Nov  7 19:30:24 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:41:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1248bd1b

python-utils-r1.eclass: Obtain PYTHON_SITEDIR from the interpreter

Obtain the Python site-packages directory path using
the distutils.sysconfig module, rather than hardcoding it.

 eclass/python-utils-r1.eclass   | 16 +---
 eclass/tests/python-utils-r1.sh | 12 +++-
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index ec85d8a..e8de6b9 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -126,6 +126,7 @@ _python_impl_supported() {
 # The path to Python site-packages directory.
 #
 # Set and exported on request using python_export().
+# Requires a proper build-time dependency on the Python implementation.
 #
 # Example value:
 # @CODE
@@ -267,17 +268,10 @@ python_export() {
debug-print "${FUNCNAME}: PYTHON = ${PYTHON}"
;;
PYTHON_SITEDIR)
-   local dir
-   case "${impl}" in
-   python*|pypy|pypy3)
-   dir=/usr/$(get_libdir)/${impl}
-   ;;
-   jython*)
-   dir=/usr/share/${impl/n/n-}/Lib
-   ;;
-   esac
-
-   export 
PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages
+   # sysconfig can't be used because:
+   # 1) pypy doesn't give site-packages but stdlib
+   # 2) jython gives paths with wrong case
+   export PYTHON_SITEDIR=$("${PYTHON}" -c 'import 
distutils.sysconfig; print(distutils.sysconfig.get_python_lib())')
debug-print "${FUNCNAME}: PYTHON_SITEDIR = 
${PYTHON_SITEDIR}"
;;
PYTHON_INCLUDEDIR)

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e54550d..457756d 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -63,8 +63,8 @@ inherit python-utils-r1
 
 test_var EPYTHON python2_7 python2.7
 test_var PYTHON python2_7 /usr/bin/python2.7
-test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
 if [[ -x /usr/bin/python2.7 ]]; then
+   test_var PYTHON_SITEDIR python2_7 "/usr/lib*/python2.7/site-packages"
test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)"
 fi
@@ -73,9 +73,9 @@ test_var PYTHON_SCRIPTDIR python2_7 
/usr/lib/python-exec/python2.7
 
 test_var EPYTHON python3_4 python3.4
 test_var PYTHON python3_4 /usr/bin/python3.4
-test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages
 if [[ -x /usr/bin/python3.4 ]]; then
abiflags=$(/usr/bin/python3.4 -c 'import sysconfig; 
print(sysconfig.get_config_var("ABIFLAGS"))')
+   test_var PYTHON_SITEDIR python3_4 "/usr/lib*/python3.4/site-packages"
test_var PYTHON_INCLUDEDIR python3_4 "/usr/include/python3.4${abiflags}"
test_var PYTHON_LIBPATH python3_4 
"/usr/lib*/libpython3.4${abiflags}$(get_libname)"
 fi
@@ -84,14 +84,16 @@ test_var PYTHON_SCRIPTDIR python3_4 
/usr/lib/python-exec/python3.4
 
 test_var EPYTHON jython2_7 jython2.7
 test_var PYTHON jython2_7 /usr/bin/jython2.7
-test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
+if [[ -x /usr/bin/jython2.7 ]]; then
+   test_var PYTHON_SITEDIR jython2_7 
/usr/share/jython-2.7/Lib/site-packages
+fi
 test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
 test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
 
 test_var EPYTHON pypy pypy
 test_var PYTHON pypy /usr/bin/pypy
-test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
 if [[ -x /usr/bin/pypy ]]; then
+   test_var PYTHON_SITEDIR pypy "/usr/lib*/pypy/site-packages"
test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include"
 fi
 test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
@@ -99,8 +101,8 @@ test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
 
 test_var EPYTHON pypy3 pypy3
 test_var PYTHON pypy3 /usr/bin/pypy3
-test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages
 if [[ -x /usr/bin/pypy3 ]]; then
+   test_var PYTHON_SITEDIR pypy3 "/usr/lib*/pypy3/site-packages"
test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
 fi
 test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: dev-lang/python/

[Michał Górny]

commit: 4f92f7f6cfdf6a05a2761e97a6cfbd3d14af9dd9
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  6 22:16:25 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:42:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f92f7f6

dev-lang/python: Remove python-config-X.Y compatibility

Remove the python-config-X.Y symlinks that were added as the Gentoo
divergence compatibility.

 ...hon-3.4.3-r3.ebuild => python-2.7.10-r3.ebuild} | 125 ++---
 dev-lang/python/python-3.3.5-r3.ebuild |   3 -
 dev-lang/python/python-3.4.3-r3.ebuild |   3 -
 dev-lang/python/python-3.5.0-r2.ebuild |   3 -
 4 files changed, 82 insertions(+), 52 deletions(-)

diff --git a/dev-lang/python/python-3.4.3-r3.ebuild 
b/dev-lang/python/python-2.7.10-r3.ebuild
similarity index 67%
copy from dev-lang/python/python-3.4.3-r3.ebuild
copy to dev-lang/python/python-2.7.10-r3.ebuild
index 6d1f40f..1fa586e 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -7,18 +7,18 @@ WANT_LIBTOOL="none"
 
 inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 
toolchain-funcs multiprocessing
 
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.3-0"
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="http://www.python.org/";
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz

https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz";
 
 LICENSE="PSF-2"
-SLOT="3.4"
+SLOT="2.7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses 
+readline sqlite +ssl +threads tk wininst +xml"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl 
+ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -26,11 +26,23 @@ IUSE="build elibc_uclibc examples gdbm hardened ipv6 
libressl +ncurses +readline
 # patchset. See bug 447752.
 
 RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
xml? ( >=dev-libs/expat-2.1 )
+   berkdb? ( || (
+   sys-libs/db:5.3
+   sys-libs/db:5.2
+   sys-libs/db:5.1
+   sys-libs/db:5.0
+   sys-libs/db:4.8
+   sys-libs/db:4.7
+   sys-libs/db:4.6
+   sys-libs/db:4.5
+   sys-libs/db:4.4
+   sys-libs/db:4.3
+   sys-libs/db:4.2
+   ) )
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
>=sys-libs/ncurses-5.2
@@ -46,31 +58,49 @@ RDEPEND="app-arch/bzip2
dev-tcltk/blt
dev-tcltk/tix
)
-   !!http://bugs.python.org/issue15506
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
 
-   # Set LDFLAGS so we link modules with -lpython3.2 correctly.
-   # Needed on FreeBSD unless Python 3.2 is already installed.
+   # Set LDFLAGS so we link modules with -lpython2.7 correctly.
+   # Needed on FreeBSD unless Python 2.7 is already installed.
# Please query BSD team before removing this!
append-ldflags "-L."
 
@@ -138,6 +178,9 @@ src_configure() {
if use gdbm; then
dbmliborder+="${dbmliborder:+:}gdbm"
fi
+   if use berkdb; then
+   dbmliborder+="${dbmliborder:+:}bdb"
+   fi
 
BUILD_DIR="${WORKDIR}/${CHOST}"
mkdir -p "${BUILD_DIR}" || die
@@ -149,9 +192,9 @@ src_configure() {
--enable-shared \
$(use_enable ipv6) \
$(use_with threads) \
+   $(use wide-unicode && echo "--enable-unicode=ucs4" || echo 
"--enable-unicode=ucs2") \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
-   --with-computed-gotos \
--with-dbmliborder="${dbmliborder}" \
--with-libc="" \
--enable-loadable-sqlite-extensions \
@@ -168,10 +211,10 @@ src_configure() {
 
 src_compile() {
# Avoid invoking pgen for cross-compiles.
-   touch Include/graminit.h Python/graminit.c || die
+   touch Include/graminit.h Python/graminit.c
 
cd "${BUILD_DIR}" || die
-   emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
+   emake
 
# Work around bug 329499. See also bug 413751 and 457194.
if has_version dev-libs/libffi[pax_kernel]; then
@@ -191,15 +234,15 @@ src_test() {
cd "${BUILD_DIR}" || die
 
# Skip faili

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/

[Michał Górny]

commit: ef8fdec4d6e6b81881a1c7fb1a6687e2b0ae8bd0
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 08:37:04 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 08:40:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8fdec4

python-utils-r1.eclass: Switch tests to use python3.4

Use Python 3.4 during tests since Python 3.3 is now deprecated and is
less likely to be installed on user's systems and some tests will
require Python installed.

 eclass/tests/python-utils-r1.sh | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e49636a..bd05e9e 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -69,13 +69,13 @@ test_var PYTHON_LIBPATH python2_7 
/usr/lib/libpython2.7$(get_libname)
 test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
 test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
 
-test_var EPYTHON python3_3 python3.3
-test_var PYTHON python3_3 /usr/bin/python3.3
-test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages
-test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3
-test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname)
-test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
-test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
+test_var EPYTHON python3_4 python3.4
+test_var PYTHON python3_4 /usr/bin/python3.4
+test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages
+test_var PYTHON_INCLUDEDIR python3_4 /usr/include/python3.4
+test_var PYTHON_LIBPATH python3_4 /usr/lib/libpython3.4$(get_libname)
+test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
+test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
 
 test_var EPYTHON jython2_7 jython2.7
 test_var PYTHON jython2_7 /usr/bin/jython2.7

[gentoo-commits] proj/gnome:master commit in: games-arcade/gnome-robots/

[Pacho Ramos]

commit: 6a867b213339941bafd2250baf56c3b1d26dd637
Author: Pacho Ramos  gmail  com>
AuthorDate: Sun Nov  8 08:45:04 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:45:04 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6a867b21

games-arcade/gnome-robots: Version bump

Package-Manager: portage-2.2.24
Manifest-Sign-Key: 0x09A5A940A188FBD4

 .../gnome-robots/gnome-robots-3.18.1.ebuild| 30 ++
 1 file changed, 30 insertions(+)

diff --git a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild 
b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
new file mode 100644
index 000..4531af9
--- /dev/null
+++ b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome-games
+
+DESCRIPTION="Avoid the robots and make them crash into each other"
+HOMEPAGE="https://wiki.gnome.org/Apps/Robots";
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/glib-2.32:2
+   >=gnome-base/librsvg-2.36.2:2
+   >=media-libs/libcanberra-0.26[gtk3]
+   >=x11-libs/gtk+-3.15:3
+"
+DEPEND="${RDEPEND}
+   app-text/yelp-tools
+   dev-libs/appstream-glib
+   >=dev-util/intltool-0.50
+   sys-devel/gettext
+   virtual/pkgconfig
+"

[gentoo-commits] proj/gnome:master commit in: games-puzzle/gnome-sudoku/

[Pacho Ramos]

commit: cbe73021b850055b3fe42138e3e2841fac391631
Author: Pacho Ramos  gmail  com>
AuthorDate: Sun Nov  8 08:51:39 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 08:51:39 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cbe73021

games-puzzle/gnome-sudoku: Version bump

Package-Manager: portage-2.2.24
Manifest-Sign-Key: 0x09A5A940A188FBD4

 .../gnome-sudoku/gnome-sudoku-3.18.2.ebuild| 41 ++
 1 file changed, 41 insertions(+)

diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild 
b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
new file mode 100644
index 000..a508e90
--- /dev/null
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome-games vala
+
+DESCRIPTION="Test your logic skills in this number grid puzzle"
+HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku";
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# fixed vala & gtk+ from gnome-3.16 branch
+RDEPEND="
+   >=dev-libs/glib-2.40:2
+   dev-libs/libgee:0.8[introspection]
+   dev-libs/json-glib
+   >=dev-libs/qqwing-1.3.4
+   x11-libs/gdk-pixbuf:2[introspection]
+   >=x11-libs/gtk+-3.15:3[introspection]
+   x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+   $(vala_depend)
+   app-text/yelp-tools
+   dev-libs/appstream-glib
+   >=dev-util/intltool-0.50
+   sys-devel/gettext
+   virtual/pkgconfig
+"
+
+src_prepare() {
+   vala_src_prepare
+   gnome-games_src_prepare
+}

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: dev-libs/libpeas/

[Michał Górny]

commit: 4ce11412abd6c1b1cb7d39aa9234756634d275aa
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 08:44:45 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 09:04:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ce11412

dev-libs/libpeas: Obtain correct python-config path

Use new python_get_PYTHON_CONFIG API to obtain the correct path to
python-config executable. This forward-fixes compatibility with
ABIFLAGS-enabled Python 3.* versions, and improves readability.

 dev-libs/libpeas/libpeas-1.12.1-r1.ebuild | 2 +-
 dev-libs/libpeas/libpeas-1.14.0-r1.ebuild | 2 +-
 dev-libs/libpeas/libpeas-1.14.0.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild 
b/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild
index 0ed2fe5..96946d1 100644
--- a/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.12.1-r1.ebuild
@@ -55,7 +55,7 @@ src_configure() {
"--enable-python${v}"
# it is just 'PYTHON' for py3 in the build system
"PYTHON${v#3}=${PYTHON}"
-   "PYTHON${v}_CONFIG=${PYTHON}-config"
+   "PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
)
}
use python && python_foreach_impl python_configure

diff --git a/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild 
b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
index 3a1d0ad..35d2980 100644
--- a/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0-r1.ebuild
@@ -77,7 +77,7 @@ src_configure() {
"--enable-python${v}"
# it is just 'PYTHON' for py3 in the build system
"PYTHON${v#3}=${PYTHON}"
-   "PYTHON${v}_CONFIG=${PYTHON}-config"
+   "PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
)
}
use python && python_foreach_impl python_configure

diff --git a/dev-libs/libpeas/libpeas-1.14.0.ebuild 
b/dev-libs/libpeas/libpeas-1.14.0.ebuild
index fb6958d..57c26f7 100644
--- a/dev-libs/libpeas/libpeas-1.14.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.14.0.ebuild
@@ -65,7 +65,7 @@ src_configure() {
"--enable-python${v}"
# it is just 'PYTHON' for py3 in the build system
"PYTHON${v#3}=${PYTHON}"
-   "PYTHON${v}_CONFIG=${PYTHON}-config"
+   "PYTHON${v}_CONFIG=$(python_get_PYTHON_CONFIG)"
)
}
use python && python_foreach_impl python_configure

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: dev-lang/python/

[Michał Górny]

commit: a24df71ed8dcee69171470d84ca048aeb834303b
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  6 21:58:01 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 09:05:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a24df71e

dev-lang/python: Re-enable ABIFLAGS on python3.3+

Disable the ABIFLAGS removal that was introduced on python3.2+ for
'aesthetic reasons'. This caused Gentoo Python installations to
unnecessarily diverge from upstream and promote bad development
practices.

 dev-lang/python/python-3.3.5-r3.ebuild | 328 +
 dev-lang/python/python-3.4.3-r3.ebuild | 307 ++
 dev-lang/python/python-3.5.0-r2.ebuild | 313 +++
 3 files changed, 948 insertions(+)

diff --git a/dev-lang/python/python-3.3.5-r3.ebuild 
b/dev-lang/python/python-3.3.5-r3.ebuild
new file mode 100644
index 000..497a255
--- /dev/null
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+WANT_AUTOMAKE="none"
+WANT_LIBTOOL="none"
+
+inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 
toolchain-funcs multiprocessing
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="${PV}-0"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="http://www.python.org/";
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+   
https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz
+   mirror://gentoo/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses 
+readline sqlite +ssl +threads tk wininst +xml"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2
+   app-arch/xz-utils
+   >=sys-libs/zlib-1.1.3
+   virtual/libffi
+   virtual/libintl
+   !build? (
+   gdbm? ( sys-libs/gdbm[berkdb] )
+   ncurses? (
+   >=sys-libs/ncurses-5.2
+   readline? ( >=sys-libs/readline-4.1 )
+   )
+   sqlite? ( >=dev-db/sqlite-3.3.8:3 )
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   tk? (
+   >=dev-lang/tk-8.0
+   dev-tcltk/blt
+   dev-tcltk/tix
+   )
+   xml? ( >=dev-libs/expat-2.1 )
+   )
+   !!https://bugs.gentoo.org/show_bug.cgi?id=50309
+   if is-flagq -O3; then
+   is-flagq -fstack-protector-all && replace-flags -O3 -O2
+   use hardened && replace-flags -O3 -O2
+   fi
+
+   # Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+   tc-export CXX
+   # The configure script fails to use pkg-config correctly.
+   # http://bugs.python.org/issue15506
+   export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
+
+   # Set LDFLAGS so we link modules with -lpython3.2 correctly.
+   # Needed on FreeBSD unless Python 3.2 is already installed.
+   # Please query BSD team before removing this!
+   append-ldflags "-L."
+
+   local dbmliborder
+   if use gdbm; then
+   dbmliborder+="${dbmliborder:+:}gdbm"
+   fi
+
+   BUILD_DIR="${WORKDIR}/${CHOST}"
+   mkdir -p "${BUILD_DIR}" || die
+   cd "${BUILD_DIR}" || die
+
+   ECONF_SOURCE="${S}" OPT="" \
+   econf \
+   --with-fpectl \
+   --enable-shared \
+   $(use_enable ipv6) \
+   $(use_with threads) \
+   --infodir='${prefix}/share/info' \
+   --mandir='${prefix}/share/man' \
+   --with-computed-gotos \
+   --with-dbmliborder="${dbmliborder}" \
+   --with-libc="" \
+   --enable-loadable-sqlite-extensions \
+   --with-system-expat \
+   --with-system-ffi
+
+   if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" 
pyconfig.h; then
+   eerror "configure has detected that the sem_open function is 
broken."
+   eerror "Please ensure that /dev/shm is mounted as a tmpfs with 
mode 1777."
+   die "Broken sem_open function (bug 496328)"
+   fi
+}
+
+src_compile() {
+   # Avoid invoking pgen for cross-compiles.
+   touch Include/graminit.h Python/graminit.c || die
+
+   

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: dev-lang/python/

[Michał Górny]

commit: f798fe09136d1d8248d6791cc60965c10a4e373d
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Nov  6 22:16:25 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 09:05:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f798fe09

dev-lang/python: Remove python-config-X.Y compatibility

Remove the python-config-X.Y symlinks that were added as the Gentoo
divergence compatibility.

 ...hon-3.4.3-r3.ebuild => python-2.7.10-r3.ebuild} | 125 ++---
 dev-lang/python/python-3.3.5-r3.ebuild |   3 -
 dev-lang/python/python-3.4.3-r3.ebuild |   3 -
 dev-lang/python/python-3.5.0-r2.ebuild |   3 -
 4 files changed, 82 insertions(+), 52 deletions(-)

diff --git a/dev-lang/python/python-3.4.3-r3.ebuild 
b/dev-lang/python/python-2.7.10-r3.ebuild
similarity index 67%
copy from dev-lang/python/python-3.4.3-r3.ebuild
copy to dev-lang/python/python-2.7.10-r3.ebuild
index 6d1f40f..1fa586e 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-2.7.10-r3.ebuild
@@ -7,18 +7,18 @@ WANT_LIBTOOL="none"
 
 inherit autotools eutils flag-o-matic multilib pax-utils python-utils-r1 
toolchain-funcs multiprocessing
 
-MY_P="Python-${PV/_/}"
-PATCHSET_VERSION="3.4.3-0"
+MY_P="Python-${PV}"
+PATCHSET_VERSION="2.7.10-0"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="http://www.python.org/";
-SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
+SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz

https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz";
 
 LICENSE="PSF-2"
-SLOT="3.4"
+SLOT="2.7"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses 
+readline sqlite +ssl +threads tk wininst +xml"
+IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl 
+ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -26,11 +26,23 @@ IUSE="build elibc_uclibc examples gdbm hardened ipv6 
libressl +ncurses +readline
 # patchset. See bug 447752.
 
 RDEPEND="app-arch/bzip2
-   app-arch/xz-utils
>=sys-libs/zlib-1.1.3
virtual/libffi
virtual/libintl
xml? ( >=dev-libs/expat-2.1 )
+   berkdb? ( || (
+   sys-libs/db:5.3
+   sys-libs/db:5.2
+   sys-libs/db:5.1
+   sys-libs/db:5.0
+   sys-libs/db:4.8
+   sys-libs/db:4.7
+   sys-libs/db:4.6
+   sys-libs/db:4.5
+   sys-libs/db:4.4
+   sys-libs/db:4.3
+   sys-libs/db:4.2
+   ) )
gdbm? ( sys-libs/gdbm[berkdb] )
ncurses? (
>=sys-libs/ncurses-5.2
@@ -46,31 +58,49 @@ RDEPEND="app-arch/bzip2
dev-tcltk/blt
dev-tcltk/tix
)
-   !!http://bugs.python.org/issue15506
export ac_cv_path_PKG_CONFIG=$(tc-getPKG_CONFIG)
 
-   # Set LDFLAGS so we link modules with -lpython3.2 correctly.
-   # Needed on FreeBSD unless Python 3.2 is already installed.
+   # Set LDFLAGS so we link modules with -lpython2.7 correctly.
+   # Needed on FreeBSD unless Python 2.7 is already installed.
# Please query BSD team before removing this!
append-ldflags "-L."
 
@@ -138,6 +178,9 @@ src_configure() {
if use gdbm; then
dbmliborder+="${dbmliborder:+:}gdbm"
fi
+   if use berkdb; then
+   dbmliborder+="${dbmliborder:+:}bdb"
+   fi
 
BUILD_DIR="${WORKDIR}/${CHOST}"
mkdir -p "${BUILD_DIR}" || die
@@ -149,9 +192,9 @@ src_configure() {
--enable-shared \
$(use_enable ipv6) \
$(use_with threads) \
+   $(use wide-unicode && echo "--enable-unicode=ucs4" || echo 
"--enable-unicode=ucs2") \
--infodir='${prefix}/share/info' \
--mandir='${prefix}/share/man' \
-   --with-computed-gotos \
--with-dbmliborder="${dbmliborder}" \
--with-libc="" \
--enable-loadable-sqlite-extensions \
@@ -168,10 +211,10 @@ src_configure() {
 
 src_compile() {
# Avoid invoking pgen for cross-compiles.
-   touch Include/graminit.h Python/graminit.c || die
+   touch Include/graminit.h Python/graminit.c
 
cd "${BUILD_DIR}" || die
-   emake CPPFLAGS="" CFLAGS="" LDFLAGS=""
+   emake
 
# Work around bug 329499. See also bug 413751 and 457194.
if has_version dev-libs/libffi[pax_kernel]; then
@@ -191,15 +234,15 @@ src_test() {
cd "${BUILD_DIR}" || die
 
# Skip faili

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: gnome-extra/gnome-builder/

[Michał Górny]

commit: d94d9604952592880da6eaad4307de69065f04d9
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 09:01:57 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 09:04:57 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94d9604

gnome-extra/gnome-builder: Obtain python-config path from the eclass

Use the new python_get_PYTHON_CONFIG API to obtain the path to
python-config rather than hardcoding it as ${PYTHON}-config. This
forward-fixes compatibility with ABIFLAGS-enabled Python 3.*.

 gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild 
b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
index f6e2674..8fd9e13 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
@@ -49,7 +49,7 @@ src_configure() {
gnome2_src_configure \
--disable-static \
$(use_enable introspection) \
-   PYTHON3_CONFIG=${PYTHON}-config
+   PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
 }
 
 src_test() {

[gentoo-commits] dev/mrueg:master commit in: app-editors/sublime-text/

[Manuel Rüger]

commit: a257c8ca753d2aa32fc65c96fc0b4196885d9e7c
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 09:33:18 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 09:33:18 2015 +
URL:https://gitweb.gentoo.org/dev/mrueg.git/commit/?id=a257c8ca

app-editors/sublime-text: Drop python eclass

Package-Manager: portage-2.2.24

 app-editors/sublime-text/sublime-text-3_beta3083.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-editors/sublime-text/sublime-text-3_beta3083.ebuild 
b/app-editors/sublime-text/sublime-text-3_beta3083.ebuild
index 35dbbd3..36634d2 100644
--- a/app-editors/sublime-text/sublime-text-3_beta3083.ebuild
+++ b/app-editors/sublime-text/sublime-text-3_beta3083.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT="python3_3"
 
-inherit eutils python-r1
+inherit eutils
 
 MY_PN=${PN/-/_}
 MY_P=${MY_PN}_${PV/beta/build_}

[gentoo-commits] dev/graaff:master commit in: dev-util/git-pivotal/

[Hans de Graaff]

commit: 8c41e510755819846f3751eef215c9eaa29222cf
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 09:16:15 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 09:16:15 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=8c41e510

No longer using this, outdated ebuild.

 dev-util/git-pivotal/ChangeLog| 10 ---
 dev-util/git-pivotal/Manifest | 14 --
 dev-util/git-pivotal/git-pivotal-0.8.0.ebuild | 39 ---
 dev-util/git-pivotal/metadata.xml |  6 -
 4 files changed, 69 deletions(-)

diff --git a/dev-util/git-pivotal/ChangeLog b/dev-util/git-pivotal/ChangeLog
deleted file mode 100644
index 3825cc1..000
--- a/dev-util/git-pivotal/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog for dev-util/git-pivotal
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*git-pivotal-0.8.0 (19 Jul 2011)
-
-  19 Jul 2011; Hans de Graaff  +git-pivotal-0.8.0.ebuild,
-  +metadata.xml:
-  Initial import.
-

diff --git a/dev-util/git-pivotal/Manifest b/dev-util/git-pivotal/Manifest
deleted file mode 100644
index cee236a..000
--- a/dev-util/git-pivotal/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
--BEGIN PGP SIGNED MESSAGE-
-Hash: SHA256
-
-DIST git-pivotal-0.8.0.gem 21504 RMD160 
6e74231605caed913b444babc0c694f9d9f4559e SHA1 
e2cbea1e733391ee4fff49939a26e5199578e792 SHA256 
71ef88de9551ba7907f9c95b7a9391758e1e2a5f034e2a93f22c2165258de52b
-EBUILD git-pivotal-0.8.0.ebuild 1009 RMD160 
15a308688ed63ff0694ea0cd5c657e2ceba37f7f SHA1 
acd3aec4ff2ffd2ccfac6438802d925dc955174e SHA256 
21632683272289f0be8875efd0b0039bd5edf50bf53852308ed47387035a25fc
-MISC ChangeLog 268 RMD160 7c2ee1cd587fcf4904c6316d845c268068d3a4bd SHA1 
d31a9f1a04858afddbaec34fc655443b48258e67 SHA256 
0473b37793bb9a1ea155457b0935c3c70b2f442659e3d112b21a17893cf1fbb5
-MISC metadata.xml 215 RMD160 682b22c57f2f17c789b244e2bb32fe15ca3fa332 SHA1 
ccf017e39c3f44ac4b557da94f91096555cb1be2 SHA256 
c058515dd6264789274b580e999ce4fbbb5c53c36a452bf7b32fd227980abcf8
--BEGIN PGP SIGNATURE-
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk4lRdEACgkQiIP6VqMIqNcc1gD9FEELiYTHiMBOpYnbRzhEToaf
-mJ3yoDXZJEqpRTePC6gA/iKW/ahM0/jLHw5R+pKuDkmv/6ZnadkqrILkQ1KwSH/E
-=WhPs
--END PGP SIGNATURE-

diff --git a/dev-util/git-pivotal/git-pivotal-0.8.0.ebuild 
b/dev-util/git-pivotal/git-pivotal-0.8.0.ebuild
deleted file mode 100644
index 415c8f5..000
--- a/dev-util/git-pivotal/git-pivotal-0.8.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-USE_RUBY="ruby18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_TASK_TEST="spec features"
-
-RUBY_FAKEGEM_EXTRADOC="readme.markdown"
-
-RUBY_FAKEGEM_GEMSPEC="git-pivotal.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The Git Pivotal utility provides three tools to integrate with 
your Pivotal Tracker project."
-HOMEPAGE="http://www.pivotaltracker.com/";
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-# Specs and features both fail, not clear why.
-RESTRICT="test"
-
-ruby_add_rdepend "dev-ruby/builder >=dev-ruby/pivotal-tracker-0.3.1"
-
-#ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.5.0:2 >=dev-util/cucumber-0.9.2 
>=dev-util/aruba-0.2.3 )"
-
-all_ruby_prepare() {
-   # We don't need coverage data and ree18 doesn't have rcov yet.
-   sed -i -e 's/t.rcov = true/t.rcov = false/' Rakefile || die
-
-   # Tweak dependencies to allow newer versions.
-   sed -i -e 's/~> 0.3.1/>= 0.3.1/' git-pivotal.gemspec
-}

diff --git a/dev-util/git-pivotal/metadata.xml 
b/dev-util/git-pivotal/metadata.xml
deleted file mode 100644
index 9bf681c..000
--- a/dev-util/git-pivotal/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-
-gra...@gentoo.org
-

[gentoo-commits] dev/graaff:master commit in: dev-ruby/get_process_mem/

[Hans de Graaff]

commit: 10f73c22867a9eeca3c497e66bc5cca0c1be84d1
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 09:37:04 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 09:37:04 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=10f73c22

dev-ruby/get_process_mem: initial import of 0.2.0

Package-Manager: portage-2.2.20.1

 dev-ruby/get_process_mem/Manifest  |  1 +
 .../get_process_mem/get_process_mem-0.2.0.ebuild   | 23 ++
 dev-ruby/get_process_mem/metadata.xml  |  5 +
 3 files changed, 29 insertions(+)

diff --git a/dev-ruby/get_process_mem/Manifest 
b/dev-ruby/get_process_mem/Manifest
new file mode 100644
index 000..9689ae5
--- /dev/null
+++ b/dev-ruby/get_process_mem/Manifest
@@ -0,0 +1 @@
+DIST get_process_mem-0.2.0.gem 9216 SHA256 
49c803f32b90d7dba27cae7bc6d7af18c9f76216fb4390ad50faadbbcc3eae08 SHA512 
eab51902ff7200c5b3ea06cfe3405c52ff148a2c6f45869fa33ff89535f1c335b61ff1ab9e5653b661a3e02acab385335ad14446ff67772b2fe217e7c7c46bad
 WHIRLPOOL 
1c0e22cbdb68a72ca0e0273bbd5089b1dabc193dbec02db37df1ebf3b9282c1d29b99d2ea8c4b41ec99a4c2b3b005d7c90452b80eeea625da5a0059745b3dcb9

diff --git a/dev-ruby/get_process_mem/get_process_mem-0.2.0.ebuild 
b/dev-ruby/get_process_mem/get_process_mem-0.2.0.ebuild
new file mode 100644
index 000..9315972
--- /dev/null
+++ b/dev-ruby/get_process_mem/get_process_mem-0.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Get memory usage of a process in Ruby"
+HOMEPAGE="https://github.com/schneems/get_process_mem";
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+   sed -i -e '/bundler/I s:^:#:' test/test_helper.rb || die
+}

diff --git a/dev-ruby/get_process_mem/metadata.xml 
b/dev-ruby/get_process_mem/metadata.xml
new file mode 100644
index 000..0040b11
--- /dev/null
+++ b/dev-ruby/get_process_mem/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   ruby
+

[gentoo-commits] dev/graaff:master commit in: dev-ruby/heapy/

[Hans de Graaff]

commit: 94113868cc2abac87a28bd6bdb8889b45119ce3e
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 09:27:14 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 09:27:14 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=94113868

dev-ruby/heapy: initial import of 0.1.1

Package-Manager: portage-2.2.20.1

 dev-ruby/heapy/Manifest   |  1 +
 dev-ruby/heapy/heapy-0.1.1.ebuild | 22 ++
 dev-ruby/heapy/metadata.xml   |  5 +
 3 files changed, 28 insertions(+)

diff --git a/dev-ruby/heapy/Manifest b/dev-ruby/heapy/Manifest
new file mode 100644
index 000..6776c6e
--- /dev/null
+++ b/dev-ruby/heapy/Manifest
@@ -0,0 +1 @@
+DIST heapy-0.1.1.tar.gz 5152197 SHA256 
89a877454a9fa1a4fd7a98b2d379981c2eba72f99b8cbe86b7c4aa8507099fc1 SHA512 
510216f296208baf8655ff2a110bacf75c0ebdd51e765f6cbeda7ae65facdc20254de6eb4f0b6f31c6d976eaed2c0aa1e4a4447ffcc0c4191524d013cc160173
 WHIRLPOOL 
c9d818f5b021d1aca57703836fa6632e296f88e637463b478fcc6f0cbbaa75ad7ec88c685b8eae5653febf158ef1c1245a0981f48777b276a90f07abb528e69b

diff --git a/dev-ruby/heapy/heapy-0.1.1.ebuild 
b/dev-ruby/heapy/heapy-0.1.1.ebuild
new file mode 100644
index 000..0fbf856
--- /dev/null
+++ b/dev-ruby/heapy/heapy-0.1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Got a heap dump? Great. Use this tool to see what's in it!"
+HOMEPAGE="https://github.com/schneems/heapy";
+SRC_URI="https://github.com/schneems/heapy/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""

diff --git a/dev-ruby/heapy/metadata.xml b/dev-ruby/heapy/metadata.xml
new file mode 100644
index 000..0040b11
--- /dev/null
+++ b/dev-ruby/heapy/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   ruby
+

[gentoo-commits] dev/graaff:master commit in: dev-ruby/memory_profiler/

[Hans de Graaff]

commit: c8d0274d1958d1c1cfafbbb39b11bbb0ed4a46b1
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 09:33:06 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 09:33:06 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=c8d0274d

dev-ruby/memory_profiler: initial import of 0.9.6.

Package-Manager: portage-2.2.20.1

 dev-ruby/memory_profiler/Manifest|  1 +
 .../memory_profiler/memory_profiler-0.9.6.ebuild | 20 
 dev-ruby/memory_profiler/metadata.xml|  5 +
 3 files changed, 26 insertions(+)

diff --git a/dev-ruby/memory_profiler/Manifest 
b/dev-ruby/memory_profiler/Manifest
new file mode 100644
index 000..cefb770
--- /dev/null
+++ b/dev-ruby/memory_profiler/Manifest
@@ -0,0 +1 @@
+DIST memory_profiler-0.9.6.tar.gz 10510 SHA256 
57e6f5f63368aac606edba8880fcf22f281db1bdad88f32d288587481ab827af SHA512 
c96e9539ef2b800cf74fe8ea7f137a85a58d45dc701014c8221333ae143239a348f3060b5b47eccbf9528dda17395dbc50c9402cc08e582e4ddb8dc2f4d3e685
 WHIRLPOOL 
7fb7f69624dbee08e996f9de06a712621a245ac7a4b3d2757d8aea1f8b017581c8d149ebd7657a0164b7b95d34f95889f061a0c95b5520640845af9892977eab

diff --git a/dev-ruby/memory_profiler/memory_profiler-0.9.6.ebuild 
b/dev-ruby/memory_profiler/memory_profiler-0.9.6.ebuild
new file mode 100644
index 000..df9692d
--- /dev/null
+++ b/dev-ruby/memory_profiler/memory_profiler-0.9.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Memory profiling routines for Ruby 2.1+"
+HOMEPAGE="https://github.com/SamSaffron/memory_profiler";
+SRC_URI="https://github.com/SamSaffron/memory_profiler/archive/v${PV}.tar.gz 
-> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""

diff --git a/dev-ruby/memory_profiler/metadata.xml 
b/dev-ruby/memory_profiler/metadata.xml
new file mode 100644
index 000..0040b11
--- /dev/null
+++ b/dev-ruby/memory_profiler/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   ruby
+

[gentoo-commits] dev/graaff:master commit in: dev-ruby/benchmark-ips/

[Hans de Graaff]

commit: 7ea9bebc3e6f1d9adc2761c848808136ce4af2ca
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 09:46:30 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 09:46:30 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=7ea9bebc

dev-ruby/benchmark-ips: initial import of 2.3.0

Package-Manager: portage-2.2.20.1

 dev-ruby/benchmark-ips/Manifest   |  1 +
 dev-ruby/benchmark-ips/benchmark-ips-2.3.0.ebuild | 21 +
 dev-ruby/benchmark-ips/metadata.xml   |  5 +
 3 files changed, 27 insertions(+)

diff --git a/dev-ruby/benchmark-ips/Manifest b/dev-ruby/benchmark-ips/Manifest
new file mode 100644
index 000..480d490
--- /dev/null
+++ b/dev-ruby/benchmark-ips/Manifest
@@ -0,0 +1 @@
+DIST benchmark-ips-2.3.0.gem 15360 SHA256 
12443aa327d3129aa965244f79d7d5cb0f692f0f92ba7db76fba61526a40062e SHA512 
940e323814ea297ffb1af2264535e7c5718cd250c4c2e55ac9ddfd605de02ea99713fca5b1a84e721d599d6280efee8608d5fd18a9cc88ea4631b0f3999fcd96
 WHIRLPOOL 
e624c2f8289c1dbc2e2c9352e51f29e82d36f6ea7a91a5e90e5075f69b84d0de0875db0bf52eb18e9c3d50c1b7c948398ee1c00399401613448130038647afd8

diff --git a/dev-ruby/benchmark-ips/benchmark-ips-2.3.0.ebuild 
b/dev-ruby/benchmark-ips/benchmark-ips-2.3.0.ebuild
new file mode 100644
index 000..a200826
--- /dev/null
+++ b/dev-ruby/benchmark-ips/benchmark-ips-2.3.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A iterations per second enhancement to Benchmark"
+HOMEPAGE="https://github.com/evanphx/benchmark-ips";
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.6:5 )"

diff --git a/dev-ruby/benchmark-ips/metadata.xml 
b/dev-ruby/benchmark-ips/metadata.xml
new file mode 100644
index 000..0040b11
--- /dev/null
+++ b/dev-ruby/benchmark-ips/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   ruby
+

[gentoo-commits] dev/graaff:master commit in: dev-ruby/heapy/

[Hans de Graaff]

commit: 8685e50cfbec882c9c260bdafef8a2c180bc0f69
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 09:29:50 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 09:29:50 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=8685e50c

dev-ruby/heapy: add ruby22

Package-Manager: portage-2.2.20.1

 dev-ruby/heapy/heapy-0.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ruby/heapy/heapy-0.1.1.ebuild 
b/dev-ruby/heapy/heapy-0.1.1.ebuild
index 0fbf856..f87e852 100644
--- a/dev-ruby/heapy/heapy-0.1.1.ebuild
+++ b/dev-ruby/heapy/heapy-0.1.1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21"
+USE_RUBY="ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 

[gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: dev-lang/python/

[Michał Górny]

commit: 44612bbe9361896c3b165e9a97fc0e5217e9fdc3
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 09:56:11 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 09:56:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44612bbe

dev-lang/python: Replace python3.x executables with symlinks

Replace python3.X executables (duplicate to python3.Xm) installed by
the build system with symlinks to the ABIFLAGS-enabled variants.

 dev-lang/python/python-3.3.5-r3.ebuild | 8 
 dev-lang/python/python-3.4.3-r3.ebuild | 8 
 dev-lang/python/python-3.5.0-r2.ebuild | 8 
 3 files changed, 24 insertions(+)

diff --git a/dev-lang/python/python-3.3.5-r3.ebuild 
b/dev-lang/python/python-3.3.5-r3.ebuild
index f8a120c..e5e6291 100644
--- a/dev-lang/python/python-3.3.5-r3.ebuild
+++ b/dev-lang/python/python-3.3.5-r3.ebuild
@@ -249,6 +249,14 @@ src_install() {
# Fix collisions between different slots of Python.
rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
+   # Cheap hack to get version with ABIFLAGS
+   local abiver=$(cd "${ED}usr/include"; echo python*)
+   # Replace python3.X with a symlink if appropriate
+   if [[ ${abiver} != python${SLOT} ]]; then
+   rm "${ED}usr/bin/python${SLOT}" || die
+   dosym "${abiver}" "/usr/bin/python${SLOT}"
+   fi
+
if use build; then
rm -fr "${ED}usr/bin/idle${SLOT}" 
"${libdir}/"{idlelib,sqlite3,test,tkinter}
else

diff --git a/dev-lang/python/python-3.4.3-r3.ebuild 
b/dev-lang/python/python-3.4.3-r3.ebuild
index 3020fc8..fad0059 100644
--- a/dev-lang/python/python-3.4.3-r3.ebuild
+++ b/dev-lang/python/python-3.4.3-r3.ebuild
@@ -234,6 +234,14 @@ src_install() {
# Fix collisions between different slots of Python.
rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
+   # Cheap hack to get version with ABIFLAGS
+   local abiver=$(cd "${ED}usr/include"; echo python*)
+   # Replace python3.X with a symlink if appropriate
+   if [[ ${abiver} != python${SLOT} ]]; then
+   rm "${ED}usr/bin/python${SLOT}" || die
+   dosym "${abiver}" "/usr/bin/python${SLOT}"
+   fi
+
use elibc_uclibc && rm -fr "${libdir}/test"
use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
use tk || rm -fr "${ED}usr/bin/idle${SLOT}" 
"${libdir}/"{idlelib,tkinter,test/test_tk*}

diff --git a/dev-lang/python/python-3.5.0-r2.ebuild 
b/dev-lang/python/python-3.5.0-r2.ebuild
index 5c4addf..18aa6cb 100644
--- a/dev-lang/python/python-3.5.0-r2.ebuild
+++ b/dev-lang/python/python-3.5.0-r2.ebuild
@@ -240,6 +240,14 @@ src_install() {
# Fix collisions between different slots of Python.
rm -f "${ED}usr/$(get_libdir)/libpython3.so"
 
+   # Cheap hack to get version with ABIFLAGS
+   local abiver=$(cd "${ED}usr/include"; echo python*)
+   # Replace python3.X with a symlink if appropriate
+   if [[ ${abiver} != python${SLOT} ]]; then
+   rm "${ED}usr/bin/python${SLOT}" || die
+   dosym "${abiver}" "/usr/bin/python${SLOT}"
+   fi
+
use elibc_uclibc && rm -fr "${libdir}/test"
use sqlite || rm -fr "${libdir}/"{sqlite3,test/test_sqlite*}
use tk || rm -fr "${ED}usr/bin/idle${SLOT}" 
"${libdir}/"{idlelib,tkinter,test/test_tk*}

[gentoo-commits] repo/gentoo:master commit in: /

[Michał Górny]

commit: 7ec285b7ab0c67f5800b53f9e9adc805301d40c0
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov  8 09:59:09 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Nov  8 09:59:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ec285b7

sys-freebsd/freebsd-sources: Merge Errata fixes

Pull-Request: https://github.com/gentoo/gentoo/pull/339

 sys-freebsd/freebsd-sources/Manifest  | 2 ++
 .../{freebsd-sources-10.2.ebuild => freebsd-sources-10.2-r1.ebuild}   | 4 
 2 files changed, 6 insertions(+)

[gentoo-commits] repo/gentoo:master commit in: sys-freebsd/freebsd-sources/

[Michał Górny]

commit: 6605f61208a31d7bcafd070ac3d966c1252b93bd
Author: Yuta Satoh  gentoo  gr  jp>
AuthorDate: Sat Nov  7 22:15:38 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Nov  7 22:15:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6605f612

sys-freebsd/freebsd-sources: Fix Errata, EN-15:19.kqueue, EN-15:20.vm.

 sys-freebsd/freebsd-sources/Manifest  | 2 ++
 .../{freebsd-sources-10.2.ebuild => freebsd-sources-10.2-r1.ebuild}   | 4 
 2 files changed, 6 insertions(+)

diff --git a/sys-freebsd/freebsd-sources/Manifest 
b/sys-freebsd/freebsd-sources/Manifest
index ef6558a..a79317e 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -1,4 +1,6 @@
 DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 
8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 
013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc
 WHIRLPOOL 
c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f
+DIST freebsd-sources-EN-1519-kqueue.patch 543 SHA256 
09f3b3e80a9902bfea78dfcaf434daf09f7ffa4ff701a34eaf387fee36d1f4e3 SHA512 
222c7256c79beefa322a20f4f35fde7ababb46b28669df491087d46f28d9dbf1eca09c9fbbef678f1262a52741eafc0701676d087025e968d34352b95b5a61f6
 WHIRLPOOL 
c3a334188155f261036a81377940bbaa78ddfcee1727001fb71759af67300c8a3ab02a649bec239522d0a06f143064a168ea925285c6a9d7f07a05ed81999d10
+DIST freebsd-sources-EN-1520-vm.patch 1100 SHA256 
cc6c4e383d53316aba079ef8047aa80e8256214877d4281049df923d6aea7098 SHA512 
2a853d0a3c57832915922ab511175395b0f2d43346e3b2501e83e42f063ac32bf3317bc93f2e3151d630f34e7b0fbcd3b21092fffcf163ba1b39c156f6b3c8ce
 WHIRLPOOL 
7999092d2c5ddffc5e9ef665536150f768de7936c38306616d7a1ee63339afae17b04ae2aa9a2b110ed219c1039beeff5dbff8e222e1ea6a921c16c4f262e587
 DIST freebsd-src-10.2.tar.xz 124551336 SHA256 
6a59ea716bae96135983ad70cd7123e3b35ec91b191a82fe282ade88a61560b1 SHA512 
fba4588fdaa94fa4582a8de566a84cf4f2badc87c7b2e0745d7a31c1e349b2d5f59dbdbb16a9d43421155c1ac4bdec8db24c5d32ac5a92be687d4ed70fe35835
 WHIRLPOOL 
e325db3c07118762021d802c4f20c7a5fd4b816f08cab6f92b408399f1b3bf8ad89728d51c354ab21478265a4539463c94aae9ae49f0ac10cd3c3f8f640dc186
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 
0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 
6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
 WHIRLPOOL 
870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 
b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 
7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
 WHIRLPOOL 
c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild 
b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
similarity index 97%
rename from sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild
rename to sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
index 27e930a..0d0e26c 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.2.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.2-r1.ebuild
@@ -11,6 +11,10 @@ SLOT="0"
 
 IUSE="+build-kernel debug dtrace zfs"
 
+# Security Advisory and Errata patches.
+UPSTREAM_PATCHES=( "EN-15:19/kqueue.patch"
+   "EN-15:20/vm.patch" )
+
 if [[ ${PV} != ** ]]; then
KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
SRC_URI="${SRC_URI}

[gentoo-commits] dev/graaff:master commit in: dev-ruby/derailed_benchmarks/

[Hans de Graaff]

commit: a662e2f7973872f2356a0bf153c790ea196bab55
Author: Hans de Graaff  degraaff  org>
AuthorDate: Sun Nov  8 10:00:11 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 10:00:11 2015 +
URL:https://gitweb.gentoo.org/dev/graaff.git/commit/?id=a662e2f7

dev-ruby/derailed_benchmarks: initial import of 1.1.3

Package-Manager: portage-2.2.20.1

 dev-ruby/derailed_benchmarks/Manifest  |  1 +
 .../derailed_benchmarks-1.1.3.ebuild   | 36 ++
 dev-ruby/derailed_benchmarks/metadata.xml  |  5 +++
 3 files changed, 42 insertions(+)

diff --git a/dev-ruby/derailed_benchmarks/Manifest 
b/dev-ruby/derailed_benchmarks/Manifest
new file mode 100644
index 000..27c0947
--- /dev/null
+++ b/dev-ruby/derailed_benchmarks/Manifest
@@ -0,0 +1 @@
+DIST derailed_benchmarks-1.1.3.gem 99328 SHA256 
e6b0a2809502ed3f18301e225d643cc439d590b9e9e47584fa159ecca43fba49 SHA512 
98c9e6ee384a1820f6640de68610f6e13f13fe8fdbce1c703e34824bee2cce49cc5a3bf02856fcf322ebc3f02a365ef5fd2012a684396ccf141aa10bd9aa4ec2
 WHIRLPOOL 
bb89e5a18d9f5e651cb1ce0514706e9019f6c8d6f0f15a1dccf3184fbb1ef733cfd98a39f68b21388603c48f4b8eb3e67e5213b06f5cd64894bbdbe7d75309a0

diff --git a/dev-ruby/derailed_benchmarks/derailed_benchmarks-1.1.3.ebuild 
b/dev-ruby/derailed_benchmarks/derailed_benchmarks-1.1.3.ebuild
new file mode 100644
index 000..81b44cf
--- /dev/null
+++ b/dev-ruby/derailed_benchmarks/derailed_benchmarks-1.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Go faster, off the Rails"
+HOMEPAGE="https://github.com/schneems/derailed_benchmarks";
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+# Requires devise which is not packaged.
+RESTRICT="test"
+
+ruby_add_rdepend "
+   >=dev-ruby/benchmark-ips-2
+   dev-ruby/get_process_mem
+   dev-ruby/heapy
+   dev-ruby/memory_profiler
+   >=dev-ruby/rack-1:*
+   >=dev-ruby/rake-10
+   >=dev-ruby/thor-0.19:0
+"
+
+all_ruby_prepare() {
+   rm -f Gemfile.lock || die
+}

diff --git a/dev-ruby/derailed_benchmarks/metadata.xml 
b/dev-ruby/derailed_benchmarks/metadata.xml
new file mode 100644
index 000..0040b11
--- /dev/null
+++ b/dev-ruby/derailed_benchmarks/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   ruby
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

[Alexis Ballier]

commit: 0250db360bb450514d3db3524401268664b317f7
Author: Marc Joliet  gmx  de>
AuthorDate: Fri Nov  6 22:50:46 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Nov  6 23:31:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0250db36

media-sound/audacity: add a libsamplerate USE desc

Add a local description of the libsamplerate USE flag that is more specific
with regards to its impact on Audacity.

Signed-off-by: Marc Joliet  gmx.de>

 media-sound/audacity/metadata.xml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index 807ba67..b524f75 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -14,6 +14,11 @@
   quality and much faster than both the included resampler and
   libsamplerate.
 
+
+  Uses media-libs/libsamplerate as audio resampling library:
+  Higher quality than the included resampler but lower quality and much
+  slower than libsoxr.
+
 Add support for Ladspa V2
 Enables MIDI support
 Enable the internal portmixer feature

[gentoo-commits] repo/gentoo:master commit in: /

[Alexis Ballier]

commit: e9a15e7be8bc98c3eb48bc7cc44d5fb7deb01671
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Nov  8 10:06:34 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Nov  8 10:06:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a15e7b

Merge remote-tracking branch 'github/pr/332'

 media-sound/audacity/metadata.xml | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/

[Alexis Ballier]

commit: a9428f9a8297c3336a09490dcb3f6fe7cf333d17
Author: Marc Joliet  gmx  de>
AuthorDate: Fri Nov  6 22:41:38 2015 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Nov  6 22:58:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9428f9a

media-sound/audacity: fix libsoxr USE flag desc

The description of the libsoxr USE flag is inaccurate: libsoxr is both faster
*and* yields higher quality results than libsamplerate.  This matches the way
the Audacity project described libsoxr in the 2.0.3 release notes at
http://wiki.audacityteam.org/wiki/Release_Notes_2.0.3#Resampling, but can also
be verified by comparing the two, e.g., at http://src.infinitewave.ca/.

Signed-off-by: Marc Joliet  gmx.de>

 media-sound/audacity/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index efb5914..807ba67 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,9 +10,9 @@
   
 Enables ID3 tagging with id3tag library
 
-  Uses media-libs/soxr as audio resampling library: Better
-  quality than the included resampler and much faster than libsamplerate
-  while keeping almost the same quality.
+  Uses media-libs/soxr as audio resampling library: Higher
+  quality and much faster than both the included resampler and
+  libsamplerate.
 
 Add support for Ladspa V2
 Enables MIDI support

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xkbcomp/

[Manuel Rüger]

commit: ca36447ba83d5ad09187ac757cd5dd197281d0a2
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:10:40 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:10:40 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca36447b

x11-apps/xkbcomp: Version bump

Package-Manager: portage-2.2.24

 x11-apps/xkbcomp/Manifest |  1 +
 x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild | 15 +++
 2 files changed, 16 insertions(+)

diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 8e245c0..14ff58b 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,2 +1,3 @@
 DIST xkbcomp-1.2.4.tar.bz2 242185 SHA256 
91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d SHA512 
51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4
 WHIRLPOOL 
2151f5348758226badedef332183cfcfb5d4d50013a665c22f84bcf84ebce5e5ea41a6342816edab7f34392bb11e724bae5e7713e50f2f796bb6766b97f5c00b
 DIST xkbcomp-1.3.0.tar.bz2 246389 SHA256 
cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a SHA512 
c1661a97ff1ca054647486de33c430dd44f18168074e636dd5acefd324834ec3098f91930329734303c3e9fdde56ea1f5953702e91601db6642a18d21c955184
 WHIRLPOOL 
f811b75d4d480b68bd519df20dc4f81c3275a2a247ac7d272e0d145907bd878704ffb8f780cab4f303ebb213db27dbfdcaf1bd4e1aafb1724fb2786a8cc6908f
+DIST xkbcomp-1.3.1.tar.bz2 246963 SHA256 
0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d SHA512 
03ee4cad3ef0295b57eda25eec2c301baf04beaea8936baff5ae87e3eb41ace3095ce3fc80a55cd1c4f58581ed23bc0acfbe38879fce27e2a6f6cd647ec6bae7
 WHIRLPOOL 
3f0c2aeef8959a4c886b5b1c7ffef56fb21b414d8d3193b2ecad6757d7d86eec7d12eb43b53c07f685267c11e00b6aa8f302d483b18175a80e24aa31869dea72

diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild 
b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
new file mode 100644
index 000..c6b6721
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+   x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+   sys-devel/bison"

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xkbcomp/

[Manuel Rüger]

commit: 8e549047d43458af1d6cb6a60313e3e97807a457
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:11:39 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:11:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e549047

x11-apps/xkbcomp: Remove old

Package-Manager: portage-2.2.24

 x11-apps/xkbcomp/Manifest |  1 -
 x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild | 15 ---
 2 files changed, 16 deletions(-)

diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 14ff58b..12b43bf 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,3 +1,2 @@
-DIST xkbcomp-1.2.4.tar.bz2 242185 SHA256 
91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d SHA512 
51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4
 WHIRLPOOL 
2151f5348758226badedef332183cfcfb5d4d50013a665c22f84bcf84ebce5e5ea41a6342816edab7f34392bb11e724bae5e7713e50f2f796bb6766b97f5c00b
 DIST xkbcomp-1.3.0.tar.bz2 246389 SHA256 
cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a SHA512 
c1661a97ff1ca054647486de33c430dd44f18168074e636dd5acefd324834ec3098f91930329734303c3e9fdde56ea1f5953702e91601db6642a18d21c955184
 WHIRLPOOL 
f811b75d4d480b68bd519df20dc4f81c3275a2a247ac7d272e0d145907bd878704ffb8f780cab4f303ebb213db27dbfdcaf1bd4e1aafb1724fb2786a8cc6908f
 DIST xkbcomp-1.3.1.tar.bz2 246963 SHA256 
0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d SHA512 
03ee4cad3ef0295b57eda25eec2c301baf04beaea8936baff5ae87e3eb41ace3095ce3fc80a55cd1c4f58581ed23bc0acfbe38879fce27e2a6f6cd647ec6bae7
 WHIRLPOOL 
3f0c2aeef8959a4c886b5b1c7ffef56fb21b414d8d3193b2ecad6757d7d86eec7d12eb43b53c07f685267c11e00b6aa8f302d483b18175a80e24aa31869dea72

diff --git a/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild 
b/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild
deleted file mode 100644
index 4c9631a..000
--- a/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
-   x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-   sys-devel/bison"

[gentoo-commits] dev/fordfrog:master commit in: dev-java/netbeans-platform/, dev-java/netbeans-javadoc/

[Miroslav Šulc]

commit: 7dee7c9f9ed9954981989319b03bd6716e899e31
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov  8 10:12:58 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov  8 10:12:58 2015 +
URL:https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=7dee7c9f

netbeans: netbeans-platform and netbeans-javadoc switched to jdk 1.8

Package-Manager: portage-2.2.24

 dev-java/netbeans-javadoc/Manifest  |  2 +-
 dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild   | 10 +-
 dev-java/netbeans-platform/Manifest |  2 +-
 dev-java/netbeans-platform/netbeans-platform-8.1.ebuild | 14 ++
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dev-java/netbeans-javadoc/Manifest 
b/dev-java/netbeans-javadoc/Manifest
index 71fed8f..c3a9de7 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -28,7 +28,7 @@ DIST netbeans-trunk-nightly-201511030002-src.zip 208707811 
SHA256 3d6beefb37d5b7
 DIST netbeans-trunk-nightly-201511050002-src.zip 208737487 SHA256 
86f4bd2b25363a6893ae9ec91352e93be7d6d707b8d4d0c573ab6634554499c2 SHA512 
50d06f779cfdd7bbbffb91844010e93f94339c505e38b3af7a9066bc9f4a35db6dcbc8a9737e436904ea1bc18267e6139656f8dc1a82356d9b48ab442f420ec0
 WHIRLPOOL 
05c392e0151f0348dd5d51796262f503c312b73a4166b92d24a9598f490da6567e8b76c52ab7cefb957b34e3e0622b3e5cc3888e3a9c6cb88a18a1e917b95314
 DIST netbeans-trunk-nightly-201511080002-src.zip 208751101 SHA256 
27523f666ce10cbdfb9a63ada56d1bed5eb90fa62310292320c90506756778f2 SHA512 
6c54272c017f421f634d5ecc1682c5121da66b8ebfe1df2559c4458b4885c27c5a59aa31460a2bd020eb721a2074dfb5790d9b3722f05c54c0b821048215bd4a
 WHIRLPOOL 
a3c748e2de936ee3ce62ff89849aca180ea2f4008844b8914e9614e06e0ca32c01b7a20adbf51b0292ca0820560e1cbefb24d274b904b5a4c7cfe415060d9a15
 EBUILD netbeans-javadoc-8.0.2.ebuild 5993 SHA256 
baf9da38d87b86eb8ed10ef46017361f36ca8583dd90885c9d1667a51851bc52 SHA512 
892bc25b30dc26e3ee7c8be9aaf8542c00a7fa1d1d8f883d82bebb816edfa93e1ee9abeac1b0c47ecc8b4169bcaded56c5c71f18151fdc22fe241fcee0fd4521
 WHIRLPOOL 
2012f28f3ba5074b4d262b20e9a1c8ddf590ce444339ec1a404c890867c1271e38f9f9e09717d0648fae061553f5c8da3d97a70c35c8e853fe4894fb6fd4ec96
-EBUILD netbeans-javadoc-8.1.ebuild 6182 SHA256 
3f756c1f490d9e2c6c3f561f5b6f0c489a32e5e5f946f271b59f2581aa612a1e SHA512 
ee8dbf284615899306de711d92e7c22f6631603b2ac833d79c4b6e543af3a6009c212a6b58f33fc1abaefd8b470f1e451f7cfc6650b6f25165ae0f60469a72b5
 WHIRLPOOL 
aec46780041aba3b7f3a56691bb6a45789367a9188a3bb1e7eb726455ebfd62543b7b2a9f225e421bd4ffe27eae8db2b19712b6e6fa0007cda9e8a8790ebd24f
+EBUILD netbeans-javadoc-8.1.ebuild 6247 SHA256 
5f0ab01cbea85353ac471a46e341750785f4889732c9da111d77b87bbd1bcc2d SHA512 
4a4636f4f58a9baba9d9f5bac4ee7d4f57c0e07d6790902d34974383660f2926c4c4b16a27bacc2a3a7a0a6d5b7699caae90bb2ac513ac8e0535e46d11ec345e
 WHIRLPOOL 
9cbac0234b9f1a8122df116512d5154b7e85561fd9541e0a77dc5c2b5863cf3238400ac17d05499e950705309faa97caace6da00c912ea07d6a74b0076f683ed
 EBUILD netbeans-javadoc-_p20151003.ebuild 6228 SHA256 
699e9a51f3f2f67cd645c26e3e71473e173e86bc65fec4f79f322359b0fda501 SHA512 
4c3126c9007b76c676720357671bdc04bad90c56de7d0b568c9de3ae17f348fd96c0176deb36531f2eb832d649c544e056ffecf4e19e25127d9640bb542026ea
 WHIRLPOOL 
42dd2ce70c6c823a3fbeb93dbcf623a49bd4d2d10beda37e862a932ca625813bfe0685e0a0c637a3ad40ac547823d94a5f19c7d26112b177f4287cce12869760
 EBUILD netbeans-javadoc-_p20151004.ebuild 6228 SHA256 
aeee0edbb37ff7feda48809509e0817726f12a03095c831188d0dc697a0d03ca SHA512 
9daec0d7d018fdfeb5423ebefbd3bc35d3e392b5d264b86f4e075a6fcf617faccfe2f8cb4e1ff72946a24b55fd2766458719dbe97e2857c9d58e38f3f39a18df
 WHIRLPOOL 
c8fc314958390aae2faf643cde43ce6b90d9d08833700646780c627a02c659a8cef83f0d83e7f646b14e4a103723a435e2d7541325ca0a8db291cd4e97fb
 EBUILD netbeans-javadoc-_p20151006.ebuild 6228 SHA256 
f760645f1a3153daf67150731ab0db32eed2bf4c325902d7feeff29961a141f8 SHA512 
b83437b70058c1e114b9b1d099373c7fca03403aad70dedb6def6b8468a00f096d7a1022b4b12c1a3e608aa2d3f543e392de86a1ab01a4e637d2e601abc8a7ab
 WHIRLPOOL 
6e5abef383be306d9476c5fad35d2fdda8ba3e2c0ff8109a8210cc69cd4bb0751362ea93bd9a00c7005a09dee5eb376c2d8b170f972382bd04e0fadfc8364a41

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild 
b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
index 8e13875..10100c7 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
-# oracle-jdk-bin is needed because other jdks do not contain 
jre/lib/ext/jfxrt.jar
-DEPEND="dev-java/oracle-jdk-bin:1.7
+# oracle-jdk-bin is needed because of javafx which is not currently packaged 
separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
app-arch/unzip
dev-java/javahelp:0
dev-java/junit:4
@@ -42,7 +42,7 @@ DEPEND="dev-java/oracle-jdk-bin:1.7
 RDEPEND=""
 
 JAVA_PKG_BSFIX="

[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-platform/

[Miroslav Šulc]

commit: d85f7a1770502a306f9c4301121048d57013
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov  8 10:14:45 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov  8 10:14:45 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d85f7a17

dev-java/netbeans-platform: switched to jdk 1.8 per bug #565048

Package-Manager: portage-2.2.24

 dev-java/netbeans-platform/netbeans-platform-8.1.ebuild | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild 
b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
index 89b8b93..c452bab 100644
--- a/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
+++ b/dev-java/netbeans-platform/netbeans-platform-8.1.ebuild
@@ -30,6 +30,10 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
+# oracle-jdk-bin is needed for now because of javafx which is not packaged 
separately yet
+# [parseprojectxml] Distilling 
/var/tmp/portage/dev-java/netbeans-platform-_p20151108/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar
 from 
[/var/tmp/portage/dev-java/netbeans-platform-_p20151108/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar,
 /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar]
+# [parseprojectxml] Classpath entry /usr/lib64/icedtea8/jre/lib/ext/jfxrt.jar 
does not exist; skipping
+#  [nbmerge] Failed to build target: all-api.htmlui
 CDEPEND="dev-java/hamcrest-core:1.3
dev-java/javahelp:0
>=dev-java/jna-3.4:0
@@ -38,13 +42,7 @@ CDEPEND="dev-java/hamcrest-core:1.3
dev-java/osgi-compendium:0
dev-java/swing-layout:1[source]
dev-java/testng:0"
-# oracle-jdk-bin is needed because other jdks do not contain file 
jre/lib/ext/jfxrt.jar
-# the error:
-#  [parseprojectxml] Distilling 
/var/tmp/portage/dev-java/netbeans-platform-_p20140922/work/nbbuild/build/public-package-jars/org-netbeans-libs-javafx.jar
 from 
[/var/tmp/portage/dev-java/netbeans-platform-_p20140922/work/nbbuild/netbeans/platform/modules/org-netbeans-libs-javafx.jar,
 /opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar]
-#  [parseprojectxml] Classpath entry 
/opt/icedtea-bin-7.2.4.7/jre/lib/ext/jfxrt.jar does not exist; skipping
-#  [nbmerge] Failed to build target: all-api.html4j
-
-DEPEND="dev-java/oracle-jdk-bin:1.7
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
app-arch/unzip
${CDEPEND}"
 RDEPEND=">=virtual/jdk-1.7
@@ -57,7 +55,7 @@ EANT_BUILD_TARGET="rebuild-cluster"
 EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.platform 
-Dext.binaries.downloaded=true -Djava.awt.headless=true 
-Dpermit.jdk8.builds=true"
 EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
 JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
 JAVA_PKG_WANT_SOURCE="1.7"
 JAVA_PKG_WANT_TARGET="1.7"
 

[gentoo-commits] repo/gentoo:master commit in: dev-java/netbeans-javadoc/

[Miroslav Šulc]

commit: fdbfd23c41d8535a2e7205d9f8847c79d0c94086
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov  8 10:15:56 2015 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov  8 10:15:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdbfd23c

dev-java/netbeans-javadoc: switched to jdk 1.8 per bug #565048

Package-Manager: portage-2.2.24

 dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild 
b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
index 8e13875..10100c7 100644
--- a/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
+++ b/dev-java/netbeans-javadoc/netbeans-javadoc-8.1.ebuild
@@ -17,8 +17,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 S="${WORKDIR}"
 
-# oracle-jdk-bin is needed because other jdks do not contain 
jre/lib/ext/jfxrt.jar
-DEPEND="dev-java/oracle-jdk-bin:1.7
+# oracle-jdk-bin is needed because of javafx which is not currently packaged 
separately
+DEPEND="dev-java/oracle-jdk-bin:1.8[javafx]
app-arch/unzip
dev-java/javahelp:0
dev-java/junit:4
@@ -42,7 +42,7 @@ DEPEND="dev-java/oracle-jdk-bin:1.7
 RDEPEND=""
 
 JAVA_PKG_BSFIX="off"
-JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.7"
+JAVA_PKG_WANT_BUILD_VM="oracle-jdk-bin-1.8"
 JAVA_PKG_WANT_SOURCE="1.7"
 JAVA_PKG_WANT_TARGET="1.7"
 
@@ -158,8 +158,8 @@ src_prepare() {
 }
 
 src_compile() {
-   eant -f nbbuild/build.xml bootstrap || die
-   ANT_OPTS="-Xmx1536m" eant -f nbbuild/javadoctools/build.xml 
build-javadoc
+   eant -Dpermit.jdk8.builds=true -f nbbuild/build.xml bootstrap || die
+   ANT_OPTS="-Xmx1536m" eant -Dpermit.jdk8.builds=true -f 
nbbuild/javadoctools/build.xml build-javadoc
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xauth/

[Manuel Rüger]

commit: 572ebd8bbda9285ca387686daa1edf8d75190be6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:16:15 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:16:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572ebd8b

x11-apps/xauth: Remove old

Package-Manager: portage-2.2.24

 x11-apps/xauth/Manifest   |  1 -
 x11-apps/xauth/xauth-1.0.8.ebuild | 25 -
 x11-apps/xauth/xauth-1.0.9.ebuild | 25 -
 3 files changed, 51 deletions(-)

diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 4b37772..c620eb9 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,2 +1 @@
-DIST xauth-1.0.8.tar.bz2 146794 SHA256 
a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7 SHA512 
7eb55ad0db16d6f3146413d47b8d3a7dca4cdefa8d9d1421149bc14fd6a78168c7098f3665a3cb413a76566e4dec1e51ae9372336f9be3370fdd3cb5245489d3
 WHIRLPOOL 
abeead3d9535b4b242ec459fc4386d730838cb8b39428a7128b7865d0a00f01ea000a017371bf930d1c9beb9d273df562fc9948f22c164725ee550ebc623d890
 DIST xauth-1.0.9.tar.bz2 154976 SHA256 
56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f SHA512 
e7b8e950a3e9e36131041692a22b2390c75df94fa8b5f4ea2ef2d79778e000865b1b0ec5930612dedb782d451022ee52c7c9a404d249809adb4b905b66f44d0b
 WHIRLPOOL 
16f2686a181281610df55d405738d0a39fd7fa891a58606b13abed3754179802e1b22a938ef43d6d4205dfa8ff7f764f5e1c5323e58bed080ccd33ca4f4f0134

diff --git a/x11-apps/xauth/xauth-1.0.8.ebuild 
b/x11-apps/xauth/xauth-1.0.8.ebuild
deleted file mode 100644
index dd3b219..000
--- a/x11-apps/xauth/xauth-1.0.8.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="X authority file utility"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXau
-   x11-libs/libXext
-   x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-   XORG_CONFIGURE_OPTIONS=(
-   $(use_enable ipv6)
-   )
-   xorg-2_pkg_setup
-}

diff --git a/x11-apps/xauth/xauth-1.0.9.ebuild 
b/x11-apps/xauth/xauth-1.0.9.ebuild
deleted file mode 100644
index 3f56575..000
--- a/x11-apps/xauth/xauth-1.0.9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="X authority file utility"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXau
-   x11-libs/libXext
-   x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-   XORG_CONFIGURE_OPTIONS=(
-   $(use_enable ipv6)
-   )
-   xorg-2_pkg_setup
-}

[gentoo-commits] repo/gentoo:master commit in: x11-apps/transset/files/, x11-apps/transset/

[Manuel Rüger]

commit: 5a97aa2d342869c4a1ec7858c598dfab756045b6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:15:13 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:16:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a97aa2d

x11-apps/transset: Remove old

Package-Manager: portage-2.2.24

 x11-apps/transset/Manifest  |  1 -
 .../files/transset-1.0.0-no_transset-df.patch   | 21 -
 x11-apps/transset/transset-1.0.0.ebuild | 19 ---
 3 files changed, 41 deletions(-)

diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
index 52cd378..19d06b1 100644
--- a/x11-apps/transset/Manifest
+++ b/x11-apps/transset/Manifest
@@ -1,2 +1 @@
-DIST transset-1.0.0.tar.bz2 118557 SHA256 
19ee2525c4044743c49a95e43716bc3bd1dddf527e47585ee118e650b83a7e8f SHA512 
f2c949dcf2a3e059693643ffb3cc976cfe766c53982b6a5af9ab82d994c3641f780fb3322d8d1f1eed7d178751077fdf497d7873dd3bc2835276b0a89e45efbb
 WHIRLPOOL 
06045cb4f31209676853764a3023a661711f24ca3dd5d7d1d2b4b3c07329773e68dbf94d929a47760a62db44aa3a5f8320ed4fd1aa8539b9cc17ff5d7908dc00
 DIST transset-1.0.1.tar.bz2 121199 SHA256 
70c3d033874fe48286bc4971d5de9027f2e8ccd0f21b7506fe1bb4472218036d SHA512 
709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d
 WHIRLPOOL 
86cdc0ad3d82e51ca568e2324ed4a96e92dd6c802e345e98a34804065576b3e8a815084ab5aa423c253275c3d16889c14fd8f5e3b04aeb46d360910a247e3dd3

diff --git a/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch 
b/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch
deleted file mode 100644
index 81a1bd6..000
--- a/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From a2485424bd0f184700dd0a4f0823fb4c4cf25f66 Mon Sep 17 00:00:00 2001
-From: Arnaud Fontaine 
-Date: Thu, 07 Jun 2012 10:33:28 +
-Subject: Fix program name in usage information, transset instead of 
transset-df.
-

-diff --git a/transSet.c b/transSet.c
-index 899c14a..ea591bc 100644
 a/transSet.c
-+++ b/transSet.c
-@@ -44,7 +44,7 @@ Window target_win;
- void
- Usage (void)
- {
--fprintf (stderr, "usage: transset-df [-options ...] [opacity]\n");
-+fprintf (stderr, "usage: transset [-options ...] [opacity]\n");
- fprintf (stderr, "options:\n");
- 
- fprintf (stderr,
---
-cgit v0.9.0.2-2-gbebe

diff --git a/x11-apps/transset/transset-1.0.0.ebuild 
b/x11-apps/transset/transset-1.0.0.ebuild
deleted file mode 100644
index f71dc09..000
--- a/x11-apps/transset/transset-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="An utility for setting opacity property"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/xapps 
http://cgit.freedesktop.org/xorg/app/transset/";
-
-LICENSE="SGI-B-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-   >=x11-proto/xproto-7.0.17"
-
-PATCHES=( "${FILESDIR}"/${P}-no_transset-df.patch )

[gentoo-commits] repo/gentoo:master commit in: x11-apps/fstobdf/

[Manuel Rüger]

commit: 8fcada9b139e0dcb8b465690c05907b7de6f78ad
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:13:44 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:16:32 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcada9b

x11-apps/fstobdf: Remove old

Package-Manager: portage-2.2.24

 x11-apps/fstobdf/Manifest |  1 -
 x11-apps/fstobdf/fstobdf-1.0.5.ebuild | 15 ---
 2 files changed, 16 deletions(-)

diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index c6601b9..b324cb4 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,2 +1 @@
-DIST fstobdf-1.0.5.tar.bz2 119822 SHA256 
9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8 SHA512 
662ceda5771247535873aca66f8cac5cec9673da1b627ddfb4d56ac854f56fee467a339502885a961b1906b913095cfa6135f337363983c0e971eba48cd0987c
 WHIRLPOOL 
0b4b01ed41f6cbbe74490e61d5227a5102b0a450284ad5c856227f1c6601d7fe26a1f9a204c78a3cf82e79a4f06aa5d61650b7cda3466b40533cbf137e570114
 DIST fstobdf-1.0.6.tar.bz2 127170 SHA256 
66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e SHA512 
ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f
 WHIRLPOOL 
6b435bb348de466da64930bbe41352d38f1054698e955d2d958d214668c8e0f3d7d0c21a0c87d67006f5d0005e004ee9df1e685dd2ef60fe011e23757c2d9be3

diff --git a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild 
b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
deleted file mode 100644
index 37af2dc..000
--- a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="generate BDF font from X font server"
-KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libFS"
-DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xwininfo/

[Manuel Rüger]

commit: c3b70db33092ccbdc85a55c764c1a4f776b88387
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:19:46 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:19:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b70db3

x11-apps/xwininfo: Remove old

Package-Manager: portage-2.2.24

 x11-apps/xwininfo/Manifest  |  1 -
 x11-apps/xwininfo/xwininfo-1.1.2.ebuild | 25 -
 2 files changed, 26 deletions(-)

diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index e6e447e..fb5d97e 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,2 +1 @@
-DIST xwininfo-1.1.2.tar.bz2 135415 SHA256 
8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a SHA512 
48db52db9f0e6eeffb635906e3b703d8b87bc98b32e41a3164409bad6b5b428ce0835a72be0f7d7008c8a00ca0bc4013ba5ad81f7402bfb20652a163832afc2d
 WHIRLPOOL 
55ef58870e92b4ee9f78b369a875176af2d75ea3976c10842b4db8efaf2c8272a33faf91e8641b35bbd726d9023ef845086c5f98e01d984a6321d3d84214
 DIST xwininfo-1.1.3.tar.bz2 157512 SHA256 
218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 SHA512 
b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466
 WHIRLPOOL 
902c45b6c94a6b659c3f1bec04d4324c40ec88c8a75daff742e2c801ca388fe3c6bacb31efb14d62237de4e39c1ea776ccbb5788b705c66e86260fc17ec281e7

diff --git a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild 
b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
deleted file mode 100644
index df25621..000
--- a/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2 flag-o-matic
-
-DESCRIPTION="window information utility for X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux 
~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-
-RDEPEND=">=x11-libs/libxcb-1.6"
-DEPEND="${RDEPEND}
-   x11-libs/libX11
-   >=x11-proto/xproto-7.0.17"
-
-pkg_setup() {
-   # interix has a _very_ old iconv in libc, however, including
-   # iconv.h redefines those symbols to libiconv_*, which then
-   # are unresolved, as the configure check is old and dumb.
-   [[ ${CHOST} == *-interix* || ${CHOST} == *-solaris* ]] &&
-   append-libs -liconv
-}

[gentoo-commits] repo/gentoo:master commit in: x11-apps/xclock/

[Manuel Rüger]

commit: 56b7f41a46ed2a9dbe96a8446f9ee13c5cf6c189
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 10:18:55 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 10:18:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b7f41a

x11-apps/xclock: Remove old

Package-Manager: portage-2.2.24

 x11-apps/xclock/Manifest|  1 -
 x11-apps/xclock/xclock-1.0.6.ebuild | 20 
 2 files changed, 21 deletions(-)

diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index ba0076b..a1c9da1 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,2 +1 @@
-DIST xclock-1.0.6.tar.bz2 156817 SHA256 
21bb6f57b0a158c05a47558302321c4764a8d2e1b8e5d4ad23e3809b4cee3fd0 SHA512 
78431bc38b15f395a69b672c618bf4126e73727f4df5e8a2744a258d0b856ab4c0f918ef4ff16994cc48f3ce61b291c632e150f19ee9b3dc9ffeb470c7cdae3a
 WHIRLPOOL 
c1ef3001c0a86026d7de6130d1765d0bc9fd9462dbc6927c6c50981db3685c5f6e84f421919fd709a26c061beb321776d7d6c302301b835a3ca68ceba2c63ddf
 DIST xclock-1.0.7.tar.bz2 164035 SHA256 
23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 SHA512 
56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607
 WHIRLPOOL 
ebcc870b133d6ae03e39f3bc8f8eb65775ab9dda60fafa91d8609a002e0e797c2dda0879bd5a8c36fb5e2dbcc921defb2a35633fd902700c773a6c402baf7355

diff --git a/x11-apps/xclock/xclock-1.0.6.ebuild 
b/x11-apps/xclock/xclock-1.0.6.ebuild
deleted file mode 100644
index afa34cb..000
--- a/x11-apps/xclock/xclock-1.0.6.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos 
~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-   x11-libs/libXmu
-   x11-libs/libXrender
-   x11-libs/libXft
-   x11-libs/libxkbfile
-   x11-libs/libXaw"
-DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: media-sound/ncmpcpp/

[Jeroen Roovers]

commit: 0a0a22eb6a385d89b2ef35d4f95a6d6c81202e93
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Nov  8 10:36:01 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Nov  8 10:36:23 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0a22eb

media-sound/ncmpcpp: Mask dev-libs/boost-1.57 (bug #565102 by Daniel Campbell).

Package-Manager: portage-2.2.24

 media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild | 3 ++-
 media-sound/ncmpcpp/ncmpcpp-.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild 
b/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild
index 6064b68..14324db 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.7_beta1.ebuild
@@ -15,11 +15,12 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
+   !dev-libs/boost:0/1.57.0
>=media-libs/libmpdclient-2.1
-   curl? ( net-misc/curl )
dev-libs/boost:=[nls,threads]
sys-libs/ncurses:=[unicode?]
sys-libs/readline:*
+   curl? ( net-misc/curl )
taglib? ( media-libs/taglib )
unicode? ( dev-libs/boost:=[icu] )
visualizer? ( sci-libs/fftw:3.0 )

diff --git a/media-sound/ncmpcpp/ncmpcpp-.ebuild 
b/media-sound/ncmpcpp/ncmpcpp-.ebuild
index ffeb992..63f102a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-.ebuild
@@ -16,11 +16,12 @@ KEYWORDS=""
 IUSE="clock curl outputs taglib unicode visualizer"
 
 RDEPEND="
+   !dev-libs/boost:0/1.57.0
>=media-libs/libmpdclient-2.1
-   curl? ( net-misc/curl )
dev-libs/boost:=[nls,threads]
sys-libs/ncurses:=[unicode?]
sys-libs/readline:*
+   curl? ( net-misc/curl )
taglib? ( media-libs/taglib )
unicode? ( dev-libs/boost:=[icu] )
visualizer? ( sci-libs/fftw:3.0 )

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xv/, media-gfx/xv/files/

[Pacho Ramos]

commit: a0036cb21b2b3543f50c3964039dc96c54e47f6f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  8 11:02:16 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 11:04:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0036cb2

media-gfx/xv: Fix png crashes (#521142 by Ian Schram)

Package-Manager: portage-2.2.24

 media-gfx/xv/files/xv-3.10a-libpng15-r1.patch | 520 ++
 media-gfx/xv/xv-3.10a-r17.ebuild  |  92 +
 2 files changed, 612 insertions(+)

diff --git a/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch 
b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch
new file mode 100644
index 000..b3eaeef
--- /dev/null
+++ b/media-gfx/xv/files/xv-3.10a-libpng15-r1.patch
@@ -0,0 +1,520 @@
+--- xvinfo.c
 xvinfo.c
+@@ -26,7 +26,7 @@
+ #define INFOHIGH 270
+ 
+ /* max length of an Info String */
+-#define ISTRLEN 80
++#define ISTRLEN 256
+ 
+ /* baseline of top line of text */
+ #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT)
+--- xvpng.c
 xvpng.c
+@@ -31,6 +31,7 @@
+ 
+ #ifdef HAVE_PNG
+ 
++#include "zlib.h"
+ #include "png.h"
+ 
+ /*** Stuff for PNG Dialog box ***/
+@@ -41,7 +42,9 @@
+ #define COMPRESSION   6 /* default zlib compression level, not max
+(Z_BEST_COMPRESSION) */
+ 
+-#define HAVE_tRNS  (info_ptr->valid & PNG_INFO_tRNS)
++/* old
++#define HAVE_tRNS  (info_ptr->valid & PNG_INFO_tRNS) */
++#define HAVE_tRNS  png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS)
+ 
+ #define DWIDE86
+ #define DHIGH104
+@@ -444,6 +447,10 @@
+   byte   *p, *png_line;
+   charsoftware[256];
+   char   *savecmnt;
++  /* for storing values until all are accumulated, so that the image header 
can be set in full */
++  int 
_bit_depth,_color_type,_interlace_type,_compression_type,_filter_type;
++  png_uint_32 _width,_height;
++  png_time_mod_time;
+ 
+   if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+png_xv_error, png_xv_warning)) == NULL) {
+@@ -458,7 +465,7 @@
+ FatalError(software);
+   }
+ 
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return -1;
+   }
+@@ -489,8 +496,8 @@
+ png_set_filter(png_ptr, 0, filter);
+   }
+ 
+-  info_ptr->width = w;
+-  info_ptr->height = h;
++  _width = w;
++  _height = h;
+   if (w <= 0 || h <= 0) {
+ SetISTR(ISTR_WARNING, "%s:  image dimensions out of range (%dx%d)",
+   fbasename, w, h);
+@@ -498,7 +505,7 @@
+ return -1;
+   }
+ 
+-  info_ptr->interlace_type = interCB.val ? 1 : 0;
++  _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE;
+ 
+   linesize = 0;   /* quiet a compiler warning */
+ 
+@@ -542,40 +549,44 @@
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return -1;
+   }
+-  info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-  info_ptr->bit_depth = 8;
++  _color_type = PNG_COLOR_TYPE_RGB;
++  _bit_depth = 8;
+ } else /* ptype == PIC8 */ {
+   linesize = w;
+-  info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
++  _color_type = PNG_COLOR_TYPE_PALETTE;
+   if (numuniqcols <= 2)
+-info_ptr->bit_depth = 1;
++_bit_depth = 1;
+   else
+   if (numuniqcols <= 4)
+-info_ptr->bit_depth = 2;
++_bit_depth = 2;
+   else
+   if (numuniqcols <= 16)
+-info_ptr->bit_depth = 4;
++_bit_depth = 4;
+   else
+-info_ptr->bit_depth = 8;
++_bit_depth = 8;
+ 
+   for (i = 0; i < numuniqcols; i++) {
+ palette[i].red   = r1[i];
+ palette[i].green = g1[i];
+ palette[i].blue  = b1[i];
+   }
+-  info_ptr->num_palette = numuniqcols;
+-  info_ptr->palette = palette;
++/* cannot find a setter for this, unsure if it is necessary anymore...
+   info_ptr->valid |= PNG_INFO_PLTE;
++*/
++  /* set the header just in case it's needed */
++  png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type,
++_interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT);
++  png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols);
+ }
+   }
+ 
+   else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) {
+-info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
++_color_type = PNG_COLOR_TYPE_GRAY;
+ if (colorType == F_BWDITHER) {
+   /* shouldn't happen */
+   if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()");
+ 
+-  info_ptr->bit_depth = 1;
++  _bit_depth = 1;
+   if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) {
+ remap[0] = 1;
+ remap[1] = 0;
+@@ -595,7 +606,7 @@
+   png_destroy_write_struct(&png_ptr, &info_ptr);
+   return -1;
+ }
+-info_ptr->bit_depth = 8;
++_bit_depth = 8;
+   }
+   else /* ptype == PIC8 */ {
+ int low_precision;
+@@ -617,7 +628,7 @@
+ f

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xv/

[Pacho Ramos]

commit: e16c5ac81dcadb45ade35551cdf911dd4c63c590
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  8 11:03:14 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 11:04:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e16c5ac8

media-gfx/xv: Fix png crashes (#521142 by Ian Schram)

Package-Manager: portage-2.2.24

 media-gfx/xv/xv-3.10a-r17.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/xv/xv-3.10a-r17.ebuild b/media-gfx/xv/xv-3.10a-r17.ebuild
index 62b9afb..01f3c7f 100644
--- a/media-gfx/xv/xv-3.10a-r17.ebuild
+++ b/media-gfx/xv/xv-3.10a-r17.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils flag-o-matic
 
 JUMBOV=20070520
-DESCRIPTION="An interactive image manipulation program that supports a wide 
variety of image formats"
+DESCRIPTION="Interactive image manipulation program supporting a wide variety 
of image formats"
 HOMEPAGE="http://www.trilon.com/xv/index.html 
http://www.sonic.net/~roelofs/greg_xv.html";
 SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
@@ -18,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc 
~x86 ~x86-fbsd ~x86
 IUSE="jpeg tiff png"
 
 DEPEND="x11-libs/libXt
-   jpeg? ( virtual/jpeg )
+   jpeg? ( virtual/jpeg:0 )
tiff? ( media-libs/tiff:0 )
png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )"
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/xv/

[Pacho Ramos]

commit: 8fe77ece3c79e2e4fdcafcae91da68a92fa5bff5
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  8 11:03:59 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 11:04:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe77ece

media-gfx/xv: Fix png crashes (#521142 by Ian Schram)

Package-Manager: portage-2.2.24

 media-gfx/xv/xv-3.10a-r17.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/xv/xv-3.10a-r17.ebuild b/media-gfx/xv/xv-3.10a-r17.ebuild
index 01f3c7f..fcb384e 100644
--- a/media-gfx/xv/xv-3.10a-r17.ebuild
+++ b/media-gfx/xv/xv-3.10a-r17.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils flag-o-matic
 
 JUMBOV=20070520
-DESCRIPTION="Interactive image manipulation program supporting a wide variety 
of image formats"
+DESCRIPTION="Interactive image manipulation program supporting a wide variety 
of formats"
 HOMEPAGE="http://www.trilon.com/xv/index.html 
http://www.sonic.net/~roelofs/greg_xv.html";
 SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Hüttel]

commit: 83e95a202c23e914e8ccbe73394a7c319b7a3c0b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Nov  1 13:04:16 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Nov  3 18:14:53 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e95a20

app-office/libreoffice: epatch_user

Package-Manager: portage-2.2.20.1

 app-office/libreoffice/libreoffice-4.4..ebuild | 1 +
 app-office/libreoffice/libreoffice-5.0.3.2.ebuild  | 1 +
 app-office/libreoffice/libreoffice-5.0..ebuild | 1 +
 app-office/libreoffice/libreoffice-.ebuild | 1 +
 4 files changed, 4 insertions(+)

diff --git a/app-office/libreoffice/libreoffice-4.4..ebuild 
b/app-office/libreoffice/libreoffice-4.4..ebuild
index e727334..863f7c9 100644
--- a/app-office/libreoffice/libreoffice-4.4..ebuild
+++ b/app-office/libreoffice/libreoffice-4.4..ebuild
@@ -352,6 +352,7 @@ src_prepare() {
fi
 
epatch "${PATCHES[@]}"
+   epatch_user
 
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh

diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild 
b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 7765a00..45dc032 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -343,6 +343,7 @@ src_prepare() {
fi
 
epatch "${PATCHES[@]}"
+   epatch_user
 
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh

diff --git a/app-office/libreoffice/libreoffice-5.0..ebuild 
b/app-office/libreoffice/libreoffice-5.0..ebuild
index 79f1fe4..4cc1a49 100644
--- a/app-office/libreoffice/libreoffice-5.0..ebuild
+++ b/app-office/libreoffice/libreoffice-5.0..ebuild
@@ -342,6 +342,7 @@ src_prepare() {
fi
 
epatch "${PATCHES[@]}"
+   epatch_user
 
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh

diff --git a/app-office/libreoffice/libreoffice-.ebuild 
b/app-office/libreoffice/libreoffice-.ebuild
index a8aafcf..3907338 100644
--- a/app-office/libreoffice/libreoffice-.ebuild
+++ b/app-office/libreoffice/libreoffice-.ebuild
@@ -336,6 +336,7 @@ src_prepare() {
fi
 
epatch "${PATCHES[@]}"
+   epatch_user
 
AT_M4DIR="m4" eautoreconf
# hack in the autogen.sh

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-l10n/

[Andreas Hüttel]

commit: 96993445565c5abfcd64c8c71a626a4422cd2ef9
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 31 17:05:12 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Nov  3 18:14:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96993445

app-office/libreoffice-l10n: Version bump, die

Package-Manager: portage-2.2.20.1

 app-office/libreoffice-l10n/Manifest   | 167 +
 3.2.ebuild => libreoffice-l10n-4.4.6.3.ebuild} |  26 ++--
 .../libreoffice-l10n-5.0.3.2.ebuild|  22 ++-
 3 files changed, 189 insertions(+), 26 deletions(-)

diff --git a/app-office/libreoffice-l10n/Manifest 
b/app-office/libreoffice-l10n/Manifest
index 68dd3eb..626e512 100644
--- a/app-office/libreoffice-l10n/Manifest
+++ b/app-office/libreoffice-l10n/Manifest
@@ -165,6 +165,173 @@ DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_xh.tar.gz 
506422 SHA256 e29bc60342
 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zh-CN.tar.gz 576705 SHA256 
00e9543c903e266883cb2ff5b7f5ebfd9a3422093e5e51b056ff438fd3e0789b SHA512 
30f9b0e53686efae34eb0dbac04a542919719c4d4c33e5bd96ed610ba2612a371568283225a6e7e1c7753f6c6ecce597c57cfcc138207fa60077d65c80ca88fa
 WHIRLPOOL 
6087d366bb111b1f581bdd28b9886de061f45f457dadd2bd12d6215e48034c939c1270f86c32a3d1d6634f940d626635bd18288e628eedcb4872539648440aac
 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zh-TW.tar.gz 573973 SHA256 
41dd6cebacf1bb54048e6b95f57d4f280930d27cb5360f63281b8fe689e040cc SHA512 
5bfddf487e5f02b3d1f38fd71f112812e0d720541940b2114d729a9373a01d2f264893484ef86887f60ff332cb5c6a9d69fcb64ac6ee3108e0f6196b8e3fd20b
 WHIRLPOOL 
31f2ad4d94ffd03dd439745c9a2805c00d904fdbcc3b694e3e8476c8787f2636efa007ee9c4f64fed6ac4e2fd7decf55415d07b532cff7f1a8c94c52a5cab88e
 DIST LibreOffice_4.4.5_Linux_x86_rpm_langpack_zu.tar.gz 508197 SHA256 
a5560bc63deb053bac8d63eb64f1150c34e3d206ffa605bda6735059b34f5418 SHA512 
2a8dca6a4f0fcab490466ece7d99bc1d3370257bcdf9246f954ac6b7b8efdcf3ebd16e7a0841c538169606e9c67064a9b9f9c40e564abc03f93c3af22b1606c1
 WHIRLPOOL 
57343e25f03cf57c02d8ea8a58325d96b986f7434dd15f2452d5b7507bd3ca7a32e4ea32f3fa682aea06f7c2d6bccb80bda8744154cac87ca7f319ad39fb54bf
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_am.tar.gz 7130072 SHA256 
aa1b68889e79e20173a40dede5a95c346ece0ab30062cf9d48915165b9860543 SHA512 
fbda18a953616869203408b01ccf6b1616da50c96538075f749f74530fe3a2539964662a5850fdefc8358541440d27f24aa0f7209c2ce1212b4214c84dcda6a3
 WHIRLPOOL 
be8bc41d2d633d342238e26b68102ab97baa26981252b9fc07f5d2b37d9197356412b25fbdda5ef3e2645616d2682d55e7591513b3175a71ff52d269f44f7629
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_ast.tar.gz 8026079 SHA256 
8724aa37ff6539b411f051b6fe1de6380bb3c6613719901e40219cd69d603b87 SHA512 
9dcd11b94160d47b45bfbeb5744bfb03b19bbeb031fce80835fe654ac5dfe21b64180df42ba604da1a51272c8c6f44a915e4150736c66d0854ba53ffd72df1a0
 WHIRLPOOL 
b4bef6ac229a6cb2cadaef92ce2435bb18edcdb7ee064cb353922a2f976d290ec4fda2e7fbc9060079cc64833678d920e6e8cc87a26e79e0129bb08d7a686afc
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bg.tar.gz 8260434 SHA256 
3e78c0aca908b2db4e21b09eca6b5ac217b64e8420f52e92ec8092b1555305ab SHA512 
58a446123e7e78452425e2a2aaf63ce562338fea2c6fa76806e101a6c20f413815bb0ddb61367ec7569aa5f7ea05f3ea2c83c0da0510e63f95a4c132c3072ab9
 WHIRLPOOL 
82d8e79d5952ced8e81c199e26054cadfff4040b6d63052cdc9e20c378936abd303b8a13b9cb2c5e00295c7674643993908e3da06ff91e1b3ab592e97c620264
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9828319 SHA256 
0f1f3b5a07babe583edaa375320cd6658891124d85264a8a3ec5d8971290defd SHA512 
445fb48719c25251773bf2d3d982ab1ac52e9cfb7fa24dfa6b6a6d0481b7c148338df6fcbe79327935b245f1185ae5a92b106b6f15704501b48bf4d1c682688b
 WHIRLPOOL 
9081f6da7297d3b1b4993f9f9151c6a9b2ccf9e0e999b97546077f0b2b86c637ca99160d45f537721408535eed95b0e37d3b1392eaea35a4f5c69ff161ffbad8
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bn.tar.gz 9828749 SHA256 
a280a56cf4eb56563d5e8d4b2fbd51e1d3e5f7223d5cffb909003e13fe95934c SHA512 
1b0ff34bea2ad059aee46dcee95bb820da165fb94ae2d908fa61b2832f94a51dbba6508ac2f85319b5a715726328a27bb3fbdada05c98130c50d848a4d1b1417
 WHIRLPOOL 
3d3bf50bdc7d3b0f9798ddaf45731e10b7ceaa97730dd130cdfe62ec3ce48f2c90fc75bcd7d08c40ff15d93b9988eaffac11c00254915c35ec0a560ddf79b33b
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bo.tar.gz 9495858 SHA256 
6980e7ba80a8037a6da78fe4844b3b014f53f9f4b265effe07eba1b660823ebb SHA512 
c25aaf6a4427ff2abcea5a3eafb4c6b459485e0fb81aa1dfe917a37ff88a050f98036b08230edd16dbf7726aa28895eef0a4bbda1b9fa494a7b7e47a3e1e8b90
 WHIRLPOOL 
e43e5ff4b4f26d50020ab0b0c081d2e553e7846cc6bebc00b223ab44393a73afabf572a5b7ab1c82665156e250c44876517cce4f34ae7d2b161632cf9d7ae433
+DIST LibreOffice_4.4.6.3_Linux_x86_rpm_helppack_bs.tar.gz 7098865 SHA256 
9b048d48a8b3abff8abba5f032e7d5d372c93b8502995518f9e42272d9c1e969 SHA512 
ad0754d053c278bbd2e3770bd848411b6ef459587079323875f30426c825947bbeee07032e270b966d8faac96972766e1f8851eece17a75f61fa9472aa32454e
 WHIRL

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Hüttel]

commit: b6e6b150747773773b55016e5dfee6a3304ec337
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Mon Oct 26 02:08:35 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Nov  3 18:14:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e6b150

app-office/libreoffice: Version bump to 4.4.6.3 final release

Package-Manager: portage-2.2.23

 app-office/libreoffice/Manifest   |   2 +
 app-office/libreoffice/libreoffice-4.4.6.3.ebuild | 618 ++
 2 files changed, 620 insertions(+)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index d8db86e..cf5d401 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -7,9 +7,11 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 
SHA256 1fb458d6aab0
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 WHIRLPOOL 
60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 
1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 
d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305
 WHIRLPOOL 
95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
 DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 
3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 
15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b
 WHIRLPOOL 
a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
+DIST libreoffice-4.4.6.3.tar.xz 164742068 SHA256 
3f1bd66fedc34d60448f74e864c1cb79c3e44aeadbd1d0bb9544011d29f422ac SHA512 
ffdbe9b46622d30b176f3120e84cd9bd3d0ea35b2759e1886bc3038455bf63a09305cc9c6ceba9e02a6279e12859c78e689ddfe02d60585115ebb0d3787db8bd
 WHIRLPOOL 
9ce888415d9366e0402ac9d6bbb189d41a9bf42aa49bd8b1c90ef9071fbdb5ce4da7bd7029efcf538fd6cf4ec412d246e943b29cffbbd53499d50065103e2566
 DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 
01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 
7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce
 WHIRLPOOL 
85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
 DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 
77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 
fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62
 WHIRLPOOL 
2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece7f99b1093e813249433684725f3287d0
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 
22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 WHIRLPOOL 
1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
 DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 
66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 
0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869
 WHIRLPOOL 
2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
+DIST libreoffice-help-4.4.6.3.tar.xz 1875828 SHA256 
d3b18c7dc4c68d152c298498f014e82183ade008d9d64a74353df306b286818b SHA512 
6871252079738c7c1a44a17dba6aa842411c1c0a7e92a92dcfa3afe0e314edf9ba4d277bacbc558cf26362e94ff1e8370c91a00f81aee697528ba359f5559a3c
 WHIRLPOOL 
2383ce2bf9a52529d7a4d34e8eeb3ea3d74ec547375ab8cb5556e694519976121528019f53ebd287d07ef40dd19a946acdf469ce0b75301c4ed51fc0add6f6f0
 DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 
4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 
1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313
 WHIRLPOOL 
8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
 DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 
7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 
73de5507b0e7994

[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-l10n/, app-office/libreoffice/

[Andreas Hüttel]

commit: 75193255f81cf46501601c0cfb7271e76404d074
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Nov  3 18:19:11 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Nov  3 18:20:03 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75193255

app-office/libreoffice: 5.0.3.2 released, restore KEYWORDS

Package-Manager: portage-2.2.20.1

 app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild | 2 +-
 app-office/libreoffice/libreoffice-5.0.3.2.ebuild   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild 
b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild
index d22c2b5..4d670b7 100644
--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild
+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.3.2.ebuild
@@ -15,7 +15,7 @@ 
BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/
 
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="offlinehelp"
 
 #

diff --git a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild 
b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
index 45dc032..0c4db0e 100644
--- a/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2.ebuild
@@ -96,8 +96,7 @@ unset lo_xt
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == ** ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
${PYTHON_DEPS}

[gentoo-commits] repo/gentoo:master commit in: /

[Andreas Hüttel]

commit: 988247bc25d24304cd9c5cb129f11d331c0e13c8
Author: Andreas K. Huettel (dilfridge)  gentoo  org>
AuthorDate: Sun Nov  8 11:06:41 2015 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun Nov  8 11:06:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=988247bc

Merge remote-tracking branch 'github/pr/323'

 app-office/libreoffice-l10n/Manifest   | 167 +
 3.2.ebuild => libreoffice-l10n-4.4.6.3.ebuild} |  26 ++--
 .../libreoffice-l10n-5.0.3.2.ebuild|  24 ++-
 app-office/libreoffice/Manifest|   2 +
 ...-4.4..ebuild => libreoffice-4.4.6.3.ebuild} |   1 +
 app-office/libreoffice/libreoffice-4.4..ebuild |   1 +
 app-office/libreoffice/libreoffice-5.0.3.2.ebuild  |   4 +-
 app-office/libreoffice/libreoffice-5.0..ebuild |   1 +
 app-office/libreoffice/libreoffice-.ebuild |   1 +
 9 files changed, 198 insertions(+), 29 deletions(-)

[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxklavier/

[Manuel Rüger]

commit: 2aa50489fa354b99d3f7e03b18d1a75d4d8dfeb4
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 11:13:36 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 11:13:36 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aa50489

x11-libs/libxklavier: Remove old

Package-Manager: portage-2.2.24

 x11-libs/libxklavier/Manifest |  1 -
 x11-libs/libxklavier/libxklavier-5.2.1.ebuild | 49 ---
 2 files changed, 50 deletions(-)

diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index fbdf480..8f2d0b3 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,2 +1 @@
-DIST libxklavier-5.2.1.tar.xz 312944 SHA256 
a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e SHA512 
8e69b8129cfbf2e2649dc81c49dd168e31a095ea9f8b2c4b5c01ffb97533d4556fa25ad3e17ecaa6b207ebaabdd9ac6f9e629561c8b9bbf890a7d3247d039f33
 WHIRLPOOL 
e2bf2959349552f0bd5f0d062f18f092701589d467cafc18c4c526150d339f8e3c706ca2c37c476a31161f5492fb7ac3105f1076cf540b1296c72577f0ec5143
 DIST libxklavier-5.3.tar.xz 315684 SHA256 
ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404 SHA512 
7bec94aeedbe80aec2c44c9e2a3b7ea170618970fff3c1b5e677f1b292241e208b74eabd825d477eeab25bb0ee1d27f9b55f986a19ea8aacb078651a0c83b289
 WHIRLPOOL 
e9f64343e750397e2ec55311ce8ed650bfb71fb09eccdf3563cd8ac5a83f4203d79d00695978f7d27c0a91a03d67fd29c4842b401fc8b23621121cd9e9b0d84b

diff --git a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild 
b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
deleted file mode 100644
index 3ab1e7d..000
--- a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit gnome.org libtool
-
-DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier";
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +introspection"
-
-RDEPEND="app-text/iso-codes
-   >=dev-libs/glib-2.16
-   dev-libs/libxml2
-   x11-apps/xkbcomp
-   x11-libs/libX11
-   >=x11-libs/libXi-1.1.3
-   x11-libs/libxkbfile
-   >=x11-misc/xkeyboard-config-2.4.1-r3
-   introspection? ( >=dev-libs/gobject-introspection-1.30 )"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-   sys-devel/gettext
-   doc? ( >=dev-util/gtk-doc-1.4 )"
-
-DOCS="AUTHORS ChangeLog CREDITS NEWS README"
-
-src_prepare() {
-   elibtoolize
-}
-
-src_configure() {
-   econf \
-   --disable-static \
-   $(use_enable introspection) \
-   $(use_enable doc gtk-doc) \
-   --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
-   --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
-   --with-xkb-bin-base="${EPREFIX}"/usr/bin
-}
-
-src_install() {
-   default
-   find "${ED}" -name '*.la' -exec rm -f {} +
-}

[gentoo-commits] repo/gentoo:master commit in: www-client/firefox/

[Jeroen Roovers]

commit: de5270dc63e5c8b794899541b50883d2290b2956
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Nov  8 11:14:41 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Nov  8 11:14:55 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de5270dc

www-client/firefox: Stable for PPC64 (bug #564818).

Package-Manager: portage-2.2.24
RepoMan-Options: --ignore-arches

 www-client/firefox/firefox-38.4.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-client/firefox/firefox-38.4.0.ebuild 
b/www-client/firefox/firefox-38.4.0.ebuild
index 7089418..0a47f9e 100644
--- a/www-client/firefox/firefox-38.4.0.ebuild
+++ b/www-client/firefox/firefox-38.4.0.ebuild
@@ -38,7 +38,7 @@ inherit check-reqs flag-o-matic toolchain-funcs eutils 
gnome2-utils mozconfig-v6
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox";
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"

[gentoo-commits] repo/gentoo:master commit in: dev-libs/DirectFB/

[Pacho Ramos]

commit: 3c621d3e668c28aff11bead9c63b5e8bdc28bae2
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  8 12:08:48 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  8 12:08:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c621d3e

dev-libs/DirectFB: Drop versions relying on libsvg (#537918)

Package-Manager: portage-2.2.24

 dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild | 151 --
 dev-libs/DirectFB/DirectFB-1.7.1.ebuild| 201 -
 dev-libs/DirectFB/DirectFB-1.7.5.ebuild| 201 -
 dev-libs/DirectFB/Manifest |   3 -
 4 files changed, 556 deletions(-)

diff --git a/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild 
b/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild
deleted file mode 100644
index 59a5e29..000
--- a/dev-libs/DirectFB/DirectFB-1.6.3-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-# Map Gentoo IUSE expand vars to DirectFB drivers
-# echo `sed -n '/Possible gfxdrivers are:/,/^$/{/Possible/d;s:\[ 
*::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_intel="i810,i830"
-I_TO_D_mga="matrox"
-I_TO_D_r128="ati128"
-I_TO_D_s3="unichrome"
-I_TO_D_sis="sis315"
-I_TO_D_via="cle266"
-# cyber5k davinci ep9x omap pxa3xx sh772x savage pvr2d
-IUSE_VIDEO_CARDS=" intel mach64 mga neomagic nsc nvidia r128 radeon s3 sis 
tdfx via vmware"
-IUV=${IUSE_VIDEO_CARDS// / video_cards_}
-# echo `sed -n '/Possible inputdrivers are:/,/^$/{/\(Possible\|^input\)/d;s:\[ 
*::;s:\].*::;s:,::g;p}' configure.in`
-I_TO_D_elo2300="elo-input"
-I_TO_D_evdev="linuxinput"
-I_TO_D_mouse="ps2mouse,serialmouse"
-# dbox2remote dreamboxremote gunze h3600_ts penmount sonypijogdial ucb1x00 
wm97xx zytronic
-IUSE_INPUT_DEVICES=" dynapro elo2300 evdev joystick keyboard lirc mouse 
mutouch tslib"
-IUD=${IUSE_INPUT_DEVICES// / input_devices_}
-
-DESCRIPTION="Thin library on top of the Linux framebuffer devices"
-HOMEPAGE="http://www.directfb.org/";
-SRC_URI="http://directfb.org/downloads/Core/${PN}-${PV:0:3}/${P}.tar.gz
-   http://directfb.org/downloads/Old/${P}.tar.gz";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 -mips ~ppc ~ppc64 ~sh -sparc ~x86"
-IUSE="bmp debug +dynload doc fbcon gif gles2 imlib2 input_hub jpeg jpeg2k 
cpu_flags_x86_mmx mng mpeg2 multicore opengl png pnm sdl cpu_flags_x86_sse 
static-libs svg truetype v4l vdpau X zlib ${IUV} ${IUD}"
-REQUIRED_USE="gles2? ( opengl )"
-
-# gstreamer useflag broken
-# gstreamer? ( media-libs/FusionSound media-libs/gst-plugins-base:0.10 )
-#  $(use_enable gstreamer) \
-RDEPEND="
-   gif? ( media-libs/giflib )
-   imlib2? ( media-libs/imlib2 )
-   jpeg? ( virtual/jpeg )
-   jpeg2k? ( media-libs/jasper[jpeg] )
-   mng? ( media-libs/libmng )
-   opengl? ( media-libs/mesa[gbm,egl,gles2?] x11-libs/libdrm )
-   png? ( media-libs/libpng:0 )
-   sdl? ( media-libs/libsdl )
-   svg? ( x11-libs/libsvg-cairo )
-   truetype? ( >=media-libs/freetype-2.0.1 )
-   vdpau? ( x11-proto/xproto x11-libs/libX11 x11-libs/libXext 
x11-libs/libvdpau )
-   X? ( x11-libs/libXext x11-libs/libX11 )
-   zlib? ( sys-libs/zlib ) "
-DEPEND="${RDEPEND}
-   X? ( x11-proto/xextproto x11-proto/xproto )"
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}"/${P}-flags.patch \
-   "${FILESDIR}"/${P}-pkgconfig.patch \
-   "${FILESDIR}"/${P}-build.patch \
-   "${FILESDIR}"/${P}-setregion.patch \
-   
"${FILESDIR}"/${P}-atomic-fix-compiler-error-when-building-for-thumb2.patch
-
-   mv configure.{in,ac} || die
-   eautoreconf
-}
-
-driver_list() {
-   local pfx=$1
-   local dev devs map
-   shift
-   for dev in "$@" ; do
-   use ${pfx}_${dev} || continue
-   map="I_TO_D_${dev}"
-   devs=${devs:+${devs},}${!map:-${dev}}
-   done
-   echo ${devs:-none}
-}
-
-src_configure() {
-   local sdlconf="--disable-sdl"
-   if use sdl ; then
-   # since SDL can link against DirectFB and trigger a
-   # dependency loop, only link against SDL if it isn't
-   # broken #61592
-   echo 'int main(){}' > sdl-test.c
-   $(tc-getCC) sdl-test.c -lSDL 2>/dev/null \
-   && sdlconf="--enable-sdl" \
-   || ewarn "Disabling SDL since libSDL.so is broken"
-   fi
-
-   # fix --with-gfxdrivers= logic, because opengl, vdpau and gles2 are no 
video_cards
-   local gfxdrivers="$(driver_list video_cards ${IUSE_VIDEO_CARDS})"
-   use opengl && gfxdrivers="${gfxdrivers},gl"
-   use vdpau && gfxdrivers="${gfxdrivers},vdpau"
-   use gles2 && gfxdrivers="${gfxdrivers},gles2"
-   gfxdrivers="$(echo ${gfxdrivers} | sed 's/none,//')"
-
-  

[gentoo-commits] proj/kde:master commit in: kde-apps/oxygen-icons/

[Manuel Rüger]

commit: 09861e487e4bd80505a0b199068a6feb060e6dc2
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov  7 23:19:24 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 12:23:37 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=09861e48

kde-apps/oxygen-icons: Package returns, in git

Package-Manager: portage-2.2.20.1

 kde-apps/oxygen-icons/metadata.xml |  5 +
 kde-apps/oxygen-icons/oxygen-icons-.ebuild | 19 +++
 2 files changed, 24 insertions(+)

diff --git a/kde-apps/oxygen-icons/metadata.xml 
b/kde-apps/oxygen-icons/metadata.xml
new file mode 100644
index 000..a23f444
--- /dev/null
+++ b/kde-apps/oxygen-icons/metadata.xml
@@ -0,0 +1,5 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   kde
+

diff --git a/kde-apps/oxygen-icons/oxygen-icons-.ebuild 
b/kde-apps/oxygen-icons/oxygen-icons-.ebuild
new file mode 100644
index 000..ff7387a
--- /dev/null
+++ b/kde-apps/oxygen-icons/oxygen-icons-.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="oxygen-icons5"
+KDE_AUTODEPS="false"
+inherit kde5
+
+DESCRIPTION="Oxygen SVG icon theme"
+HOMEPAGE="https://kde.org/";
+
+LICENSE="LGPL-3"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="$(add_frameworks_dep extra-cmake-modules)"
+RDEPEND="!kde-apps/oxygen-icons:4"

[gentoo-commits] proj/kde:master commit in: sets/

[Manuel Rüger]

commit: e9b4ac509ba1591f643dc31132142f406827c6bd
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov  7 22:15:31 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 12:24:31 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e9b4ac50

sets: Update kdemultimedia-live

 sets/kdemultimedia-live | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sets/kdemultimedia-live b/sets/kdemultimedia-live
index 847c520..b42103f 100644
--- a/sets/kdemultimedia-live
+++ b/sets/kdemultimedia-live
@@ -1,3 +1,4 @@
 ~kde-apps/dragon-
+~kde-apps/ffmpegthumbs-
 ~kde-apps/kdenlive-
 ~kde-apps/kmix-

[gentoo-commits] proj/kde:master commit in: kde-apps/ffmpegthumbs/

[Manuel Rüger]

commit: 9f5a559d0c468c9b6338cd25fa87a64b3ca4ad27
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov  7 22:13:02 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 12:24:31 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f5a559d

kde-apps/ffmpegthumbs: Frameworks merged to master

Package-Manager: portage-2.2.20.1

 .../ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild |  2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-5..ebuild   | 22 --
 kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild | 14 --
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
index 17786aa..f1739b8 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit kde4-base
 
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files"
+DESCRIPTION="An FFmpeg based thumbnail generator for video files"
 KEYWORDS=""
 IUSE="debug"
 

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-5..ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-5..ebuild
deleted file mode 100644
index 1eac824..000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-5..ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-   $(add_frameworks_dep kio)
-   dev-qt/qtgui:5
-   virtual/ffmpeg"
-
-DEPEND="
-   ${RDEPEND}
-   virtual/pkgconfig
-"

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
index 17786aa..2d40cc9 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
@@ -4,15 +4,17 @@
 
 EAPI=5
 
-inherit kde4-base
+inherit kde5
 
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files"
+DESCRIPTION="An FFmpeg based thumbnail generator for video files"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
-DEPEND="
+RDEPEND="
+   $(add_frameworks_dep kio)
+   dev-qt/qtgui:5
virtual/ffmpeg
 "
-RDEPEND="${DEPEND}
-   $(add_kdeapps_dep kdebase-kioslaves)
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
 "

[gentoo-commits] proj/kde:master commit in: kde-apps/ffmpegthumbs/

[Manuel Rüger]

commit: 38cdf968955f32d99ee81dbe81b15592236c4b0d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 12:26:35 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 12:26:35 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=38cdf968

kde-apps/ffmpegthumbs: Fix DESC

Package-Manager: portage-2.2.24

 kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild | 2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
index f1739b8..0a2f8ba 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit kde4-base
 
-DESCRIPTION="An FFmpeg based thumbnail generator for video files"
+DESCRIPTION="A FFmpeg based thumbnail generator for video files"
 KEYWORDS=""
 IUSE="debug"
 

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
index 2d40cc9..a366fea 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit kde5
 
-DESCRIPTION="An FFmpeg based thumbnail generator for video files"
+DESCRIPTION="A FFmpeg based thumbnail generator for video files"
 KEYWORDS=""
 IUSE=""
 

[gentoo-commits] proj/kde:master commit in: kde-apps/ffmpegthumbs/

[Manuel Rüger]

commit: bd3cc2617041fb1fe82715ce040f562f613a5071
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 12:33:02 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 12:33:02 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bd3cc261

kde-apps/ffmpegthumbs: Fix DESC again

Package-Manager: portage-2.2.24

 kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild | 2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
index 0a2f8ba..7e8a621 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49..ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit kde4-base
 
-DESCRIPTION="A FFmpeg based thumbnail generator for video files"
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
 KEYWORDS=""
 IUSE="debug"
 

diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild 
b/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
index a366fea..edf0418 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit kde5
 
-DESCRIPTION="A FFmpeg based thumbnail generator for video files"
+DESCRIPTION="FFmpeg based thumbnail generator for video files"
 KEYWORDS=""
 IUSE=""
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/gtk-gnutella/

[Hans de Graaff]

commit: 020379943392bc2b3daf62fe293802689d795265
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Nov  8 14:03:13 2015 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Nov  8 14:03:31 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02037994

net-p2p/gtk-gnutella: add 1.1.6

Package-Manager: portage-2.2.20.1

 net-p2p/gtk-gnutella/Manifest  |  1 +
 net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index aaeed41..f741761 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,2 +1,3 @@
 DIST gtk-gnutella-1.1.3.tar.bz2 19504243 SHA256 
2659ddb846f60d13789674e926a71bbb4a8b9d3ca98c6b034a95eaa073531405 SHA512 
df143b6e89b0a4c6e8ddbba24ddcab3603f04e7df1fab7d389241a112c6cd3297e4837dfc0d225289997b99867a5466a5b8697c68ef2bdc5817261fbc103d505
 WHIRLPOOL 
fe1a1375e75204bdf92c9690f1885211dc456c2cc466f4d7e47c865fc0e1c77ce07d27b58ff2e53c4c28214d055878c7d805f0b79043748e1448c6b8ac398c82
 DIST gtk-gnutella-1.1.5.tar.bz2 19552392 SHA256 
c332043a885ba302841a261c118264d903627fd21b062c99538db7dc7dada8a5 SHA512 
eb94ef5cbc447ebf75d16eb24f0a4d88197a9b79f842fe73f963af3ba5985cc4ce99605d29e33123754d9a509218b71acc684df27a075c3947278211c1b204e5
 WHIRLPOOL 
c5bc302dd7bd92eac2298c52b557723b473a930a7e1b40cddc74424bef7acf0a9b90f27ba503dc40038c925047dfcf6f80ca8de2f0e20a6429d70267de3ada49
+DIST gtk-gnutella-1.1.6.tar.bz2 19571757 SHA256 
b755250f6b8af65b449f20e4dac77a677c1c3fd52f603dc9cd82b035740974c3 SHA512 
ade3c8e8a776b4ff9351ad60b307f421f804c423811ea2bc7639656e3623fb95c1041c235578e07009c07f7c85911db72b9c17e04fca65a1661c8492c396069f
 WHIRLPOOL 
857578452335885de3f918d54c663cd4d7beb1a3cad7970bf74f796866f3754c66d7a59e64bb2b1400eacb9413c47de51f29d41ef2178916a3cfd6d9e57294fe

diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild 
b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
new file mode 100644
index 000..154b509
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/";
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+   dev-libs/glib:2
+   sys-libs/zlib
+   gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+   dbus? ( >=sys-apps/dbus-0.35.2 )
+   ssl? ( >=net-libs/gnutls-2.2.5 )
+   nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+
+src_prepare() {
+   strip-linguas -i po
+
+   echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+   for ling in ${LINGUAS}; do
+   echo $ling >> po/LINGUAS
+   done
+}
+
+src_configure() {
+   # There is no option to turn off optimization through the build.sh
+   # script.
+   sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh 
|| die
+
+   # The build script does not support the equivalent --enable
+   # options so we must construct the configuration by hand.
+
+   local myconf
+
+   if ! use nls; then
+   myconf="${myconf} --disable-nls"
+   fi
+
+   if ! use dbus; then
+   myconf="${myconf} --disable-dbus"
+   fi
+
+   if ! use ssl; then
+   myconf="${myconf} --disable-gnutls"
+   fi
+
+   if use gtk; then
+   myconf="${myconf} --gtk2"
+   else
+   myconf="${myconf} --topless"
+   fi
+
+   ./build.sh \
+   --configure-only \
+   --prefix="/usr" \
+   --cc=$(tc-getCC) \
+   ${myconf}
+}
+
+src_compile() {
+   # Build system is not parallel-safe, bug 500760
+   emake -j1
+}
+
+src_install() {
+   dodir /usr/bin
+   emake INSTALL_PREFIX="${D}" install || die "Install failed"
+   dodoc AUTHORS ChangeLog README TODO
+
+   # Touch the symbols file into the future to avoid warnings from
+   # gtk-gnutella later on, since we will most likely strip the binary.
+   touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" 
|| die
+}

[gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/, net-im/jabberd2/files/

[Julian Ospald]

commit: 4cb2fcb5bc035a5e7e1d694449ff81166d9eaf7d
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Nov  8 14:07:02 2015 +
Commit: Julian Ospald  gentoo  org>
CommitDate: Sun Nov  8 14:08:49 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb2fcb5

net-im/jabberd2: version bump to 2.3.4

 net-im/jabberd2/Manifest   |   1 +
 .../files/jabberd2-2.3.4-optimization.patch|  21 +++
 .../jabberd2/files/jabberd2-2.3.4-websocket.patch  |  31 
 net-im/jabberd2/jabberd2-2.3.4.ebuild  | 180 +
 net-im/jabberd2/metadata.xml   |   4 +-
 5 files changed, 235 insertions(+), 2 deletions(-)

diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 176fa40..6398f31 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,3 +1,4 @@
 DIST jabberd-2.3.1.tar.xz 1460088 SHA256 
feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 
93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c
 WHIRLPOOL 
667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
 DIST jabberd-2.3.2.tar.xz 1473436 SHA256 
ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 
10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03
 WHIRLPOOL 
42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
 DIST jabberd-2.3.3.tar.xz 1457340 SHA256 
c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 
c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da
 WHIRLPOOL 
0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463
+DIST jabberd-2.3.4.tar.xz 1482736 SHA256 
9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 SHA512 
593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f
 WHIRLPOOL 
67a0e96a872a08975d981e1697fab5cf154b4cbea4c698d41d250c1314bc7303a3c15e871fc8b3c4f3769acd91773734ef61b880900132e435d17f9bde587b08

diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch 
b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
new file mode 100644
index 000..4808162
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch
@@ -0,0 +1,21 @@
+Re-allow the use of O3/Os, since it seems to have been an old compiler
+bug.
+
+See https://github.com/jabberd2/jabberd2/issues/34
+
+--- configure.ac
 configure.ac
+@@ -23,13 +23,6 @@
+ LIBS="$LIBS $lt_cv_dlopen_libs"
+ fi
+ 
+-# check for optimisation level
+-AC_MSG_CHECKING([CFLAGS optimization level])
+-[if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then]
+-AC_MSG_ERROR([maximum allowed optimization level is -O2])
+-fi
+-AC_MSG_RESULT([fine])
+-
+ # extra paths
+ AC_ARG_WITH([extra_include_path], AC_HELP_STRING([--with-extra-include-path],
+[use additional include paths]),

diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch 
b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
new file mode 100644
index 000..a6f932c
--- /dev/null
+++ b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch
@@ -0,0 +1,31 @@
+From b861b9c72adc732cbdfbac4eb8a4205126227f6b Mon Sep 17 00:00:00 2001
+From: Tomasz Sterna 
+Date: Fri, 30 Oct 2015 12:40:32 +0100
+Subject: [PATCH] Enable USE_WEBSOCKET check in SX plugins
+
+---
+ sx/plugins.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sx/plugins.h b/sx/plugins.h
+index b5d3934..65dae93 100644
+--- a/sx/plugins.h
 b/sx/plugins.h
+@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st {
+ JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args);
+ 
+ /* websocket wrapper plugin */
+-//#ifdef USE_WEBSOCKET
++#ifdef USE_WEBSOCKET
+ #include 
+ #include 
+ 
+@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st {
+ xht headers;
+ void*frame;
+ } *_sx_websocket_conn_t;
+-//#endif
++#endif
+ 
+ #ifdef __cplusplus
+ }

diff --git a/net-im/jabberd2/jabberd2-2.3.4.ebuild 
b/net-im/jabberd2/jabberd2-2.3.4.ebuild
new file mode 100644
index 000..ee6f078
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.4.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools db-use eutils flag-o-matic pam
+
+DESCRIPTION="Open Source Jabber Server"
+HOMEPAGE="http://jabberd2.org";
+SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabber

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/sparc/

[Julian Ospald]

commit: 4a8ba7ea8bab265ad684e98c8a77408a6b533ab2
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Nov  8 14:12:14 2015 +
Commit: Julian Ospald  gentoo  org>
CommitDate: Sun Nov  8 14:12:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8ba7ea

profiles: mask websocket USE flag for net-im/jabberd2 on sparc

 profiles/arch/sparc/package.use.mask | 4 
 1 file changed, 4 insertions(+)

diff --git a/profiles/arch/sparc/package.use.mask 
b/profiles/arch/sparc/package.use.mask
index 669c685..6bfa424 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -2,6 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Julian Ospald  (08 Nov 2015)
+# Requires net-libs/http-parser
+net-im/jabberd2 websocket
+
 # Davide Pesavento  (26 Oct 2015)
 # Tests require non-keyworded qt5
 dev-qt/qtchooser test

[gentoo-commits] proj/kde-sunset:master commit in: media-gfx/gwenview/

[Michael Palimaka]

commit: 734abb4e11ffae661ad972933a8bba6d0b88389c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Nov  8 14:21:13 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov  8 14:21:13 2015 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=734abb4e

media-gfx/gwenview: move EAPI to correct line

 media-gfx/gwenview/gwenview-1.4.2-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild 
b/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild
index 784a500..1d3eff4 100644
--- a/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild
+++ b/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: 
/var/cvsroot/gentoo-x86/media-gfx/gwenview/gwenview-1.4.2-r3.ebuild,v 1.1 
2009/06/18 09:23:37 pva Exp $
 
-ARTS_REQUIRED="never"
-
 EAPI="1"
 
+ARTS_REQUIRED="never"
+
 inherit kde
 
 MY_P=${P/_/}

[gentoo-commits] proj/kde-sunset:master commit in: x11-themes/gtk-engines-qt/

[Michael Palimaka]

commit: 65a696dce0807014a4b16366aab7bbfca585442a
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Nov  8 14:23:56 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Nov  8 14:23:56 2015 +
URL:https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=65a696dc

x11-themes/gtk-engines-qt: untested EAPI bump for cmake-utils compatibility

 x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild 
b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
index 457915d..2206fea 100644
--- a/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
+++ b/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: 
/var/cvsroot/gentoo-x86/x11-themes/gtk-engines-qt/gtk-engines-qt-0.8-r4.ebuild,v
 1.7 2009/06/13 23:04:56 scarabeus Exp $
 
-EAPI=1
+EAPI=5
 
 ARTS_REQUIRED="never"
 

[gentoo-commits] proj/netifrc:master commit in: init.d/

[Robin H. Johnson]

commit: 756591785d521af36a30b5a74d58be733a94e596
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:09:33 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:09:33 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=75659178

New functions: set/get/is_interface_type to persistently track type of 
interfaces despite conf.d/net changes.

Signed-off-by: Robin H. Johnson  gentoo.org>

 init.d/net.lo.in | 12 
 1 file changed, 12 insertions(+)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 2611e3e..31a45e6 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -536,6 +536,18 @@ interface_down()
 {
_run_if _down "$@"
 }
+set_interface_type()
+{
+   service_set_value iface_type "$@"
+}
+get_interface_type()
+{
+   ( RC_SVCNAME="net.$IFACE" service_get_value iface_type )
+}
+is_interface_type()
+{
+   [ "$(get_interface_type)" = "$1" ]
+}
 
 start()
 {

[gentoo-commits] proj/netifrc:master commit in: init.d/

[Robin H. Johnson]

commit: e65e9b5065f6c11f89428ec3788c49ed1422d9ba
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:08:09 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:08:09 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=e65e9b50

Update copyright on net.lo.in for significent gentoo changes.

Signed-off-by: Robin H. Johnson  gentoo.org>

 init.d/net.lo.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index e883f98..2611e3e 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -1,5 +1,6 @@
 #!@SBINDIR@/runscript
 # Copyright (c) 2007-2009 Roy Marples 
+# Copyright (c) 2010-2015 Gentoo Foundation
 # Released under the 2-clause BSD license.
 
 SHDIR="@LIBEXECDIR@/sh"

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 570d7ccac8617feb65539e30fcc074743902d058
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Sun Nov  8 00:18:10 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 00:18:10 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=570d7cca

Merge pull request #15 from alonbl/bridge

net: bridge: support iproute2 without emulation

 doc/net.example.Linux.in |   8 ++-
 net/bridge.sh| 181 ---
 2 files changed, 80 insertions(+), 109 deletions(-)

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: f9f59bf2e3b6b5eb50dedec4c3372595dfd03658
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:10:10 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:10:10 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=f9f59bf2

TODO: Document more interface types we need to support.

Signed-off-by: Robin H. Johnson  gentoo.org>

 TODO | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/TODO b/TODO
index e19f27a..f8d8902 100644
--- a/TODO
+++ b/TODO
@@ -11,4 +11,23 @@
- rem vlan1 - _ifindex (eth0=0,vlan2=1)
- add vlan3 - _ifindex (eth0=0,vlan2=1,vlan3=2)
Now your routing table has entries for both vlan2 and vlan3 with a 
metric of 2.
+- Support many more device types easily:
+  - Dummy: ip link add dev dummy1 type dummy
+  - HSR: ip link add name hsr0 type hsr slave1 dummy3 slave2 dummy4
+  - VXLAN: ip link add link dummy2 name vxlan199 type vxlan id 199 dev dummy2 
group 224.2.0.199 dstport 4789
+  - IPVLAN: ...
+  - IFB: ip link add ifb0 type ifb 
+  - CAN:
+  - VCAN:
+  - ip6tnl:
+  - gre,gretap:
+  - ip6gre,ip6gretap:
+  - vti:
+  - nlmon: ip link add nlmon0 type nlmon
+  - ipvlan: ...
+  - lowpan:
+  - macvtap:
+  - ipoib: ..
+  - geneve: ip link add gen0 type geneve id 0 remote 192.168.53.53
+
 

[gentoo-commits] proj/netifrc:master commit in: /, net/, doc/

[Robin H. Johnson]

commit: 2ce8b833812e5db9de7cf1543dd6499b4077db21
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:29:50 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:29:50 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=2ce8b833

New interace type: HSR.

Signed-off-by: Robin H. Johnson  gentoo.org>

 TODO |  1 -
 doc/net.example.Linux.in |  6 ++
 net/hsr.sh   | 56 
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 64f62e2..023bbb4 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,6 @@
- add vlan3 - _ifindex (eth0=0,vlan2=1,vlan3=2)
Now your routing table has entries for both vlan2 and vlan3 with a 
metric of 2.
 - Support many more device types easily:
-  - HSR: ip link add name hsr0 type hsr slave1 dummy3 slave2 dummy4
   - VXLAN: ip link add link dummy2 name vxlan199 type vxlan id 199 dev dummy2 
group 224.2.0.199 dstport 4789
   - IPVLAN: ...
   - IFB: ip link add ifb0 type ifb 

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 1eaebac..6059301 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -159,6 +159,12 @@
 #
 # Dummy network interface:
 #type_dummy0=dummy
+#
+# HSR: High-availability Seamless Redundancy
+#type_hsr0=hsr
+#hsr_slave1=eth0
+#hsr_slave2=eth1
+#hsr_supervision=99 # Byte value
 
 #-
 # WIRELESS (802.11 support)

diff --git a/net/hsr.sh b/net/hsr.sh
new file mode 100644
index 000..94ecc01
--- /dev/null
+++ b/net/hsr.sh
@@ -0,0 +1,56 @@
+# Copyright (c) 2015 Gentoo Foundation
+# All rights reserved. Released under the 2-clause BSD license.
+
+hsr_depend()
+{
+   program ip
+   after interface
+   before dhcp macchanger
+}
+
+_is_hsr() {
+   is_interface_type hsr
+}
+
+hsr_pre_start()
+{
+   local hsr=
+   eval hsr=\$type_${IFVAR}
+   [ "${hsr}" = "hsr" ] || return 0
+   eval hsr_slave1=\$hsr_slave1_${IFVAR}
+   eval hsr_slave2=\$hsr_slave2_${IFVAR}
+   eval hsr_supervision=\$hsr_supervision_${IFVAR}
+   if [ -z "${hsr_slave1}" ] || [ -z "${hsr_slave2}" ]; then
+   eerror "HSR interfaces require two slave interfaces to be set"
+   return 1
+   fi
+   if ! ( IFACE=${hsr_slave1} _exists ); then
+   eerror "HSR slave1 ${hsr_slave1} does not exist"
+   return 1
+   fi
+   if ! ( IFACE=${hsr_slave2} _exists ); then
+   eerror "HSR slave2 ${hsr_slave2} does not exist"
+   return 1
+   fi
+
+   ebegin "Creating HSR interface ${IFACE}"
+   cmd="ip link add name "${IFACE}" type hsr slave1 ${hsr_slave1} slave2 
${hsr_slave2} ${hsr_supervision:+supervision }${hsr_supervision}"
+   veinfo $cmd
+   if $cmd ; then
+   eend 0 && _up && set_interface_type hsr
+   else
+   eend 1
+   fi
+}
+
+
+hsr_post_stop()
+{
+   _is_hsr || return 0
+
+   ebegin "Removing HSR ${IFACE}"
+   cmd="ip link delete "${IFACE}" type hsr"
+   veinfo "$cmd"
+   $cmd
+   eend $?
+}

[gentoo-commits] proj/netifrc:master commit in: net/, doc/

[Robin H. Johnson]

commit: 734e527dbe32fc3c0abdd326c485a6e69d8646f2
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Nov  7 20:02:59 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Nov  7 20:18:02 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=734e527d

net: bridge: add bridge_ and brport_ prefixes to sysfs interface

keep the no prefix to be backward compatible.

Signed-off-by: Alon Bar-Lev  gentoo.org>

 doc/net.example.Linux.in |  6 +++---
 net/bridge.sh| 29 +
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index bcf3311..f71385d 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -919,9 +919,9 @@
 # You can also configure the bridge or bridge members via sysfs on 2.6 kernels
 # or newer. See the kernel bridge documentation for a description of these
 # options.
-#stp_state_br0="0"
-#forward_delay_br0="10"
-#hairpin_mode_eth0="1"
+#bridge_stp_state_br0="0"
+#bridge_forward_delay_br0="10"
+#brport_hairpin_mode_eth0="1"
 
 #-
 # RFC 2684 Bridge Support

diff --git a/net/bridge.sh b/net/bridge.sh
index 82abb71..407b578 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -125,12 +125,15 @@ bridge_pre_start()
for x in /sys/class/net/"${IFACE}"/bridge/*; do
[ -f "${x}" ] || continue
n=${x##*/}
-   eval s=\$${n}_${IFVAR}
-   if [ -n "${s}" ]; then
-   einfo "Setting ${n}: ${s}"
-   echo "${s}" >"${x}" || \
-   eerror "Failed to configure $n (${n}_${IFVAR})"
-   fi
+   # keep no prefix for backward compatibility
+   for prefix in "" bridge_; do
+   eval s=\$${prefix}${n}_${IFVAR}
+   if [ -n "${s}" ]; then
+   einfo "Setting ${n}: ${s}"
+   echo "${s}" >"${x}" || \
+   eerror "Failed to configure $n (${n}_${IFVAR})"
+   fi
+   done
done
 
if [ -n "${ports}" ]; then
@@ -161,12 +164,14 @@ bridge_pre_start()
for x in /sys/class/net/"${IFACE}"/brport/*; do
[ -f "${x}" ] || continue
n=${x##*/}
-   eval s=\$${n}_${IFVAR}
-   if [ -n "${s}" ]; then
-   einfo "Setting ${n}@${IFACE}: ${s}"
-   echo "${s}" >"${x}" || \
-   eerror "Failed to configure $n 
(${n}_${IFVAR})"
-   fi
+   for prefix in "" brport_; do
+   eval s=\$${prefix}${n}_${IFVAR}
+   if [ -n "${s}" ]; then
+   einfo "Setting ${n}@${IFACE}: 
${s}"
+   echo "${s}" >"${x}" || \
+   eerror "Failed to configure $n 
(${n}_${IFVAR})"
+   fi
+   done
done
eend 0
done

[gentoo-commits] proj/netifrc:master commit in: net/, doc/

[Robin H. Johnson]

commit: 193803506202d0d37996ee81388215cfe3fc8cda
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Nov  7 20:02:43 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Nov  7 20:02:43 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=19380350

net: bridge: support iproute2

add bridge_force_IFVAR to be interface independent.

mark the brctl_IFVAR as deprecated.

enable easy removal of brctl in future in favour of the iproute2 without
leaving legacy.

Signed-off-by: Alon Bar-Lev  gentoo.org>

 doc/net.example.Linux.in |  1 +
 net/bridge.sh| 75 
 2 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index b91bb50..bcf3311 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -893,6 +893,7 @@
 # ports to it you must set at least one of the following variables based on the
 # interface name, so that we can pick it up from your configuration. Even an
 # empty value variable is fine, but at least one of them must be set:
+# bridge_force_IFVAR
 # brctl_IFVAR
 
 # You need to configure the ports to null values so dhcp does not get started

diff --git a/net/bridge.sh b/net/bridge.sh
index 1d01be2..82abb71 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -4,7 +4,7 @@
 bridge_depend()
 {
before interface macnet
-   program brctl
+   program brctl ip
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"
@@ -35,17 +35,27 @@ bridge_pre_start()
# ports is for static add
local ports="$(_get_array "bridge_${IFVAR}")"
# old config options
-   local opts="$(_get_array "brctl_${IFVAR}")"
+   local brctl_opts="$(_get_array "brctl_${IFVAR}")"
# brif is used for dynamic add
eval brif=\$bridge_add_${IFVAR}
 
+   local do_iproute2=false do_brctl=false
+   if [ -n "${brctl_opts}" ] && type brctl >/dev/null 2>&1; then
+   do_brctl=true
+   elif type ip >/dev/null 2>&1; then
+   do_iproute2=true
+   elif type brctl >/dev/null 2>&1; then
+   do_brctl=true
+   fi
+
# we need a way to if the bridge exists in a variable name, not just the
# contents of a variable. Eg if somebody has only bridge_add_eth0='br0',
# with no other lines mentioning br0.
eval bridge_unset=\${bridge_${IFVAR}-y\}
eval brctl_unset=\${brctl_${IFVAR}-y\}
+   eval bridge_force_unset=\${bridge_force_${IFVAR}-y\}
 
-   if [ -z "${brif}" -a "${brctl_unset}" = 'y' ]; then
+   if [ -z "${brif}" -a "${brctl_unset}${bridge_force_unset}" = 'yy' ]; 
then
if [ -z "${ports}" -a "${bridge_unset}" = "y" ]; then
#eerror "Misconfigured static bridge detected (see 
net.example)"
return 0
@@ -70,7 +80,18 @@ bridge_pre_start()
 
if ! _is_bridge ; then
ebegin "Creating bridge ${IFACE}"
-   if ! brctl addbr "${IFACE}"; then
+   if ${do_iproute2}; then
+   ip link add "${IFACE}" type bridge
+   rc=$?
+   elif ${do_brctl}; then
+   brctl addbr "${IFACE}"
+   rc=$?
+   else
+   eerror "Neither iproute2 nor brctl has been found, 
please install"
+   eerror "either \"iproute2\" or \"brctl\"."
+   rc=1
+   fi
+   if [ ${rc} != 0 ]; then
eend 1
return 1
fi
@@ -82,19 +103,22 @@ bridge_pre_start()
# Old configuration set mechanism
# Only a very limited subset of the options are available in the old
# configuration method. The sysfs interface is in the next block 
instead.
-   if [ -n "${opts}" ]; then
-   ewarn "brctl options are deprecated please migrate to sysfs 
options"
-   ewarn "map of important options is available at 
https://wiki.gentoo.org/wiki/Netifrc/Brctl_Migration";
-   local IFS="$__IFS"
-   for x in ${opts}; do
+   if ${do_brctl}; then
+   if [ -n "${brctl_opts}" ]; then
+   ewarn "brctl options are deprecated please migrate to 
sysfs options"
+   ewarn "map of important options is available at 
https://wiki.gentoo.org/wiki/Netifrc/Brctl_Migration";
+
+   local IFS="$__IFS"
+   for x in ${brctl_opts}; do
+   unset IFS
+   set -- ${x}
+   x=$1
+   shift
+   set -- "${x}" "${IFACE}" "$@"
+   brctl "$@"
+   done
unset IFS
-   set -- ${x}
-   x=$

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: 8b98728ce0b3249da5cc2e6571bf19d57fe75a14
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Nov  7 20:02:22 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Nov  7 20:02:22 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=8b98728c

Revert "bridge: use/prefer iproute2/sysfs where possible"

This reverts commit 6befe06a7e72b5b7f17c7f1118fc16000a0cce13.

 net/bridge.sh | 89 ---
 1 file changed, 6 insertions(+), 83 deletions(-)

diff --git a/net/bridge.sh b/net/bridge.sh
index 87e4055..60d3eeb 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -4,7 +4,7 @@
 bridge_depend()
 {
before interface macnet
-   program ip brctl
+   program brctl
 }
 
 _config_vars="$_config_vars bridge bridge_add brctl"
@@ -29,83 +29,6 @@ _bridge_ports()
done
 }
 
-_brctl()
-{
-   if [ -z "${_bridge_use_ip}" ]; then
-  if ip -V >/dev/null 2>&1 && [ "$(ip -V | cut -c 24-29)" -ge 
130430 ]; then
-   _bridge_use_ip=1
-   else
-   _bridge_use_ip=0
-   fi
-   fi
-   if [ "${_bridge_use_ip}" -eq 1 ]; then
-   case "$1" in
-   addbr)
-   ip link add "$2" type bridge
-   ;;
-   delbr)
-   ip link del "$2"
-   ;;
-   addif)
-   ip link set "$3" master "$2"
-   ;;
-   delif)
-   ip link set "$3" nomaster
-   ;;
-   setageing)
-   echo "$3" > 
/sys/class/net/"$2"/bridge/ageing_time
-   ;;
-   setgcint)
-   # appears to have been dropped in Debian, and I 
don't see a sysfs file for it
-   eerror "brctl setgcint is not supported!"
-   return 1
-   ;;
-   stp)
-   if [ "$3" = "on" -o "$3" = "yes" -o "$3" = "1" 
]; then
-   _stp_state=1
-   elif [ "$3" = "off" -o "$3" = "no" -o "$3" = 
"0" ]; then
-   _stp_state=0
-   else
-   eerror "Invalid STP state for brctl 
stp!"
-   return 1
-   fi
-   echo ${_stp_state} > 
/sys/class/net/"$2"/bridge/stp_state
-   ;;
-   setbridgeprio)
-   echo "$3" > /sys/class/net/"$2"/bridge/priority
-   ;;
-   setfd)
-   echo "$3" > 
/sys/class/net/"$2"/bridge/forward_delay
-   ;;
-   sethello)
-   echo "$3" > 
/sys/class/net/"$2"/bridge/hello_time
-   ;;
-   setmaxage)
-   echo "$3" > /sys/class/net/"$2"/bridge/max_age
-   ;;
-   setpathcost)
-   echo "$4" > 
/sys/class/net/"$2"/brif/"$3"/path_cost
-   ;;
-   setportprio)
-   echo "$4" > 
/sys/class/net/"$2"/brif/"$3"/priority
-   ;;
-   hairpin)
-   if [ "$4" -eq "on" -o "$4" -eq "yes" -o "$4" 
-eq "1" ]; then
-   _hairpin_mode=1
-   elif [ "$4" -eq "off" -o "$4" -eq "no" -o "$4" 
-eq "0" ]; then
-   _hairpin_mode=0
-   else
-   eerror "Invalid hairpin mode for brctl 
hairpin!"
-   return 1
-   fi
-   echo ${_hairpin_mode} > 
/sys/class/net/"$2"/brif/"$3"/hairpin_mode
-   ;;
-   esac
-   else
-   brctl "$@"
-   fi
-}
-
 bridge_pre_start()
 {
local brif= oiface="${IFACE}" e= x=
@@ -147,7 +70,7 @@ bridge_pre_start()
 
if ! _is_bridge ; then
ebegin "Creating bridge ${IFACE}"
-   if ! _brctl addbr "${IFACE}"; then
+   if ! brctl addbr "${IFACE}"; then
eend 1
return 1
fi
@@ -166,7 +89,7 @@ bridge_pre_start()
x=$1
shift
set -- "${x}" "${IFA

[gentoo-commits] proj/netifrc:master commit in: doc/, net/, /

[Robin H. Johnson]

commit: 15cd79dc46303988464d962ad6bf59050feba801
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:16:08 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:29:17 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=15cd79dc

New interface type: dummy.

Signed-off-by: Robin H. Johnson  gentoo.org>

 TODO |  1 -
 doc/net.example.Linux.in |  9 +
 net/dummy.sh | 41 +
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index f8d8902..64f62e2 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,6 @@
- add vlan3 - _ifindex (eth0=0,vlan2=1,vlan3=2)
Now your routing table has entries for both vlan2 and vlan3 with a 
metric of 2.
 - Support many more device types easily:
-  - Dummy: ip link add dev dummy1 type dummy
   - HSR: ip link add name hsr0 type hsr slave1 dummy3 slave2 dummy4
   - VXLAN: ip link add link dummy2 name vxlan199 type vxlan id 199 dev dummy2 
group 224.2.0.199 dstport 4789
   - IPVLAN: ...

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index f71385d..1eaebac 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -150,6 +150,15 @@
 
 ##
 # OPTIONAL MODULES
+#-
+# IPROUTE2 INTERFACE TYPES
+# The type_$iface variable maps to the link type parameter in iproute2.
+# If you need to use additional interface types, you should try to use that
+# parameter. Supported interface types are listed below. Please note that some
+# interface types may mandate a specific naming scheme.
+#
+# Dummy network interface:
+#type_dummy0=dummy
 
 #-
 # WIRELESS (802.11 support)

diff --git a/net/dummy.sh b/net/dummy.sh
new file mode 100644
index 000..3050216
--- /dev/null
+++ b/net/dummy.sh
@@ -0,0 +1,41 @@
+# Copyright (c) 2015 Gentoo Foundation
+# All rights reserved. Released under the 2-clause BSD license.
+
+dummy_depend()
+{
+   program ip
+   after interface
+   before dhcp macchanger
+}
+
+_is_dummy() {
+   is_interface_type dummy
+}
+
+dummy_pre_start()
+{
+   local dummy=
+   eval dummy=\$type_${IFVAR}
+   [ "${dummy}" = "dummy" ] || return 0
+
+   ebegin "Creating dummy interface ${IFACE}"
+   cmd="ip link add name "${IFACE}" type dummy"
+   veinfo $cmd
+   if $cmd ; then
+   eend 0 && _up && set_interface_type dummy
+   else
+   eend 1
+   fi
+}
+
+
+dummy_post_stop()
+{
+   _is_dummy || return 0
+
+   ebegin "Removing dummy ${IFACE}"
+   cmd="ip link delete "${IFACE}" type dummy"
+   veinfo "$cmd"
+   $cmd
+   eend $?
+}

[gentoo-commits] proj/netifrc:master commit in: doc/, net/

[Robin H. Johnson]

commit: 89a7d0f0af6807ed9b4a7204cddc214722de1ee9
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Nov  7 20:02:33 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sat Nov  7 20:02:33 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=89a7d0f0

net: bridge: display a warning for brctl options depreciation

Signed-off-by: Alon Bar-Lev  gentoo.org>

 doc/net.example.Linux.in |  1 +
 net/bridge.sh| 22 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index ddfe5e0..b91bb50 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -910,6 +910,7 @@
 
 # Below is an example of configuring the bridge
 # Consult "man brctl" for more details
+# This method is deprecated in favour of the sysfs interface.
 #brctl_br0="setfd 15
 #sethello 2
 #stp on"

diff --git a/net/bridge.sh b/net/bridge.sh
index 60d3eeb..1d01be2 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -82,16 +82,20 @@ bridge_pre_start()
# Old configuration set mechanism
# Only a very limited subset of the options are available in the old
# configuration method. The sysfs interface is in the next block 
instead.
-   local IFS="$__IFS"
-   for x in ${opts}; do
+   if [ -n "${opts}" ]; then
+   ewarn "brctl options are deprecated please migrate to sysfs 
options"
+   ewarn "map of important options is available at 
https://wiki.gentoo.org/wiki/Netifrc/Brctl_Migration";
+   local IFS="$__IFS"
+   for x in ${opts}; do
+   unset IFS
+   set -- ${x}
+   x=$1
+   shift
+   set -- "${x}" "${IFACE}" "$@"
+   brctl "$@"
+   done
unset IFS
-   set -- ${x}
-   x=$1
-   shift
-   set -- "${x}" "${IFACE}" "$@"
-   brctl "$@"
-   done
-   unset IFS
+   fi
 
# New configuration set mechanism, matches bonding
for x in /sys/class/net/"${IFACE}"/bridge/*; do

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: 987d3676f04dc8d9b75d5ef11a4b1ed15c9b1f3e
Author: Robin H. Johnson  orbis-terrarum  net>
AuthorDate: Sun Nov  8 14:32:26 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:32:26 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=987d3676

Merge pull request #17 from alonbl/bridge

net: bridge: add warning when using sysfs variables without prefix

 net/bridge.sh | 2 ++
 1 file changed, 2 insertions(+)

[gentoo-commits] proj/netifrc:master commit in: /

[Robin H. Johnson]

commit: a88ce55b539410f5f7d8512a8f951213b53db5b1
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:32:36 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:32:36 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=a88ce55b

Merge remote-tracking branch 'github/master'

 net/bridge.sh | 2 ++
 1 file changed, 2 insertions(+)

[gentoo-commits] proj/netifrc:master commit in: doc/

[Robin H. Johnson]

commit: bfaf7aac630894f0384b6e4c83c6517e915cd14b
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Sun Nov  8 14:33:40 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 14:33:40 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=bfaf7aac

hsr: Missed $iface in variable names.

Signed-off-by: Robin H. Johnson  gentoo.org>

 doc/net.example.Linux.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in
index 6059301..f65c03d 100644
--- a/doc/net.example.Linux.in
+++ b/doc/net.example.Linux.in
@@ -162,9 +162,9 @@
 #
 # HSR: High-availability Seamless Redundancy
 #type_hsr0=hsr
-#hsr_slave1=eth0
-#hsr_slave2=eth1
-#hsr_supervision=99 # Byte value
+#hsr_slave1_hsr0=eth0
+#hsr_slave2_hsr0=eth1
+#hsr_supervision_hsr0=99 # Byte value
 
 #-
 # WIRELESS (802.11 support)

[gentoo-commits] proj/netifrc:master commit in: net/

[Robin H. Johnson]

commit: a4fcc78c90893103d012ae1dc05a2a8f42d7cdaa
Author: Alon Bar-Lev  gentoo  org>
AuthorDate: Sat Nov  7 20:02:59 2015 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov  8 07:13:36 2015 +
URL:https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=a4fcc78c

net: bridge: add warning when using sysfs variables without prefix

Signed-off-by: Alon Bar-Lev  gentoo.org>

 net/bridge.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/bridge.sh b/net/bridge.sh
index 407b578..3dfd8b1 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -129,6 +129,7 @@ bridge_pre_start()
for prefix in "" bridge_; do
eval s=\$${prefix}${n}_${IFVAR}
if [ -n "${s}" ]; then
+   [ -z "${prefix}" ] && ewarn "sysfs key 
'${n}_${IFVAR}' should be prefixed, please add bridge_ prefix."
einfo "Setting ${n}: ${s}"
echo "${s}" >"${x}" || \
eerror "Failed to configure $n (${n}_${IFVAR})"
@@ -167,6 +168,7 @@ bridge_pre_start()
for prefix in "" brport_; do
eval s=\$${prefix}${n}_${IFVAR}
if [ -n "${s}" ]; then
+   [ -z "${prefix}" ] && ewarn 
"sysfs key '${n}_${IFVAR}' should be prefixed, please add brport_ prefix."
einfo "Setting ${n}@${IFACE}: 
${s}"
echo "${s}" >"${x}" || \
eerror "Failed to configure $n 
(${n}_${IFVAR})"

[gentoo-commits] repo/gentoo:master commit in: dev-perl/Test-CPAN-Meta/

[Patrice Clement]

commit: 19a2b4029187a7479159297334b00d301f09cb24
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Nov  8 14:40:22 2015 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Nov  8 14:40:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a2b402

dev-perl/Test-CPAN-Meta: Stable for amd64. Fixes security bug 564688.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement  gentoo.org>

 dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild 
b/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild
index bedf740..b8d5398 100644
--- a/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild
+++ b/dev-perl/Test-CPAN-Meta/Test-CPAN-Meta-0.25.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Validate your CPAN META.yml file"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND=""

[gentoo-commits] repo/proj/prefix:master commit in: net-misc/openssh/

[Fabian Groffen]

commit: 6e98df030b16a3f80b8d257634ceb766649fd26f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov  8 15:36:54 2015 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Nov  8 15:36:54 2015 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=6e98df03

net-misc/openssh: sync latest version with gx86

Package-Manager: portage-2.2.20-prefix

 net-misc/openssh/Manifest  |  3 +
 net-misc/openssh/openssh-6.9_p1-r2.ebuild  | 45 ++--
 ...h-6.9_p1-r2.ebuild => openssh-7.1_p1-r2.ebuild} | 85 --
 3 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 6e58d60..e85eac1 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -6,4 +6,7 @@ DIST openssh-6.8p1.tar.gz 1475953 SHA256 
3ff64ce73ee124480b5bf767b9830d7d3c03bbc
 DIST openssh-6.9p1+x509-8.4.diff.gz 425687 SHA256 
0ed8bfff0d2ecd9f3791ae1f168ca3270bb66d7ab7bc0a8ff2d61d2ab829c3fb SHA512 
596cb65408db06fb299b92160147685b001dc23929ecf5c4bd11a8b0475d79695c7b4dbe8a878d7fbcd944155935fd62a14e35c79204b39e413f5eaa961ef76c
 WHIRLPOOL 
771fa0f4f6a20ed49ba201605fcdcbfc41a0f094ef4a89ca2433ee51b7c8bf99cc266f26bd7877c61ff92e9a50c7d65119ba75ba64eaa029bd567bab3ee243c2
 DIST openssh-6.9p1-r1-hpnssh14v5.tar.xz 21396 SHA256 
84e9e28a1488ccf66e29a7c90442b3bc4833a6fa186260fb6853b5a1b19c0beb SHA512 
476064dbdb3d82b86ad7c481a4a301ff0d46bd281fe7ca0c29f34ae50b0034028760997ae2c934a265499c154f4534d35ead647aa63d1a4545ed503a5364eada
 WHIRLPOOL 
74eaf2fe0a6ecd0e2fa5078034628d4c76c75b121f3c813ff8a098ab28363daa3800d03936046aa3aebbfdab3afd31ef30a207399f5e305d7f71e5f3c7e4f4a7
 DIST openssh-6.9p1.tar.gz 1487617 SHA256 
6e074df538f357d440be6cf93dc581a21f22d39e236f217fcd8eacbb6c896cfe SHA512 
68fec9b4e512fe126a5d35b01e2cc656d810b75052ed8a36bc85cd0a05de7318b15ed287bc95cf9bcb3fa2f385029151d85aced55e07fbcc79e6c779bee6751d
 WHIRLPOOL 
1dcb291383c9f934b512f61ce9f6e0319f22e112ce3f6eace2a868ca0f99c709c65bae14a9815e2ef237f8132fe72c583cffb7ea20bdfa2aaa77cf347967be7f
+DIST openssh-7.1p1+x509-8.6.diff.gz 413931 SHA256 
cbf661a1fec080dc9ed335a290414154326c2a13f124985db050b86a91073d52 SHA512 
c91d0f1b69b6d34984e94b391ad022271e73d0634cef2df355ba555366bc38d30649b478f245b6c51ce79d71adf1b693bc97826e6c6013a78e7ccfb7023b4bcc
 WHIRLPOOL 
4ed4427e80026996c43a188d7d45f2c53fa6a7fd842a248b1225b27f3e9037e761f0ed172d79b53ada81c24d958a2193e94d918f6ca1320e45d5e68379845981
+DIST openssh-7.1p1-hpnssh14v9.tar.xz 21580 SHA256 
a795c2f2621f537b3fd98172cbd1f7c71869e4da78cd280d123fa19ae4262b97 SHA512 
6ce151949bf81b5518b95092a2f18d2f24581954e2c629deaf3c1d10136f32f830567aafb9b4045547e95e3ab63cf750e240eac40e2b9caa6d71cb2b132821ec
 WHIRLPOOL 
8e3c9a1d79112092a6cb42c6766ccdf61e5d8fcd366ea5c7d3bab94cf309bcc12f3761476a288158638a340023aa24519d888caac19fb0ef25fa56bdab06412c
+DIST openssh-7.1p1.tar.gz 1493170 SHA256 
fc0a6d2d1d063d5c66dffd952493d0cda256cad204f681de0f84ef85b2ad8428 SHA512 
f1491ca5a0a733eb27ede966590642a412cb7be7178dcb7b9e5844bbdc8383032f4b00435192b95fc0365b6fe74d6c5ac8d6facbe9d51e1532d049e2f784e8f7
 WHIRLPOOL 
a650a93657f930d20dc3fa24ab720857f63f7cd0a82d1906cf1e58145e866129207851d5e587d678655e5731fa73221ab9b6ea0754533100c25fe2acaa442e05
 DIST openssh-lpk-6.8p1-0.3.14.patch.xz 16940 SHA256 
d5f048dc7e9d3fca085c152fc31306f1d8fa793e524c538295915b075ec085b0 SHA512 
2470b6b46f8c7ac985f82d14b788a3eb81a468a1d5013cb7f89257d9dd78b6037e24bf54ac57b757db8ed1df24332d659cf918c11ea73592fd24a69c25a54081
 WHIRLPOOL 
b041ee9e0efdf370686f11df4131ab5e5ffb2f11cc66c386a8223bf563c5b78ab9443f06e4adc2e506e440cdec9dc5b20f5972cd8d691d786d2f903bb49b947b

diff --git a/net-misc/openssh/openssh-6.9_p1-r2.ebuild 
b/net-misc/openssh/openssh-6.9_p1-r2.ebuild
index 628a85d..2cbcfa5 100644
--- a/net-misc/openssh/openssh-6.9_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-6.9_p1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.9_p1-r2.ebuild,v 
1.1 2015/07/08 09:09:13 vapier Exp $
+# $Id$
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -19,7 +19,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
mirror://gentoo/${PN}-6.8_p1-sctp.patch.xz
${HPN_PATCH:+hpn? (
mirror://gentoo/${HPN_PATCH}
-   http://dev.gentoo.org/~polynomial-c/${HPN_PATCH}
+   https://dev.gentoo.org/~polynomial-c/${HPN_PATCH}
mirror://sourceforge/hpnssh/${HPN_PATCH}
)}
${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
@@ -31,39 +31,34 @@ SLOT="0"
 KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a futu

[gentoo-commits] repo/gentoo:master commit in: app-misc/pdfpc/

[Manuel Rüger]

commit: 2341c25e5aea88801e91264816715a99433d12ce
Author: Manuel Rüger  gentoo  org>
AuthorDate: Sun Nov  8 15:50:59 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sun Nov  8 15:50:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2341c25e

app-misc/pdfpc: Version bump

Package-Manager: portage-2.2.24

 app-misc/pdfpc/Manifest   |  1 +
 app-misc/pdfpc/pdfpc-4.0.1.ebuild | 41 +++
 2 files changed, 42 insertions(+)

diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 9af3ea7..6b1955c 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,2 +1,3 @@
 DIST pdfpc-3.1.1.tgz 199004 SHA256 
ec5ffb9c2b55d1bac76172a6a13ed527ceed8cf0d659aca5e302f6a7185f00f2 SHA512 
554203094b18fe11fd085414961de6644df3c258ad52d46ad171cfd6c2199028bcbaa9560bdaba63d83f858b467407cc276972b34f341cc25260db1d1358e88d
 WHIRLPOOL 
bddcba6a4285ea2b58dd01f76b7b050db630eaa97de5bba32a66f7f85563e6a99763a52e82286297f605dfa59d9ff918007baab297e587968ac1c83e3d69e8a8
+DIST pdfpc-4.0.1.tar.gz 74405 SHA256 
7c40cb87f9f1ce5e1683e96cc815572ea4c0a30e9db691501401ad271d27a3fb SHA512 
701cf57b13b3abb2bacf086a29464a24d9eb67b095a89e770fade12f512d78773899bc9c71bc888e85b0a0acf2a122dd819b0259a1ab850a4f7af5fbc7369cdb
 WHIRLPOOL 
0e1054b2aedce013c7f4397b05c66f658e6de88fe4fe6e857e8bd6bf33b5b68f3acda8fd327cffb9b2db7d1726543cdb5afdd342be1b8286a55799f5c5be9688
 DIST pdfpc-v4.0.0.tar.gz 71039 SHA256 
c091c554f4e3ed8735df40055253459c47b09590775a6f9b5b6abf1b42647a62 SHA512 
2c822dee9c47be4858a9a20c729864120335b506d1271d032635653e394db3934bf0a1c261d6bcfeb416918e5c20553de688106fa2ad40834f91f75bf11a231d
 WHIRLPOOL 
f52f05bb9073505fc798c6182fb73e1b94fc007304105b1d038a5d6fcb791616e6afc2a42e02ef76bd0fc1a1cdd446cd8866ea4d08bba7a655428ffbe7266a3a

diff --git a/app-misc/pdfpc/pdfpc-4.0.1.ebuild 
b/app-misc/pdfpc/pdfpc-4.0.1.ebuild
new file mode 100644
index 000..3df909e
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.28" # fix sed line if you increase this
+
+inherit vala cmake-utils
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="http://pdfpc.github.io";
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler:=[cairo]
+   dev-libs/glib:2
+   dev-libs/libgee:0.8
+   gnome-base/librsvg
+   media-libs/gstreamer:1.0
+   media-libs/gst-plugins-base:1.0
+   x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+   $(vala_depend)"
+
+src_prepare() {
+   sed -i -e "s/valac-0.20/valac-0.28 valac-0.26/" 
cmake/vala/FindVala.cmake || die
+   vala_src_prepare
+}
+
+src_configure(){
+   local mycmakeargs=(
+   -DSYSCONFDIR="${EPREFIX}/etc"
+   )
+   cmake-utils_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/bsddb3/

[Justin Lecher]

commit: 4758a65becf7fc2cf93b74880621d20c373d96e9
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov  8 09:09:33 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov  8 16:06:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4758a65b

dev-python/bsddb3: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/bsddb3/Manifest|  1 +
 dev-python/bsddb3/bsddb3-6.1.1.ebuild | 75 +++
 2 files changed, 76 insertions(+)

diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 4eb8631..47240a9 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,2 +1,3 @@
 DIST bsddb3-6.0.1.tar.gz 347002 SHA256 
abc34d83d6cbb40f1626ecc2b62e8163ba204f4bb6a65c23b125a171d224bf6d SHA512 
14a35a4933f83f11267072956e0061053918974d556899ea7670e2e52f7fbf9cb9f64e1810323b60a63ece0576a6d2b1a2743adf2c06f7f1debba8dcc0f0b8da
 WHIRLPOOL 
a4441dd6ba6c2de6bacfe5584395059614087c6b8c01c61290bdba7e2a75d5ee7abed349f7519439828a5dafd48da46c91b98caed1b0fffe16c9201c79af0d71
 DIST bsddb3-6.1.0.tar.gz 340966 SHA256 
b13163e3891c32390aea66edcf7880eb245abc89199a766b7b1907fc5c1efd15 SHA512 
2c84f8fd8c5bcced843ea7f1f54511cc4845a75ac182b4f832b92800c4f230906bf5919cb7d10938e79272f0fe89a5ed9b3f90c02bf11ac651126e6982dcc0ff
 WHIRLPOOL 
b27e1c024705f64eb0cffd0bf87932af4dd9f3eb5bdbce40d2d6a250cd101be55ebf1f76c17ac6c40de9e28e0c84b9bfafd0c62d7c1950782eef8fa1137ebb3b
+DIST bsddb3-6.1.1.tar.gz 450571 SHA256 
6f21b0252125c07798d784c164ef135ad153d226c01b290258ee1c5b9e7c4dd3 SHA512 
f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 WHIRLPOOL 
c8552008d8de272ef665ca54ec134a8bf64e31c41b4738c9ff461d5d2f6c045f20bc9604bff2acbb86222d838649297d8e96060ec060f2da342ce0314e0b2211

diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild 
b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
new file mode 100644
index 000..ddebf81
--- /dev/null
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit db-use distutils-r1 multilib
+
+DESCRIPTION="Python bindings for Berkeley DB"
+HOMEPAGE="http://www.jcea.es/programacion/pybsddb.htm 
https://pypi.python.org/pypi/bsddb3";
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+IUSE="doc"
+
+RDEPEND="
+   >=sys-libs/db-4.7:=
+   

[gentoo-commits] repo/gentoo:master commit in: dev-python/markdown/

[Justin Lecher]

commit: a758f2040a30cb58bb9eb6f2e8b9161d07d48ee4
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov  8 08:29:49 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov  8 16:06:51 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a758f204

dev-python/markdown: Version Bump

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/markdown/Manifest  |  1 +
 dev-python/markdown/markdown-2.6.4.ebuild | 54 +++
 2 files changed, 55 insertions(+)

diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 8286fb7..ee40526 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,2 +1,3 @@
 DIST Markdown-2.6.1.tar.gz 298074 SHA256 
b5879b87e8e5c125c92ab8c8f3babce78ad4e840446eed73c5b6e2984648d2b1 SHA512 
53e11c5d4feacdb8210427da65b6b09453e8c904e86b42095a80132a4b67e926ba974458769e5227bfeaddd3bba5f6bd7ca7e3385951982ec982f63989119d78
 WHIRLPOOL 
58b6d87354ee19aac7ad1567e10f2cdc99c1aa980d3bee2fee81a5ccb5e70f43d13750dfaf1df9a42c00f3d35664731b52bfa1246271907f5a3422281ede1cc6
 DIST Markdown-2.6.3.tar.gz 301441 SHA256 
ad75fc03c45492eba3bc63645e1e6465f65523a05fff0abf36910f810465a9af SHA512 
29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee
 WHIRLPOOL 
8d50fa6895a117c081f1ccb5cfc456a297a8ff36e1597add78fbd8acfd4b72f79c617c5bffc790bc7c6d76f7aefef5706b8d8083f4104500f4b5c035aa14546d
+DIST Markdown-2.6.4.tar.gz 301632 SHA256 
e436eee7aaf2a230ca3315034dd39e8a0fc27036708acaa3dd70625ec62a94ce SHA512 
5fc4ada494880871833046ef9a115385542002e6ec104847353fb2638fce6e46f2bb54ff37bd7d43eb100a448dc424ac425937cadc9ec1d81ea9e70887d8e460
 WHIRLPOOL 
ca0d39b8cbbc124a5a6a4324d627c66d717e1f4c4c43c09d9ff208a23b56b6de79ed7b5cf9a57a2c598a3f40810d4691d42dcbf48690c58d13f38adb8e318490

diff --git a/dev-python/markdown/markdown-2.6.4.ebuild 
b/dev-python/markdown/markdown-2.6.4.ebuild
new file mode 100644
index 000..27f86b1
--- /dev/null
+++ b/dev-python/markdown/markdown-2.6.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="Markdown"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+   http://www.freewisdom.org/projects/python-markdown
+   https://pypi.python.org/pypi/Markdown
+   https://pythonhosted.org/Markdown/
+   https://github.com/waylan/Python-Markdown";
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test pygments"
+
+DEPEND="
+   test? (
+   dev-python/nose[${PYTHON_USEDEP}]
+   dev-python/pyyaml[${PYTHON_USEDEP}]
+   dev-python/pygments[${PYTHON_USEDEP}]
+   dev-python/pytidylib[${PYTHON_USEDEP}]
+   )"
+# source cites pytidylib however from testruns it appears optional
+RDEPEND="pygments? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+   use doc && esetup.py build_docs
+}
+
+python_test() {
+   cp -r -l run-tests.py tests "${BUILD_DIR}"/ || die
+   cd "${BUILD_DIR}" || die
+   "${PYTHON}" run-tests.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+   # make use doc do a doc build
+   use doc && local HTML_DOCS=( "${BUILD_DIR}"/docs/. )
+
+   distutils-r1_python_install_all
+}

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/

[Justin Lecher]

commit: 256375eea77918530cfbf5f7e075271297cd5caa
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov  8 16:16:21 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov  8 16:27:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256375ee

profiles: Drop compatibility SLOT for pyfltk

Signed-off-by: Justin Lecher  gentoo.org>

 profiles/updates/4Q-2015 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/updates/4Q-2015 b/profiles/updates/4Q-2015
index f45e5cd..6e925ab 100644
--- a/profiles/updates/4Q-2015
+++ b/profiles/updates/4Q-2015
@@ -6,3 +6,4 @@ slotmove =dev-ruby/recog-2.0.14 2 2.0.14
 move media-libs/libkface kde-apps/libkface
 move media-libs/libkgeomap kde-apps/libkgeomap
 move media-fonts/nanumfont media-fonts/nanum
+slotmove =dev-python/pyfltk-1.3.3 1 0

[gentoo-commits] repo/gentoo:master commit in: dev-python/matplotlib/

[Justin Lecher]

commit: b22eb094196409ecee4d034166e63f22a729a677
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov  8 16:26:48 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov  8 16:27:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b22eb094

dev-python/matplotlib: Update to new py impl support in pyfltk

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/matplotlib/matplotlib-1.4.3.ebuild | 5 +
 dev-python/matplotlib/matplotlib-1.5.0.ebuild | 5 +
 dev-python/matplotlib/matplotlib-.ebuild  | 5 +
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/dev-python/matplotlib/matplotlib-1.4.3.ebuild 
b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
index b4f7faa..ed25b87 100644
--- a/dev-python/matplotlib/matplotlib-1.4.3.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.4.3.ebuild
@@ -84,10 +84,7 @@ RDEPEND="${COMMON_DEPEND}
)
)
excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-   fltk? (
-   $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 
python2_7)
-   $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 
'python3*')
-   )
+   fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
gtk3? (
dev-python/pygobject:3[${PYTHON_USEDEP}]
x11-libs/gtk+:3[introspection] )

diff --git a/dev-python/matplotlib/matplotlib-1.5.0.ebuild 
b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
index ba3180e..444bf6f 100644
--- a/dev-python/matplotlib/matplotlib-1.5.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-1.5.0.ebuild
@@ -87,10 +87,7 @@ RDEPEND="${COMMON_DEPEND}
)
)
excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-   fltk? (
-   $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 
python2_7)
-   $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 
'python3*')
-   )
+   fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
gtk3? (
dev-python/pygobject:3[${PYTHON_USEDEP}]
x11-libs/gtk+:3[introspection] )

diff --git a/dev-python/matplotlib/matplotlib-.ebuild 
b/dev-python/matplotlib/matplotlib-.ebuild
index 0346253..9830282 100644
--- a/dev-python/matplotlib/matplotlib-.ebuild
+++ b/dev-python/matplotlib/matplotlib-.ebuild
@@ -86,10 +86,7 @@ RDEPEND="${COMMON_DEPEND}
)
)
excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
-   fltk? (
-   $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 
python2_7)
-   $(python_gen_cond_dep 'dev-python/pyfltk[${PYTHON_USEDEP}]' 
'python3*')
-   )
+   fltk? ( dev-python/pyfltk[${PYTHON_USEDEP}] )
gtk3? (
dev-python/pygobject:3[${PYTHON_USEDEP}]
x11-libs/gtk+:3[introspection] )

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

[Sebastian Pipping]

commit: 08ac0d4809002c7eeb442ee07c55165cca9aa75e
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Nov  8 16:21:52 2015 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Nov  8 16:26:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ac0d48

www-client/httrack: Remove old testing versions

Package-Manager: portage-2.2.24

 www-client/httrack/Manifest   |  4 
 www-client/httrack/httrack-3.47.27.ebuild | 31 --
 www-client/httrack/httrack-3.48.13.ebuild | 37 ---
 www-client/httrack/httrack-3.48.19.ebuild | 37 ---
 www-client/httrack/httrack-3.48.20.ebuild | 37 ---
 5 files changed, 146 deletions(-)

diff --git a/www-client/httrack/Manifest b/www-client/httrack/Manifest
index f68dd00..169c8f6 100644
--- a/www-client/httrack/Manifest
+++ b/www-client/httrack/Manifest
@@ -1,6 +1,2 @@
 DIST httrack-3.45.4.tar.gz 1699651 SHA256 
715b1638acee2685d5a012c3848bf087a6e420dba3cde4305b897054f54affd4 SHA512 
39494adb30d04fd891ea0006d5f776501a03d2dda5c9d8470ee8b680550de753125546d196576b7fa9a9918358cf0c554facee60db3765c2de6e80cc0d9daf7b
 WHIRLPOOL 
58de8ffa48a7ef3826ca880f8073f3b404c540237f13013a316bb5b0de3eaf18c50dc10dded3b968172f18f914f88c962e4f23b41d055ce0c23025b4191533c7
-DIST httrack-3.47.27.tar.gz 1778104 SHA256 
7c96bfb63dab9e55efea89d0408e3743115e524c688545b94f9b60dc78d2f9e1 SHA512 
69f5e3e5bb7389d5442e5513e99ec065d45bc4083d737e0fc33698b1dc0716e9bd29fb707d6f6af8b829e1961e811530ad9add34dad334d8f4e9ab25b249a7f1
 WHIRLPOOL 
6cdfd3b0d199e37e64e5e154ad391d030b7d9bf1133373f6193fdd1dbff56f0b319c16fcdf2c3eb247a17a167cb70f733741e52074bd7c189a28e7a1ef18c387
-DIST httrack-3.48.13.tar.gz 1790992 SHA256 
02c34571e974605b0a0398c1c65336bbe94142391d61a9be4234c2d19b09e947 SHA512 
c6770f911c2349aaf9f1216df902648578f9a21bd572b2523918fc7737f6fcf6ab260a47bff7b8b5e170ad731401e73c2500c71237d88dc61ee6ada8e4906bec
 WHIRLPOOL 
1a1ce6cb4e26624639b069ef536c2ba843fd04d109f6acfbc6419bae329222a704fe1e6095f85caa6c5b1e0bdc87f05036cad07e5552070d7d4307c0634e0ccb
-DIST httrack-3.48.19.tar.gz 1818985 SHA256 
16f0cd0ea21042106879238fe4892b56018e106347d69dcb0b93816ee8f68afe SHA512 
c7202c4d86963fe935ce1f1a81f43f47544e03e4743528f52acd541ba87d6ef47d9e691b432f9bebedbf06e764bd67fe85748762b6ec3c09491b7528957cda8b
 WHIRLPOOL 
c250ab2d7e8e1ec8cdfb3f86bb8e21ff7d4d583d0c6adba3f1f4448cc60304b6e572fe9d760322094affebe45f7f9eee1c1a6f94332ae83d01b7d91132274e77
-DIST httrack-3.48.20.tar.gz 1821746 SHA256 
3156515e9ecd949851ffc1e3e83e30ef046a959378ee5d11eb18462286bb2c89 SHA512 
45fc348f9bece70044102fc374f391362f57ef680b14635dd30bf69008d30b04cd54b87297f738eee821e5e54031365d6ff66300cd3f9d67bd35ed7851b5b086
 WHIRLPOOL 
6dfac187859d1afc6049a61017f88d0f18f1e8ac61f661ff55a34c01bac4ce687857d843d9db1abcf4ffd4b563934322cd8560b3f33670da789ab527f4073ec3
 DIST httrack-3.48.21.tar.gz 1805754 SHA256 
871b60a1e22d7ac217e4e14ad4d562fbad5df7c370e845f1ecf5c0e4917be482 SHA512 
1cf98225488e8d9570bb55c48ef1a04dcd48184f2285497c6fb4beaeb28d3ce4751c85783253baa73de1bd21c4bf01b0acd6beede77373c2f622a4124dc19246
 WHIRLPOOL 
3bc85e0e094dfd5eef20658af0a0681e78105b6f4fcd8a4235b2bc0bf0381d5ab2b2ed206a06acb9ab34c3cf0ffe0664f73ee04f018fdd61476a8e645006a252

diff --git a/www-client/httrack/httrack-3.47.27.ebuild 
b/www-client/httrack/httrack-3.47.27.ebuild
deleted file mode 100644
index 937f170..000
--- a/www-client/httrack/httrack-3.47.27.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/";
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
-   dev-libs/openssl"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README greetings.txt history.txt )
-
-src_configure() {
-   econf $(use_enable static-libs static) \
-   --docdir=/usr/share/doc/${PF} \
-   --htmldir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-   default
-   find "${ED}" -type f -name '*.la' -delete || die
-}

diff --git a/www-client/httrack/httrack-3.48.13.ebuild 
b/www-client/httrack/httrack-3.48.13.ebuild
deleted file mode 100644
index 462eae3..000
--- a/www-client/httrack/httrack-3.48.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
-HOMEPAGE="http://www.httrack.com/";
-SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-

[gentoo-commits] repo/gentoo:master commit in: www-client/httrack/

[Sebastian Pipping]

commit: 9f0f3455a481afb5ca69cb13d9a2eaebaff259a7
Author: Sebastian Pipping  gentoo  org>
AuthorDate: Sun Nov  8 16:20:25 2015 +
Commit: Sebastian Pipping  gentoo  org>
CommitDate: Sun Nov  8 16:26:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f0f3455

www-client/httrack: Handle FEATURES=nodoc (bug #493376)

Also bump to EAPI 5 and address "matches more than one slot" warning

Package-Manager: portage-2.2.24

 www-client/httrack/httrack-3.48.21-r1.ebuild | 48 
 1 file changed, 48 insertions(+)

diff --git a/www-client/httrack/httrack-3.48.21-r1.ebuild 
b/www-client/httrack/httrack-3.48.21-r1.ebuild
new file mode 100644
index 000..bf94826
--- /dev/null
+++ b/www-client/httrack/httrack-3.48.21-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="HTTrack Website Copier, Open Source Offline Browser"
+HOMEPAGE="http://www.httrack.com/";
+SRC_URI="http://mirror.httrack.com/historical/${P}.tar.gz";
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/zlib-1.2.5.1-r1
+   dev-libs/openssl:="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS README greetings.txt history.txt )
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-3.48.13-minizip.patch
+}
+
+src_configure() {
+   econf $(use_enable static-libs static) \
+   --docdir=/usr/share/doc/${PF} \
+   --htmldir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+   default
+
+   # Make webhttrack work despite FEATURES=nodoc cutting
+   # all of /usr/share/doc/ away (bug #493376)
+   if has nodoc ${FEATURES} ; then
+   dodir /usr/share/${PF}/
+   mv "${D}"/usr/share/{doc/,}${PF}/html || die
+
+   rm "${D}"/usr/share/httrack/html || die
+   dosym /usr/share/${PF}/html /usr/share/httrack/html
+   fi
+
+   find "${ED}" -type f -name '*.la' -delete || die
+}

[gentoo-commits] repo/gentoo:master commit in: dev-python/pyfltk/

[Justin Lecher]

commit: cdb612fb936f3c2b341a6cf3485d7607cc5fdd83
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov  8 16:16:59 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov  8 16:27:11 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb612fb

dev-python/pyfltk: Update supported python implementations and move to SLOT=0

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher  gentoo.org>

 dev-python/pyfltk/pyfltk-1.3.3.ebuild | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild 
b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 50f988d..73c3a14 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -6,7 +6,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{3,4,5} )
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
 
 inherit distutils-r1 flag-o-matic
 
@@ -18,11 +18,14 @@ HOMEPAGE="http://pyfltk.sourceforge.net/";
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz -> ${MY_PN}.tar.gz"
 
 LICENSE="LGPL-2"
-SLOT="1"
+SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="doc"
 
-DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+DEPEND="
+   >=x11-libs/fltk-1.3.0:1[opengl]
+   !dev-python/pyfltk:1
+   "
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}

[gentoo-commits] proj/grs:desktop-amd64-hardened commit in: core/var/lib/portage/, core/etc/grs/

[Anthony G. Basile]

commit: 90c0db770eca7102429a97d6e936d937d8aaa5b7
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Nov  8 17:20:50 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Nov  8 17:21:07 2015 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=90c0db77

world: remove media-fonts/nanumfont

 core/etc/grs/world.conf| 3 ---
 core/var/lib/portage/world.CYCLE.4 | 1 -
 2 files changed, 4 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 2d1eded..575c1c7 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -4708,9 +4708,6 @@ package.use : media-fonts/monafont:0 -truetype X
 [media-fonts/mplus-fonts:0]
 package.use : media-fonts/mplus-fonts:0 X
 
-[media-fonts/nanumfont:0]
-package.use : media-fonts/nanumfont:0 X
-
 [media-fonts/nepali-fonts:0]
 package.use : media-fonts/nepali-fonts:0 X
 

diff --git a/core/var/lib/portage/world.CYCLE.4 
b/core/var/lib/portage/world.CYCLE.4
index 47df1e6..aa525b0 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -1988,7 +1988,6 @@ media-fonts/mikachan-font-ttc
 media-fonts/mikachan-font-ttf
 media-fonts/monafont
 media-fonts/mplus-fonts
-media-fonts/nanumfont
 media-fonts/nepali-fonts
 media-fonts/noto
 media-fonts/oldstandard

[gentoo-commits] proj/grs:desktop-amd64-musl-hardened commit in: core/etc/grs/, core/var/lib/portage/

[Anthony G. Basile]

commit: d46468a96e14a867038370be966f31a1f1acba18
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Nov  8 17:20:50 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Nov  8 17:21:23 2015 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=d46468a9

world: remove media-fonts/nanumfont

 core/etc/grs/world.conf| 3 ---
 core/var/lib/portage/world.CYCLE.4 | 1 -
 2 files changed, 4 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 23882f4..c7019f3 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -4710,9 +4710,6 @@ package.use : media-fonts/monafont:0 -truetype X
 [media-fonts/mplus-fonts:0]
 package.use : media-fonts/mplus-fonts:0 X
 
-[media-fonts/nanumfont:0]
-package.use : media-fonts/nanumfont:0 X
-
 [media-fonts/nepali-fonts:0]
 package.use : media-fonts/nepali-fonts:0 X
 

diff --git a/core/var/lib/portage/world.CYCLE.4 
b/core/var/lib/portage/world.CYCLE.4
index ff89461..a30b8ea 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -1982,7 +1982,6 @@ media-fonts/mikachan-font-ttc
 media-fonts/mikachan-font-ttf
 media-fonts/monafont
 media-fonts/mplus-fonts
-media-fonts/nanumfont
 media-fonts/nepali-fonts
 media-fonts/noto
 media-fonts/oldstandard

[gentoo-commits] proj/grs:desktop-amd64-x32-hardened commit in: core/var/lib/portage/, core/etc/grs/

[Anthony G. Basile]

commit: fd162f6ed1d7b8ab9c476df4c7c1a56aa499b8f3
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Nov  8 17:20:50 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Nov  8 17:20:50 2015 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=fd162f6e

world: remove media-fonts/nanumfont

 core/etc/grs/world.conf| 3 ---
 core/var/lib/portage/world.CYCLE.4 | 1 -
 2 files changed, 4 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index 2d1eded..575c1c7 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -4708,9 +4708,6 @@ package.use : media-fonts/monafont:0 -truetype X
 [media-fonts/mplus-fonts:0]
 package.use : media-fonts/mplus-fonts:0 X
 
-[media-fonts/nanumfont:0]
-package.use : media-fonts/nanumfont:0 X
-
 [media-fonts/nepali-fonts:0]
 package.use : media-fonts/nepali-fonts:0 X
 

diff --git a/core/var/lib/portage/world.CYCLE.4 
b/core/var/lib/portage/world.CYCLE.4
index f9c7714..4d40086 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -1988,7 +1988,6 @@ media-fonts/mikachan-font-ttc
 media-fonts/mikachan-font-ttf
 media-fonts/monafont
 media-fonts/mplus-fonts
-media-fonts/nanumfont
 media-fonts/nepali-fonts
 media-fonts/noto
 media-fonts/oldstandard

[gentoo-commits] proj/grs:desktop-amd64-uclibc-hardened commit in: core/var/lib/portage/, core/etc/grs/

[Anthony G. Basile]

commit: 6a1225d7fb7458b514502c7167bd0e0d01936994
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Nov  8 17:20:50 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Nov  8 17:21:17 2015 +
URL:https://gitweb.gentoo.org/proj/grs.git/commit/?id=6a1225d7

world: remove media-fonts/nanumfont

 core/etc/grs/world.conf| 3 ---
 core/var/lib/portage/world.CYCLE.4 | 1 -
 2 files changed, 4 deletions(-)

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index b30d6a2..f3b47b5 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -4781,9 +4781,6 @@ package.use : media-fonts/monafont:0 -truetype X
 [media-fonts/mplus-fonts:0]
 package.use : media-fonts/mplus-fonts:0 X
 
-[media-fonts/nanumfont:0]
-package.use : media-fonts/nanumfont:0 X
-
 [media-fonts/nepali-fonts:0]
 package.use : media-fonts/nepali-fonts:0 X
 

diff --git a/core/var/lib/portage/world.CYCLE.4 
b/core/var/lib/portage/world.CYCLE.4
index 1c0c043..bef95f4 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -1988,7 +1988,6 @@ media-fonts/mikachan-font-ttc
 media-fonts/mikachan-font-ttf
 media-fonts/monafont
 media-fonts/mplus-fonts
-media-fonts/nanumfont
 media-fonts/nepali-fonts
 media-fonts/noto
 media-fonts/oldstandard

[gentoo-commits] proj/gentoolkit: New branch: gentoolkit

[Brian Dolbec]

commit: 
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Nov  8 17:33:34 2015 +

New branch: gentoolkit

[gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/equery/

[Brian Dolbec]

commit: 8f226fd87cc96c997a6be5adb29ed6e6787d0791
Author: Brian Dolbec  gentoo  org>
AuthorDate: Sun Nov  8 17:15:03 2015 +
Commit: Brian Dolbec  gentoo  org>
CommitDate: Sun Nov  8 17:36:27 2015 +
URL:https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=8f226fd8

equery/meta.py: Fix a traceback reported by Manuel Rueger

equery m python-whiteboard
 * x11-apps/python-whiteboard [gentoo]
Herd:proxy-maintainers (proxy-maint  gentoo.org)
Maintainer:  lxnay  gentoo.org (Fabio Erculiani)
 Maintainer. Assign bugs to him
Maintainer:  ziapannocchia  gmail.com (Marco Clocchiatti)
 Proxy maintainer. CC him on bugs
Traceback (most recent call last):
  File "/usr/lib/python-exec/python2.7/equery", line 38, in 
equery.main(sys.argv)
  File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/__init__.py", line 
357, in main
loaded_module.main(module_args)
  File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 
567, in main
call_format_functions(best_match, matches)
  File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 
338, in call_format_functions
upstream = format_upstream(best_match.metadata.upstream())
  File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 
220, in format_upstream
upmaints = format_maintainers(up.maintainers)
  File "/usr/lib64/python2.7/site-packages/gentoolkit/equery/meta.py", line 
185, in format_maintainers
maintstr += " (%s)" % (maint.name,) if maint.name else ''
TypeError: unsupported operand type(s) for +=: 'NoneType' and 'str'

Signed-off-by: Brian Dolbec  gentoo.org>

 pym/gentoolkit/equery/meta.py | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index d3342cd..1a07999 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -179,14 +179,11 @@ def format_maintainers(maints):
 
result = []
for maint in maints:
-   maintstr = ''
-   maintstr = maint.email
+   maintstr = maint.email or ''
if CONFIG['verbose']:
-   maintstr += " (%s)" % (maint.name,) if maint.name else 
''
-   maintstr += " - %s" % (maint.restrict,) if 
maint.restrict else ''
-   maintstr += "\n%s" % (
-   (maint.description,) if maint.description else 
''
-   )
+   maintstr += " (%s)" % (maint.name or'')
+   maintstr += " - %s" % (maint.restrict or '')
+   maintstr += "\n%s" % (maint.description or '')
result.append(maintstr)
 
return result