[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 15/08/08 09:32:50
Modified: ChangeLog git-r3.eclass
Log:
Add some boldness to output. Update/fix pkg_needrebuild() for
smart-live-rebuild.
Revision ChangesPath
1.1750 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1750view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1750content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1749r2=1.1750
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -r1.1749 -r1.1750
--- ChangeLog 7 Aug 2015 02:05:19 - 1.1749
+++ ChangeLog 8 Aug 2015 09:32:50 - 1.1750
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1749 2015/08/07
02:05:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1750 2015/08/08
09:32:50 mgorny Exp $
+
+ 08 Aug 2015; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Add some boldness to output. Update/fix pkg_needrebuild() for
+ smart-live-rebuild.
07 Aug 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
Fix bugs #549140 and #552942.
1.51 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.51view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.51content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.50r2=1.51
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- git-r3.eclass 9 Jul 2015 20:21:05 - 1.50
+++ git-r3.eclass 8 Aug 2015 09:32:50 - 1.51
@@ -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/eclass/git-r3.eclass,v 1.50 2015/07/09
20:21:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.51 2015/08/08
09:32:50 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -185,19 +185,19 @@
;;
single)
if [[ ${EGIT_CLONE_TYPE} == shallow ]]; then
- einfo git-r3: ebuild needs to be cloned in
'single' mode, adjusting
+ einfo git-r3: ebuild needs to be cloned in
'\e[1msingle\e[22m' mode, adjusting
EGIT_CLONE_TYPE=single
fi
;;
single+tags)
if [[ ${EGIT_CLONE_TYPE} == shallow ||
${EGIT_CLONE_TYPE} == single ]]; then
- einfo git-r3: ebuild needs to be cloned in
'single+tags' mode, adjusting
+ einfo git-r3: ebuild needs to be cloned in
'\e[1msingle+tags\e[22m' mode, adjusting
EGIT_CLONE_TYPE=single+tags
fi
;;
mirror)
if [[ ${EGIT_CLONE_TYPE} != mirror ]]; then
- einfo git-r3: ebuild needs to be cloned in
'mirror' mode, adjusting
+ einfo git-r3: ebuild needs to be cloned in
'\e[1mmirror\e[22m' mode, adjusting
EGIT_CLONE_TYPE=mirror
fi
;;
@@ -532,7 +532,7 @@
umask ${EVCS_UMASK} || die Bad options to umask:
${EVCS_UMASK}
fi
for r in ${repos[@]}; do
- einfo Fetching ${r} ...
+ einfo Fetching \e[1m${r}\e[22m ...
local fetch_command=( git fetch ${r} )
local clone_type=${EGIT_CLONE_TYPE}
@@ -553,11 +553,11 @@
# so automatically switch to single+tags mode.
if [[ ${clone_type} == shallow ]]; then
einfo Google Code does not support shallow
clones
- einfo using EGIT_CLONE_TYPE=single+tags
+ einfo using
\e[1mEGIT_CLONE_TYPE=single+tags\e[22m
clone_type=single+tags
elif [[ ${clone_type} == single ]]; then
einfo git-r3: Google Code does not send tags
properly in 'single' mode
- einfo using EGIT_CLONE_TYPE=single+tags
+ einfo using
\e[1mEGIT_CLONE_TYPE=single+tags\e[22m
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ghc-package.eclass haskell-cabal.eclass
slyfox 15/08/06 08:20:33
Modified: ChangeLog ghc-package.eclass haskell-cabal.eclass
Log:
Add new helpers: 'ghc-pm-version' to get ghc version as seen by package
manager and 'ghc-is-dynamic' to workaround ghc-api bug
https://ghc.haskell.org/trac/ghc/ticket/10301 in ebuild.
Revision ChangesPath
1.1747 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1747view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1747content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1746r2=1.1747
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1746
retrieving revision 1.1747
diff -u -r1.1746 -r1.1747
--- ChangeLog 5 Aug 2015 19:23:28 - 1.1746
+++ ChangeLog 6 Aug 2015 08:20:33 - 1.1747
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1746 2015/08/05
19:23:28 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1747 2015/08/06
08:20:33 slyfox Exp $
+
+ 06 Aug 2015; Sergei Trofimovich sly...@gentoo.org ghc-package.eclass,
+ haskell-cabal.eclass:
+ Add new helpers: 'ghc-pm-version' to get ghc version as seen by package
+ manager and 'ghc-is-dynamic' to workaround ghc-api bug
+ https://ghc.haskell.org/trac/ghc/ticket/10301 in ebuild.
05 Aug 2015; William Hubbs willi...@gentoo.org golang-vcs-snapshot.eclass:
add || die and fix indentation
1.42 eclass/ghc-package.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.42view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?rev=1.42content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ghc-package.eclass?r1=1.41r2=1.42
Index: ghc-package.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ghc-package.eclass 28 Mar 2015 13:32:40 - 1.41
+++ ghc-package.eclass 6 Aug 2015 08:20:33 - 1.42
@@ -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/eclass/ghc-package.eclass,v 1.41 2015/03/28
13:32:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ghc-package.eclass,v 1.42 2015/08/06
08:20:33 slyfox Exp $
# @ECLASS: ghc-package.eclass
# @MAINTAINER:
@@ -64,7 +64,9 @@
# @FUNCTION: ghc-version
# @DESCRIPTION:
-# returns the version of ghc
+# returns upstream version of ghc
+# as reported by '--numeric-version'
+# Examples: 7.10.2, 7.9.20141222
_GHC_VERSION_CACHE=
ghc-version() {
if [[ -z ${_GHC_VERSION_CACHE} ]]; then
@@ -73,6 +75,22 @@
echo ${_GHC_VERSION_CACHE}
}
+# @FUNCTION: ghc-pm-version
+# @DESCRIPTION:
+# returns package manager(PM) version of ghc
+# as reported by '$(best_version)'
+# Examples: PM:7.10.2, PM:7.10.2_rc1, PM:7.8.4-r4
+_GHC_PM_VERSION_CACHE=
+ghc-pm-version() {
+ local pm_ghc_p
+
+ if [[ -z ${_GHC_PM_VERSION_CACHE} ]]; then
+ pm_ghc_p=$(best_version dev-lang/ghc)
+ _GHC_PM_VERSION_CACHE=PM:${pm_ghc_p#dev-lang/ghc-}
+ fi
+ echo ${_GHC_PM_VERSION_CACHE}
+}
+
# @FUNCTION: ghc-cabal-version
# @DESCRIPTION:
# return version of the Cabal library bundled with ghc
@@ -102,6 +120,15 @@
done
return 1
}
+# @FUNCTION: ghc-is-dynamic
+# @DESCRIPTION:
+# checks if ghc is built against dynamic libraries
+# binaries linked against GHC library (and using plugin loading)
+# have to be linked the same way:
+#https://ghc.haskell.org/trac/ghc/ticket/10301
+ghc-is-dynamic() {
+ $(ghc-getghc) --info | grep GHC Dynamic | grep -q YES
+}
# @FUNCTION: ghc-supports-shared-libraries
# @DESCRIPTION:
@@ -211,8 +238,8 @@
local collided=`$(ghc-getghcpkgbin) -f ${initial_pkg_db} list
--simple-output ${checked_pkg}`
if [[ -n ${collided} ]]; then
- eerror Package ${checked_pkg} is shipped with
$(ghc-version).
- eerror Ebuild author forgot CABAL_CORE_LIB_GHC_PV
entry.
+ eerror Cabal package '${checked_pkg}' is shipped with
'$(ghc-pm-version)' ('$(ghc-version)').
+ eerror Ebuild author forgot an entry in
CABAL_CORE_LIB_GHC_PV='${CABAL_CORE_LIB_GHC_PV}'.
eerror Found in ${initial_pkg_db}.
die
fi
1.53 eclass/haskell-cabal.eclass
file :
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
pesa15/08/07 01:07:09
Modified: ChangeLog qt5-build.eclass
Log:
Allow passing arguments to qmake from ebuilds via the myqmakeargs array.
Revision ChangesPath
1.1748 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1748view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1748content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1747r2=1.1748
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1747
retrieving revision 1.1748
diff -u -r1.1747 -r1.1748
--- ChangeLog 6 Aug 2015 08:20:33 - 1.1747
+++ ChangeLog 7 Aug 2015 01:07:09 - 1.1748
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1747 2015/08/06
08:20:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1748 2015/08/07
01:07:09 pesa Exp $
+
+ 07 Aug 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
+ Allow passing arguments to qmake from ebuilds via the myqmakeargs array.
06 Aug 2015; Sergei Trofimovich sly...@gentoo.org ghc-package.eclass,
haskell-cabal.eclass:
1.22 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.22view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.22content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.21r2=1.22
Index: qt5-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt5-build.eclass13 Jul 2015 00:51:16 - 1.21
+++ qt5-build.eclass7 Aug 2015 01:07:09 - 1.22
@@ -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/eclass/qt5-build.eclass,v 1.21 2015/07/13
00:51:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.22 2015/08/07
01:07:09 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -225,8 +225,10 @@
# @DESCRIPTION:
# Runs tests in the target directories.
qt5-build_src_test() {
- # '-after SUBDIRS-=...' disables broken cmake tests (bug 474004)
- qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake
SUBDIRS-=installed_cmake
+ # disable broken cmake tests (bug 474004)
+ local myqmakeargs=(${myqmakeargs[@]} -after SUBDIRS-=cmake
SUBDIRS-=installed_cmake)
+
+ qt5_foreach_target_subdir qt5_qmake
qt5_foreach_target_subdir emake
# create a custom testrunner script that correctly sets
@@ -661,6 +663,7 @@
fi
${qmakepath}/qmake \
+ ${projectdir} \
CONFIG+=$(usex debug debug release) \
CONFIG-=$(usex debug release debug) \
QMAKE_AR=$(tc-getAR) cqs \
@@ -682,8 +685,7 @@
QMAKE_LFLAGS=${LDFLAGS} \
QMAKE_LFLAGS_RELEASE= \
QMAKE_LFLAGS_DEBUG= \
- ${projectdir} \
- $@ \
+ ${myqmakeargs[@]} \
|| die qmake failed (${projectdir#${S}/})
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
pesa15/08/07 02:05:19
Modified: ChangeLog qt5-build.eclass
Log:
Fix bugs #549140 and #552942.
Revision ChangesPath
1.1749 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1749view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1749content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1748r2=1.1749
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1748
retrieving revision 1.1749
diff -u -r1.1748 -r1.1749
--- ChangeLog 7 Aug 2015 01:07:09 - 1.1748
+++ ChangeLog 7 Aug 2015 02:05:19 - 1.1749
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1748 2015/08/07
01:07:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1749 2015/08/07
02:05:19 pesa Exp $
+
+ 07 Aug 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
+ Fix bugs #549140 and #552942.
07 Aug 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
Allow passing arguments to qmake from ebuilds via the myqmakeargs array.
1.23 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.23view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.23content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.22r2=1.23
Index: qt5-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt5-build.eclass7 Aug 2015 01:07:09 - 1.22
+++ qt5-build.eclass7 Aug 2015 02:05:19 - 1.23
@@ -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/eclass/qt5-build.eclass,v 1.22 2015/08/07
01:07:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.23 2015/08/07
02:05:19 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -195,6 +195,14 @@
find config.tests/unix -name '*.test' -type f \
-execdir sed -i -e '/bin\/qmake/ s/-nocache //' '{}' + \
|| die sed failed (config.tests)
+
+ # Don't add -O3 to CXXFLAGS (bug 549140)
+ sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
+ src/{corelib/corelib,gui/gui}.pro || die sed failed
(optimize_full)
+
+ # Don't force sse2 on x86 (bug 552942)
+ sed -i -e 's/^sse2:/false:/' \
+ mkspecs/features/qt_module.prf || die sed failed
(sse2)
fi
# apply patches
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-vcs-snapshot.eclass
williamh15/08/05 15:42:55
Modified: ChangeLog
Added:golang-vcs-snapshot.eclass
Log:
Add eclass for vcs snapshots of software written in Go.
Revision ChangesPath
1.1745 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1745view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1745content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1744r2=1.1745
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1744
retrieving revision 1.1745
diff -u -r1.1744 -r1.1745
--- ChangeLog 3 Aug 2015 18:31:41 - 1.1744
+++ ChangeLog 5 Aug 2015 15:42:55 - 1.1745
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1744 2015/08/03
18:31:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1745 2015/08/05
15:42:55 williamh Exp $
+
+ 05 Aug 2015; William Hubbs willi...@gentoo.org +golang-vcs-snapshot.eclass:
+ Add eclass for vcs snapshots of software written in Go.
03 Aug 2015; Michael Sterrett mr_bon...@gentoo.org python-utils-r1.eclass:
Add quotes to support reading from files with spaces in the filename.
1.1 eclass/golang-vcs-snapshot.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs-snapshot.eclass?rev=1.1view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs-snapshot.eclass?rev=1.1content-type=text/plain
Index: golang-vcs-snapshot.eclass
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs-snapshot.eclass,v 1.1
2015/08/05 15:42:55 williamh Exp $
# @ECLASS: golang-vcs-snapshot.eclass
# @MAINTAINER:
# William Hubbs willi...@gentoo.org
# @BLURB: support eclass for unpacking VCS snapshot tarballs for
# software written in the Go programming language
# @DESCRIPTION:
# This eclass provides a convenience src_unpack() which unpacks the
# first tarball mentioned in SRC_URI to its appropriate location in
# ${WORKDIR}/${P}, treating ${WORKDIR}/${P} as a go workspace.
#
# The location where the tarball is extracted is defined as
# ${WORKDIR}/${P}/src/${EGO_PN}.
#
# The typical use case is VCS snapshots coming from github, bitbucket
# and similar services.
#
# Please note that this eclass currently handles only tarballs
# (.tar.gz), but support for more formats may be added in the future.
#
# @EXAMPLE:
#
# @CODE
# EGO_PN=github.com/user/package
# inherit golang-vcs-snapshot
#
# SRC_URI=http://github.com/example/${PN}/tarball/v${PV} - ${P}.tar.gz
# @CODE
#
# The above example will extract the tarball to
# ${WORKDIR}/${P}/src/github.com/user/package
inherit golang-base
case ${EAPI:-0} in
5) ;;
*) die ${ECLASS} API in EAPI ${EAPI} not yet established.
esac
EXPORT_FUNCTIONS src_unpack
# @FUNCTION: golang-vcs-snapshot_src_unpack
# @DESCRIPTION:
# Extract the first archive from ${A} to the appropriate location for GOPATH.
golang-vcs-snapshot_src_unpack() {
local x
ego_pn_check
set -- ${A}
x=$1
mkdir -p ${WORKDIR}/${P}/src/${EGO_PN%/*}
tar -C ${WORKDIR}/${P}/src/${EGO_PN%/*} -x --strip-components 1 \
-f ${DISTDIR}/${x} || die
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-vcs-snapshot.eclass
williamh15/08/05 19:23:28
Modified: ChangeLog golang-vcs-snapshot.eclass
Log:
add || die and fix indentation
Revision ChangesPath
1.1746 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1746view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1746content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1745r2=1.1746
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1745
retrieving revision 1.1746
diff -u -r1.1745 -r1.1746
--- ChangeLog 5 Aug 2015 15:42:55 - 1.1745
+++ ChangeLog 5 Aug 2015 19:23:28 - 1.1746
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1745 2015/08/05
15:42:55 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1746 2015/08/05
19:23:28 williamh Exp $
+
+ 05 Aug 2015; William Hubbs willi...@gentoo.org golang-vcs-snapshot.eclass:
+ add || die and fix indentation
05 Aug 2015; William Hubbs willi...@gentoo.org +golang-vcs-snapshot.eclass:
Add eclass for vcs snapshots of software written in Go.
1.2 eclass/golang-vcs-snapshot.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs-snapshot.eclass?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs-snapshot.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs-snapshot.eclass?r1=1.1r2=1.2
Index: golang-vcs-snapshot.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/golang-vcs-snapshot.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- golang-vcs-snapshot.eclass 5 Aug 2015 15:42:55 - 1.1
+++ golang-vcs-snapshot.eclass 5 Aug 2015 19:23:28 - 1.2
@@ -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/eclass/golang-vcs-snapshot.eclass,v 1.1
2015/08/05 15:42:55 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs-snapshot.eclass,v 1.2
2015/08/05 19:23:28 williamh Exp $
# @ECLASS: golang-vcs-snapshot.eclass
# @MAINTAINER:
@@ -50,7 +50,7 @@
ego_pn_check
set -- ${A}
x=$1
- mkdir -p ${WORKDIR}/${P}/src/${EGO_PN%/*}
+ mkdir -p ${WORKDIR}/${P}/src/${EGO_PN%/*} || die
tar -C ${WORKDIR}/${P}/src/${EGO_PN%/*} -x --strip-components 1 \
-f ${DISTDIR}/${x} || die
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass
kensington15/08/03 14:03:00
Modified: ChangeLog kde5.eclass
Log:
Do not compress handbooks.
Revision ChangesPath
1.1743 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1743view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1743content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1742r2=1.1743
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1742
retrieving revision 1.1743
diff -u -r1.1742 -r1.1743
--- ChangeLog 2 Aug 2015 23:12:16 - 1.1742
+++ ChangeLog 3 Aug 2015 14:03:00 - 1.1743
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1742 2015/08/02
23:12:16 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1743 2015/08/03
14:03:00 kensington Exp $
+
+ 03 Aug 2015; Michael Palimaka kensing...@gentoo.org kde5.eclass:
+ Do not compress handbooks.
02 Aug 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks to
1.14 eclass/kde5.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.14view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.14content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.13r2=1.14
Index: kde5.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kde5.eclass 6 Jul 2015 15:48:51 - 1.13
+++ kde5.eclass 3 Aug 2015 14:03:00 - 1.14
@@ -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/eclass/kde5.eclass,v 1.13 2015/07/06
15:48:51 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.14 2015/08/03
14:03:00 kensington Exp $
# @ECLASS: kde5.eclass
# @MAINTAINER:
@@ -513,6 +513,12 @@
fi
cmake-utils_src_install
+
+ # We don't want ${PREFIX}/share/doc/HTML to be compressed,
+ # because then khelpcenter can't find the docs
+ if [[ -d ${ED}/${PREFIX}/share/doc/HTML ]]; then
+ docompress -x ${PREFIX}/share/doc/HTML
+ fi
}
# @FUNCTION: kde5_pkg_preinst
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/08/02 23:12:16
Modified: ChangeLog java-utils-2.eclass
Log:
Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks
to sping for the patch. Also simplify die logic around
java-pkg_javac-args. die handling has improved since this was written.
Revision ChangesPath
1.1742 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1742view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1742content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1741r2=1.1742
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -r1.1741 -r1.1742
--- ChangeLog 31 Jul 2015 07:56:17 - 1.1741
+++ ChangeLog 2 Aug 2015 23:12:16 - 1.1742
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1741 2015/07/31
07:56:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1742 2015/08/02
23:12:16 chewi Exp $
+
+ 02 Aug 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Allow java-pkg_get-javac to be called alone. Fixes bug #172594. Thanks to
+ sping for the patch. Also simplify die logic around java-pkg_javac-args. die
+ handling has improved since this was written.
31 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
1.169eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.169view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.169content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.168r2=1.169
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- java-utils-2.eclass 31 Jul 2015 07:56:17 - 1.168
+++ java-utils-2.eclass 2 Aug 2015 23:12:16 - 1.169
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168
2015/07/31 07:56:17 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.169
2015/08/02 23:12:16 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -262,14 +262,14 @@
popd /dev/null || die popd failed
}
-# @FUNCTION: java-pkg_rm_files
+# @FUNCTION: java-pkg_rm_files
# @USAGE: java-pkg_rm_files File1.java File2.java ...
# @DESCRIPTION:
# Remove unneeded files in ${S}.
#
# Every now and then, you'll run into situations whereby a file needs removing,
# be it a unit test or a regular java class.
-#
+#
# You can use this function by either:
# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
# the list of files you wish to remove.
@@ -1583,7 +1583,7 @@
java-pkg_get-javac() {
debug-print-function ${FUNCNAME} $*
-
+ java-pkg_init-compiler_
local compiler=${GENTOO_COMPILER}
local compiler_executable
@@ -1602,18 +1602,15 @@
export JAVAC=${old_javac}
if [[ -z ${compiler_executable} ]]; then
- echo JAVAC is empty or undefined in
${compiler_env}
- return 1
+ die JAVAC is empty or undefined in
${compiler_env}
fi
# check that it's executable
if [[ ! -x ${compiler_executable} ]]; then
- echo ${compiler_executable} doesn't exist, or
isn't executable
- return 1
+ die ${compiler_executable} doesn't exist, or
isn't executable
fi
else
- echo Could not find environment file for ${compiler}
- return 1
+ die Could not find environment file for ${compiler}
fi
fi
echo ${compiler_executable}
@@ -1638,9 +1635,7 @@
debug-print want target: ${want_target}
if [[ -z ${want_source} || -z ${want_target} ]]; then
- debug-print could not find valid -source/-target values for
javac
- echo Could not find valid -source/-target values for javac
- return 1
+ die Could not find valid -source/-target values for javac
else
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
monsieurp15/07/31 07:56:17
Modified: ChangeLog java-utils-2.eclass
Log:
Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
java-pkg_rm_files.
Revision ChangesPath
1.1741 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1741content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1740r2=1.1741
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1740
retrieving revision 1.1741
diff -u -r1.1740 -r1.1741
--- ChangeLog 30 Jul 2015 22:17:08 - 1.1740
+++ ChangeLog 31 Jul 2015 07:56:17 - 1.1741
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30
22:17:08 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1741 2015/07/31
07:56:17 monsieurp Exp $
+
+ 31 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
+ Document JAVA_RM_FILES variable. Also, fix documentation and correct typos in
+ java-pkg_rm_files.
30 Jul 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
1.168eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.168content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.167r2=1.168
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- java-utils-2.eclass 30 Jul 2015 22:17:08 - 1.167
+++ java-utils-2.eclass 31 Jul 2015 07:56:17 - 1.168
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167
2015/07/30 22:17:08 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.168
2015/07/31 07:56:17 monsieurp Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -126,6 +126,20 @@
# JAVA_PKG_WANT_TARGET=1.3 emerge bar
# @CODE
+# @ECLASS-VARIABLE: JAVA_RM_FILES
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# An array containing a list of files to remove. If defined, this array will be
+# automatically handed over to java-pkg_rm_files for processing during the
+# src_prepare phase.
+#
+# @CODE
+# JAVA_RM_FILES=(
+# path/to/File1.java
+# DELETEME.txt
+# )
+# @CODE
+
# @VARIABLE: JAVA_PKG_COMPILER_DIR
# @INTERNAL
# @DESCRIPTION:
@@ -263,29 +277,25 @@
# you wish to remove.
#
# Both way work and it is left to the developer's preferences. If the
-# JAVA_RM_FILES array is defined, it is will be automatically handed over to
-# java-pkg_rm_files.
+# JAVA_RM_FILES array is defined, it will be automatically handed over to
+# java-pkg_rm_files during the src_prepare phase.
#
# See java-utils-2_src_prepare.
#
# @CODE
+# java-pkg_rm_files File1.java File2.java
+# @CODE
#
# @param $* - list of files to remove.
-# JAVA_RM_FILES - array containing files to remove.
-# if defined, automatically handed over to java-pkg_rm_files in
java-utils-2_src_prepare.
-#
-# @CODE
java-pkg_rm_files() {
debug-print-function ${FUNCNAME} $*
- OIFS=$IFS
- IFS=\n
+ local IFS=\n
for filename in $@; do
[[ ! -f ${filename} ]] die ${filename} is not a regular
file. Aborting.
einfo Removing unneeded file ${filename}
rm -f ${S}/${filename} || die cannot remove ${filename}
eend $?
done
- IFS=$OIFS
}
# @FUNCTION: java-pkg_dojar
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
grknight15/07/30 14:04:41
Modified: ChangeLog mysql-multilib.eclass
Log:
Reset mycmakeargs between ABIs
Revision ChangesPath
1.1738 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1738view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1738content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1737r2=1.1738
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1737
retrieving revision 1.1738
diff -u -r1.1737 -r1.1738
--- ChangeLog 30 Jul 2015 04:22:47 - 1.1737
+++ ChangeLog 30 Jul 2015 14:04:41 - 1.1738
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30
04:22:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30
14:04:41 grknight Exp $
+
+ 30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
+ Reset variables between ABIs
30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
Add blocker below virtual/mysql-5.6-r4 for new split ebuilds
1.26 eclass/mysql-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.26view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.26content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.25r2=1.26
Index: mysql-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mysql-multilib.eclass 30 Jul 2015 04:22:47 - 1.25
+++ mysql-multilib.eclass 30 Jul 2015 14:04:41 - 1.26
@@ -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/eclass/mysql-multilib.eclass,v 1.25
2015/07/30 04:22:47 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.26
2015/07/30 14:04:41 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -693,6 +693,8 @@
-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
cmake-utils_src_configure
+ # Reset for each ABI
+ mycmakeargs=( )
}
mysql-multilib_src_compile() {
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
grknight15/07/30 20:34:57
Modified: ChangeLog mysql-multilib.eclass
Log:
Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra
defines in the ebuild
Revision ChangesPath
1.1739 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1739content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1738r2=1.1739
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1738
retrieving revision 1.1739
diff -u -r1.1738 -r1.1739
--- ChangeLog 30 Jul 2015 14:04:41 - 1.1738
+++ ChangeLog 30 Jul 2015 20:34:57 - 1.1739
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1738 2015/07/30
14:04:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30
20:34:57 grknight Exp $
+
+ 30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
+ Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra
+ defines in the ebuild
30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
Reset variables between ABIs
1.27 eclass/mysql-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.27content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.26r2=1.27
Index: mysql-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mysql-multilib.eclass 30 Jul 2015 14:04:41 - 1.26
+++ mysql-multilib.eclass 30 Jul 2015 20:34:57 - 1.27
@@ -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/eclass/mysql-multilib.eclass,v 1.26
2015/07/30 14:04:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.27
2015/07/30 20:34:57 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -45,6 +45,18 @@
# VARIABLES:
#
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NATIVE_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments for native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_NONNATIVE_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments for non-native multilib builds
+
+# @ECLASS-VARIABLE: MYSQL_CMAKE_EXTRA_DEFINES
+# @DESCRIPTION:
+# Add extra CMake arguments
+
# Shorten the path because the socket path length must be shorter than 107
chars
# and we will run a mysql server during test phase
S=${WORKDIR}/mysql
@@ -589,7 +601,7 @@
fi
# debug hack wrt #497532
- mycmakeargs+=(
+ mycmakeargs=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
@@ -624,13 +636,6 @@
-DWITH_DEFAULT_FEATURE_SET=0
)
- # systemtap only works on native ABI bug 530132
- if multilib_is_native_abi; then
- mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
- else
- mycmakeargs+=( -DENABLE_DTRACE=0 )
- fi
-
if in_iuse client-libs ; then
mycmakeargs+=( -DWITHOUT_CLIENTLIBS=$(usex client-libs 0 1) )
fi
@@ -687,14 +692,23 @@
fi
fi
+ # systemtap only works on native ABI bug 530132
+ if multilib_is_native_abi; then
+ mycmakeargs+=( $(cmake-utils_use_enable systemtap DTRACE) )
+ [[ ${MYSQL_CMAKE_NATIVE_DEFINES} ]] mycmakeargs+=(
${MYSQL_CMAKE_NATIVE_DEFINES} )
+ else
+ mycmakeargs+=( -DENABLE_DTRACE=0 )
+ [[ ${MYSQL_CMAKE_NONNATIVE_DEFINES} ]] mycmakeargs+=(
${MYSQL_CMAKE_NONNATIVE_DEFINES} )
+ fi
+
+ [[ ${MYSQL_CMAKE_EXTRA_DEFINES} ]] mycmakeargs+=(
${MYSQL_CMAKE_EXTRA_DEFINES} )
+
# Always build NDB with mysql-cluster for libndbclient
[[ ${PN} == mysql-cluster ]] mycmakeargs+=(
-DWITH_NDBCLUSTER=1 -DWITH_PARTITION_STORAGE_ENGINE=1
-DWITHOUT_PARTITION_STORAGE_ENGINE=0 )
cmake-utils_src_configure
- # Reset for each ABI
- mycmakeargs=( )
}
mysql-multilib_src_compile() {
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/07/30 22:17:09
Modified: ChangeLog java-utils-2.eclass
Log:
Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis
that we won't be committing EAPI 0|1 ebuilds any more.
Revision ChangesPath
1.1740 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1740content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1739r2=1.1740
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1739
retrieving revision 1.1740
diff -u -r1.1739 -r1.1740
--- ChangeLog 30 Jul 2015 20:34:57 - 1.1739
+++ ChangeLog 30 Jul 2015 22:17:08 - 1.1740
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1739 2015/07/30
20:34:57 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1740 2015/07/30
22:17:08 chewi Exp $
+
+ 30 Jul 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Fix JAVA_RM_FILES by simplifying java-utils-2_src_prepare on the basis that
+ we won't be committing EAPI 0|1 ebuilds any more.
30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
Revert bad mycmakeargs changes and introduce 3 eclass variables to have extra
1.167eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.167content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.166r2=1.167
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- java-utils-2.eclass 22 Jul 2015 09:20:07 - 1.166
+++ java-utils-2.eclass 30 Jul 2015 22:17:08 - 1.167
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166
2015/07/22 09:20:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.167
2015/07/30 22:17:08 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1819,8 +1819,7 @@
# src_prepare Searches for bundled jars
# Don't call directly, but via java-pkg-2_src_prepare!
java-utils-2_src_prepare() {
- [[ ${EBUILD_PHASE} == prepare ]]
- java-pkg_func-exists java_prepare java_prepare
+ java-pkg_func-exists java_prepare java_prepare
# Check for files in JAVA_RM_FILES array.
if [[ ${JAVA_RM_FILES[@]} ]]; then
@@ -1828,15 +1827,13 @@
java-pkg_rm_files ${JAVA_RM_FILES[@]}
fi
- # Remember that eant will call this unless called via Portage
- if [[ ! -e ${T}/java-utils-2_src_prepare-run ]] is-java-strict;
then
+ if is-java-strict; then
echo Searching for bundled jars:
java-pkg_find-normal-jars || echo None found.
echo Searching for bundled classes (no output if none found):
find ${WORKDIR} -name *.class
echo Search done.
fi
- touch ${T}/java-utils-2_src_prepare-run
}
# @FUNCTION: java-utils-2_pkg_preinst
@@ -1879,7 +1876,6 @@
if [[ ${EBUILD_PHASE} = compile ]]; then
java-ant-2_src_configure
- java-utils-2_src_prepare
fi
if ! has java-ant-2 ${INHERITED}; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
grknight15/07/30 04:22:47
Modified: ChangeLog mysql-multilib.eclass
Log:
Add blocker below virtual/mysql-5.6-r4 for new split ebuilds
Revision ChangesPath
1.1737 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1737content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1736r2=1.1737
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1736
retrieving revision 1.1737
diff -u -r1.1736 -r1.1737
--- ChangeLog 29 Jul 2015 15:01:43 - 1.1736
+++ ChangeLog 30 Jul 2015 04:22:47 - 1.1737
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29
15:01:43 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1737 2015/07/30
04:22:47 grknight Exp $
+
+ 30 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
+ Add blocker below virtual/mysql-5.6-r4 for new split ebuilds
29 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
Fix pkg_config function error with non-existant USE flags
1.25 eclass/mysql-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.25content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.24r2=1.25
Index: mysql-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mysql-multilib.eclass 29 Jul 2015 15:01:43 - 1.24
+++ mysql-multilib.eclass 30 Jul 2015 04:22:47 - 1.25
@@ -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/eclass/mysql-multilib.eclass,v 1.24
2015/07/29 15:01:43 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.25
2015/07/30 04:22:47 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -385,7 +385,8 @@
if [[ ${HAS_TOOLS_PATCH} ]] ; then
RDEPEND=${RDEPEND}
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
- !client-libs? ( virtual/libmysqlclient )
+ !client-libs? ( virtual/libmysqlclient )
+ !virtual/mysql-5.6-r4
else
RDEPEND=${RDEPEND} !minimal? ( !prefix? ( dev-db/mysql-init-scripts )
)
fi
@@ -588,7 +589,7 @@
fi
# debug hack wrt #497532
- mycmakeargs=(
+ mycmakeargs+=(
-DCMAKE_C_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=$(usex debug -DNDEBUG)
-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
grknight15/07/29 15:01:43
Modified: ChangeLog mysql-multilib.eclass
Log:
Fix pkg_config function error with non-existant USE flags
Revision ChangesPath
1.1736 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1736content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1735r2=1.1736
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1735
retrieving revision 1.1736
diff -u -r1.1735 -r1.1736
--- ChangeLog 28 Jul 2015 20:51:40 - 1.1735
+++ ChangeLog 29 Jul 2015 15:01:43 - 1.1736
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1735 2015/07/28
20:51:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1736 2015/07/29
15:01:43 grknight Exp $
+
+ 29 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
+ Fix pkg_config function error with non-existant USE flags
28 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass:
Fix configuring non-native abi which leads to build failure wrt bug 556162
1.24 eclass/mysql-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.24content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.23r2=1.24
Index: mysql-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mysql-multilib.eclass 28 Jul 2015 20:51:40 - 1.23
+++ mysql-multilib.eclass 29 Jul 2015 15:01:43 - 1.24
@@ -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/eclass/mysql-multilib.eclass,v 1.23
2015/07/28 20:51:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.24
2015/07/29 15:01:43 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -876,9 +876,14 @@
mysql_init_vars
[[ -z ${MY_DATADIR} ]] die Sorry, unable to find MY_DATADIR
-
- if built_with_use ${CATEGORY}/${PN} minimal ! built_with_use
${CATEGORY}/${PN} server ; then
- die Minimal builds do NOT include the MySQL server
+ if [[ ${HAS_TOOLS_PATCH} ]] ; then
+ if ! built_with_use ${CATEGORY}/${PN} server ; then
+ die Minimal builds do NOT include the MySQL server
+ fi
+ else
+ if built_with_use ${CATEGORY}/${PN} minimal ; then
+ die Minimal builds do NOT include the MySQL server
+ fi
fi
if [[ ( -n ${MY_DATADIR} ) ( ${MY_DATADIR} !=
${old_MY_DATADIR} ) ]]; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
grknight15/07/28 20:51:40 Modified: ChangeLog mysql-multilib.eclass Log: Fix configuring non-native abi which leads to build failure wrt bug 556162 Revision ChangesPath 1.1735 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1735view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1735content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1734r2=1.1735 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1734 retrieving revision 1.1735 diff -u -r1.1734 -r1.1735 --- ChangeLog 28 Jul 2015 01:58:13 - 1.1734 +++ ChangeLog 28 Jul 2015 20:51:40 - 1.1735 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1734 2015/07/28 01:58:13 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1735 2015/07/28 20:51:40 grknight Exp $ + + 28 Jul 2015; Brian Evans grkni...@gentoo.org mysql-multilib.eclass: + Fix configuring non-native abi which leads to build failure wrt bug 556162 28 Jul 2015; Brian Evans grkni...@gentoo.org mysql-cmake.eclass, mysql-multilib.eclass: 1.23 eclass/mysql-multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.23view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.23content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.22r2=1.23 Index: mysql-multilib.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mysql-multilib.eclass 28 Jul 2015 01:58:13 - 1.22 +++ mysql-multilib.eclass 28 Jul 2015 20:51:40 - 1.23 @@ -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/eclass/mysql-multilib.eclass,v 1.22 2015/07/28 01:58:13 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.23 2015/07/28 20:51:40 grknight Exp $ # @ECLASS: mysql-multilib.eclass # @MAINTAINER: @@ -679,7 +679,11 @@ configure_cmake_minimal fi else - configure_cmake_standard + if multilib_is_native_abi ; then + configure_cmake_standard + else + configure_cmake_minimal + fi fi # Always build NDB with mysql-cluster for libndbclient
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass
floppym 15/07/27 16:31:01
Modified: ChangeLog python-r1.eclass
Log:
Drop the USE_PYTHON warning.
Revision ChangesPath
1.1728 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1728view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1728content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1727r2=1.1728
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1727
retrieving revision 1.1728
diff -u -r1.1727 -r1.1728
--- ChangeLog 25 Jul 2015 10:07:36 - 1.1727
+++ ChangeLog 27 Jul 2015 16:31:01 - 1.1728
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1727 2015/07/25
10:07:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1728 2015/07/27
16:31:01 floppym Exp $
+
+ 27 Jul 2015; Mike Gilbert flop...@gentoo.org python-r1.eclass:
+ Drop the USE_PYTHON warning.
25 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
Add missing ||die to rm -f calls, i.e. in case we do not have permission to
1.93 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.93view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.93content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.92r2=1.93
Index: python-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- python-r1.eclass4 Jul 2015 15:26:17 - 1.92
+++ python-r1.eclass27 Jul 2015 16:31:01 - 1.93
@@ -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/eclass/python-r1.eclass,v 1.92 2015/07/04
15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.93 2015/07/27
16:31:01 floppym Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -430,220 +430,6 @@
multibuild_copy_sources
}
-# @FUNCTION: _python_check_USE_PYTHON
-# @INTERNAL
-# @DESCRIPTION:
-# Check whether USE_PYTHON and PYTHON_TARGETS are in sync. Output
-# warnings if they are not.
-_python_check_USE_PYTHON() {
- debug-print-function ${FUNCNAME} ${@}
-
- if [[ ! ${_PYTHON_USE_PYTHON_CHECKED} ]]; then
- _PYTHON_USE_PYTHON_CHECKED=1
-
- # python-exec has profile-forced flags.
- if [[ ${CATEGORY}/${PN} == dev-lang/python-exec ]]; then
- return
- fi
-
- _try_eselect() {
- # The eselect solution will work only with one py2
py3.
-
- local impl py2 py3 dis_py2 dis_py3
- for impl in ${PYTHON_COMPAT[@]}; do
- _python_impl_supported ${impl} || continue
-
- if use python_targets_${impl}; then
- case ${impl} in
- python2_*)
- if [[ ${py2+1} ]]; then
- debug-print
${FUNCNAME}: - more than one py2: ${py2} ${impl}
- return 1
- fi
- py2=${impl/_/.}
- ;;
- python3_4)
- debug-print
${FUNCNAME}: python3.4 found, not using eselect
- return 1
- ;;
- python3_*)
- if [[ ${py3+1} ]]; then
- debug-print
${FUNCNAME}: - more than one py3: ${py3} ${impl}
- return 1
- fi
- py3=${impl/_/.}
- ;;
- *)
- return 1
-
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
mgorny 15/07/27 16:32:46
Modified: ChangeLog python-utils-r1.eclass
Log:
python_wrapper_setup(): replace symlinks with shell wrappers to avoid
triggering Python 3.4+ magical prefix support.
Revision ChangesPath
1.1729 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1729view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1729content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1728r2=1.1729
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1728
retrieving revision 1.1729
diff -u -r1.1728 -r1.1729
--- ChangeLog 27 Jul 2015 16:31:01 - 1.1728
+++ ChangeLog 27 Jul 2015 16:32:46 - 1.1729
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1728 2015/07/27
16:31:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1729 2015/07/27
16:32:46 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
+ python_wrapper_setup(): replace symlinks with shell wrappers to avoid
+ triggering Python 3.4+ magical prefix support.
27 Jul 2015; Mike Gilbert flop...@gentoo.org python-r1.eclass:
Drop the USE_PYTHON warning.
1.85 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.85view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.85content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.84r2=1.85
Index: python-utils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- python-utils-r1.eclass 25 Jul 2015 10:07:36 - 1.84
+++ python-utils-r1.eclass 27 Jul 2015 16:32:46 - 1.85
@@ -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/eclass/python-utils-r1.eclass,v 1.84
2015/07/25 10:07:36 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.85
2015/07/27 16:32:46 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -855,14 +855,25 @@
fi
# Python interpreter
- ln -s ${PYTHON} ${workdir}/bin/python || die
- ln -s python ${workdir}/bin/python${pyver} || die
+ # note: we don't use symlinks because python likes to do some
+ # symlink reading magic that breaks stuff
+ # https://bugs.gentoo.org/show_bug.cgi?id=555752
+ cat ${workdir}/bin/python -_EOF_
+ #!/bin/sh
+ exec ${PYTHON} \${@}
+ _EOF_
+ cp ${workdir}/bin/python ${workdir}/bin/python${pyver} ||
die
+ chmod +x ${workdir}/bin/python
${workdir}/bin/python${pyver} || die
local nonsupp=()
# CPython-specific
if [[ ${EPYTHON} == python* ]]; then
- ln -s ${PYTHON}-config ${workdir}/bin/python-config
|| die
+ cat ${workdir}/bin/python-config -_EOF_
+ #!/bin/sh
+ exec ${PYTHON}-config \${@}
+ _EOF_
+ chmod +x ${workdir}/bin/python-config || die
# Python 2.6+.
ln -s ${PYTHON/python/2to3-} ${workdir}/bin/2to3 ||
die
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
mgorny 15/07/27 16:34:10
Modified: ChangeLog python-utils-r1.eclass
Log:
python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and
required by some applications, bug #94.
Revision ChangesPath
1.1730 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1730view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1730content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1729r2=1.1730
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1729
retrieving revision 1.1730
diff -u -r1.1729 -r1.1730
--- ChangeLog 27 Jul 2015 16:32:46 - 1.1729
+++ ChangeLog 27 Jul 2015 16:34:10 - 1.1730
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1729 2015/07/27
16:32:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1730 2015/07/27
16:34:10 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
+ python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and
+ required by some applications, bug #94.
27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
python_wrapper_setup(): replace symlinks with shell wrappers to avoid
1.86 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.86view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.86content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.85r2=1.86
Index: python-utils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- python-utils-r1.eclass 27 Jul 2015 16:32:46 - 1.85
+++ python-utils-r1.eclass 27 Jul 2015 16:34:10 - 1.86
@@ -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/eclass/python-utils-r1.eclass,v 1.85
2015/07/27 16:32:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.86
2015/07/27 16:34:10 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -873,7 +873,10 @@
#!/bin/sh
exec ${PYTHON}-config \${@}
_EOF_
- chmod +x ${workdir}/bin/python-config || die
+ cp ${workdir}/bin/python-config \
+ ${workdir}/bin/python${pyver}-config || die
+ chmod +x ${workdir}/bin/python-config \
+ ${workdir}/bin/python${pyver}-config || die
# Python 2.6+.
ln -s ${PYTHON/python/2to3-} ${workdir}/bin/2to3 ||
die
@@ -883,7 +886,7 @@
${workdir}/pkgconfig/python.pc || die
ln -s python.pc
${workdir}/pkgconfig/python${pyver}.pc || die
else
- nonsupp+=( 2to3 python-config )
+ nonsupp+=( 2to3 python-config python${pyver}-config )
fi
local x
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
mgorny 15/07/27 16:35:19
Modified: ChangeLog python-utils-r1.eclass
Log:
python_wrapper_setup(): make banned helpers exit with 127.
Revision ChangesPath
1.1732 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1732view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1732content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1731r2=1.1732
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1731
retrieving revision 1.1732
diff -u -r1.1731 -r1.1732
--- ChangeLog 27 Jul 2015 16:34:48 - 1.1731
+++ ChangeLog 27 Jul 2015 16:35:19 - 1.1732
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1731 2015/07/27
16:34:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1732 2015/07/27
16:35:19 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
+ python_wrapper_setup(): make banned helpers exit with 127.
27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
Ban calling pythonN and pythonN-config when the other version of Python is
1.88 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.88view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.88content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.87r2=1.88
Index: python-utils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- python-utils-r1.eclass 27 Jul 2015 16:34:48 - 1.87
+++ python-utils-r1.eclass 27 Jul 2015 16:35:19 - 1.88
@@ -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/eclass/python-utils-r1.eclass,v 1.87
2015/07/27 16:34:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.88
2015/07/27 16:35:19 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -896,7 +896,7 @@
cat ${workdir}/bin/${x} __EOF__
#!/bin/sh
echo ${x} is not supported by ${EPYTHON} 2
-exit 1
+exit 127
__EOF__
chmod +x ${workdir}/bin/${x} || die
done
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
mgorny 15/07/27 16:34:48
Modified: ChangeLog python-utils-r1.eclass
Log:
Ban calling pythonN and pythonN-config when the other version of Python is
selected (i.e. ban python2 when python3 is used).
Revision ChangesPath
1.1731 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1731view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1731content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1730r2=1.1731
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -r1.1730 -r1.1731
--- ChangeLog 27 Jul 2015 16:34:10 - 1.1730
+++ ChangeLog 27 Jul 2015 16:34:48 - 1.1731
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1730 2015/07/27
16:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1731 2015/07/27
16:34:48 mgorny Exp $
+
+ 27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
+ Ban calling pythonN and pythonN-config when the other version of Python is
+ selected (i.e. ban python2 when python3 is used).
27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and
1.87 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.87view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.87content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.86r2=1.87
Index: python-utils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- python-utils-r1.eclass 27 Jul 2015 16:34:10 - 1.86
+++ python-utils-r1.eclass 27 Jul 2015 16:34:48 - 1.87
@@ -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/eclass/python-utils-r1.eclass,v 1.86
2015/07/27 16:34:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.87
2015/07/27 16:34:48 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -847,11 +847,13 @@
local EPYTHON PYTHON
python_export ${impl} EPYTHON PYTHON
- local pyver
+ local pyver pyother
if python_is_python3; then
pyver=3
+ pyother=2
else
pyver=2
+ pyother=3
fi
# Python interpreter
@@ -865,7 +867,7 @@
cp ${workdir}/bin/python ${workdir}/bin/python${pyver} ||
die
chmod +x ${workdir}/bin/python
${workdir}/bin/python${pyver} || die
- local nonsupp=()
+ local nonsupp=( python${pyother} python${pyother}-config )
# CPython-specific
if [[ ${EPYTHON} == python* ]]; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-base.eclass golang-build.eclass golang-vcs.eclass
williamh15/07/27 19:11:00
Modified: ChangeLog golang-build.eclass golang-vcs.eclass
Added:golang-base.eclass
Log:
Add golang-base.eclass for the basic golang functions and set up the
other go eclasses to use it.
Revision ChangesPath
1.1733 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1733view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1733content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1732r2=1.1733
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1732
retrieving revision 1.1733
diff -u -r1.1732 -r1.1733
--- ChangeLog 27 Jul 2015 16:35:19 - 1.1732
+++ ChangeLog 27 Jul 2015 19:11:00 - 1.1733
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1732 2015/07/27
16:35:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1733 2015/07/27
19:11:00 williamh Exp $
+
+ 27 Jul 2015; William Hubbs willi...@gentoo.org +golang-base.eclass,
+ golang-build.eclass, golang-vcs.eclass:
+ Add golang-base.eclass for the basic golang functions and set up the
+ other go eclasses to use it.
+
27 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
python_wrapper_setup(): make banned helpers exit with 127.
1.6 eclass/golang-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.6view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.6content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?r1=1.5r2=1.6
Index: golang-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- golang-build.eclass 23 Jul 2015 15:42:26 - 1.5
+++ golang-build.eclass 27 Jul 2015 19:11:00 - 1.6
@@ -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/eclass/golang-build.eclass,v 1.5 2015/07/23
15:42:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.6 2015/07/27
19:11:00 williamh Exp $
# @ECLASS: golang-build.eclass
# @MAINTAINER:
@@ -10,6 +10,8 @@
# This eclass provides default src_compile, src_test and src_install
# functions for software written in the Go programming language.
+inherit golang-base
+
case ${EAPI:-0} in
5)
;;
@@ -24,9 +26,6 @@
_GOLANG_BUILD=1
-DEPEND==dev-lang/go-1.4.2:=
-STRIP_MASK=*.a
-
# @ECLASS-VARIABLE: EGO_PN
# @REQUIRED
# @DESCRIPTION:
@@ -38,49 +37,10 @@
# EGO_PN=github.com/user/package
# @CODE
-# @FUNCTION: _golang-build_setup
-# @INTERNAL
-# @DESCRIPTION:
-# Make sure EGO_PN has a value.
-_golang-build_setup() {
- [[ -z ${EGO_PN} ]]
- die ${ECLASS}.eclass: EGO_PN is not set
- return 0
-}
-
-# @FUNCTION: get_golibdir
-# @DESCRIPTION:
-# Return the non-prefixed library directory where Go packages
-# should be installed
-get_golibdir() {
- echo /usr/lib/go-gentoo
-}
-
-# @FUNCTION: get_golibdir
-# @DESCRIPTION:
-# Return the library directory where Go packages should be installed
-# This is the prefixed version which should be included in GOPATH
-get_golibdir_gopath() {
- echo ${EPREFIX}$(get_golibdir)
-}
-
-# @FUNCTION: golang_install_pkgs
-# @DESCRIPTION:
-# Install Go packages.
-# This function assumes that $cwd is a Go workspace.
-golang_install_pkgs() {
- debug-print-function ${FUNCNAME} $@
-
- _golang-build_setup
- insinto $(get_golibdir)
- insopts -m0644 -p # preserve timestamps for bug 551486
- doins -r pkg src
-}
-
golang-build_src_compile() {
debug-print-function ${FUNCNAME} $@
- _golang-build_setup
+ ego_pn_check
set -- env GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) \
go build -v -work -x ${EGO_PN}
echo $@
@@ -90,7 +50,7 @@
golang-build_src_install() {
debug-print-function ${FUNCNAME} $@
- _golang-build_setup
+ ego_pn_check
set -- env GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) \
go install -v -work -x ${EGO_PN}
echo $@
@@ -101,7 +61,7 @@
golang-build_src_test() {
debug-print-function ${FUNCNAME} $@
- _golang-build_setup
+ ego_pn_check
set -- env GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) \
go test -v -work -x ${EGO_PN}
echo $@
1.4
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-cmake.eclass mysql-multilib.eclass
grknight15/07/28 01:58:13
Modified: ChangeLog mysql-cmake.eclass mysql-multilib.eclass
Log:
Add support for the split client/server options to the mysql eclasses
Revision ChangesPath
1.1734 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1734view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1734content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1733r2=1.1734
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1733
retrieving revision 1.1734
diff -u -r1.1733 -r1.1734
--- ChangeLog 27 Jul 2015 19:11:00 - 1.1733
+++ ChangeLog 28 Jul 2015 01:58:13 - 1.1734
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1733 2015/07/27
19:11:00 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1734 2015/07/28
01:58:13 grknight Exp $
+
+ 28 Jul 2015; Brian Evans grkni...@gentoo.org mysql-cmake.eclass,
+ mysql-multilib.eclass:
+ Add support for the split client/server options to the mysql eclasses
27 Jul 2015; William Hubbs willi...@gentoo.org +golang-base.eclass,
golang-build.eclass, golang-vcs.eclass:
1.28 eclass/mysql-cmake.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.28view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?rev=1.28content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-cmake.eclass?r1=1.27r2=1.28
Index: mysql-cmake.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mysql-cmake.eclass 28 Jan 2015 13:48:58 - 1.27
+++ mysql-cmake.eclass 28 Jul 2015 01:58:13 - 1.28
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.27 2015/01/28
13:48:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-cmake.eclass,v 1.28 2015/07/28
01:58:13 grknight Exp $
# @ECLASS: mysql-cmake.eclass
# @MAINTAINER:
@@ -87,26 +87,30 @@
# Helper function to configure locale cmake options
configure_cmake_locale() {
- if ! use minimal [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) ( -n
${MYSQL_DEFAULT_COLLATION} ) ]]; then
- ewarn You are using a custom charset of
${MYSQL_DEFAULT_CHARSET}
- ewarn and a collation of ${MYSQL_DEFAULT_COLLATION}.
- ewarn You MUST file bugs without these variables set.
+ if use_if_iuse minimal ; then
+ :
+ elif ! in_iuse server || use_if_iuse server ; then
+ if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) ( -n
${MYSQL_DEFAULT_COLLATION} ) ]]; then
+ ewarn You are using a custom charset of
${MYSQL_DEFAULT_CHARSET}
+ ewarn and a collation of ${MYSQL_DEFAULT_COLLATION}.
+ ewarn You MUST file bugs without these variables set.
- mycmakeargs+=(
- -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
- -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
- )
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
+ -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
+ )
- elif ! use latin1 ; then
- mycmakeargs+=(
- -DDEFAULT_CHARSET=utf8
- -DDEFAULT_COLLATION=utf8_general_ci
- )
- else
- mycmakeargs+=(
- -DDEFAULT_CHARSET=latin1
- -DDEFAULT_COLLATION=latin1_swedish_ci
- )
+ elif ! use latin1 ; then
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=utf8
+ -DDEFAULT_COLLATION=utf8_general_ci
+ )
+ else
+ mycmakeargs+=(
+ -DDEFAULT_CHARSET=latin1
+ -DDEFAULT_COLLATION=latin1_swedish_ci
+ )
+ fi
fi
}
@@ -212,7 +216,6 @@
$(mysql-cmake_use_plugin extraengine SPIDER)
$(mysql-cmake_use_plugin extraengine CONNECT)
-DCONNECT_WITH_MYSQL=1
-
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-utils-r1.eclass
mgorny 15/07/25 10:07:36
Modified: ChangeLog python-utils-r1.eclass
Log:
Add missing ||die to rm -f calls, i.e. in case we do not have permission to
remove the files.
Revision ChangesPath
1.1727 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1727view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1727content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1726r2=1.1727
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1726
retrieving revision 1.1727
diff -u -r1.1726 -r1.1727
--- ChangeLog 23 Jul 2015 15:42:26 - 1.1726
+++ ChangeLog 25 Jul 2015 10:07:36 - 1.1727
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1726 2015/07/23
15:42:26 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1727 2015/07/25
10:07:36 mgorny Exp $
+
+ 25 Jul 2015; Michał Górny mgo...@gentoo.org python-utils-r1.eclass:
+ Add missing ||die to rm -f calls, i.e. in case we do not have permission to
+ remove the files.
23 Jul 2015; William Hubbs willi...@gentoo.org golang-build.eclass:
Add functions to retrieve Go library paths and install Go packages.
1.84 eclass/python-utils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.84view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.84content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.83r2=1.84
Index: python-utils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- python-utils-r1.eclass 4 Jul 2015 15:26:17 - 1.83
+++ python-utils-r1.eclass 25 Jul 2015 10:07:36 - 1.84
@@ -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/eclass/python-utils-r1.eclass,v 1.83
2015/07/04 15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.84
2015/07/25 10:07:36 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -840,9 +840,9 @@
mkdir -p ${workdir}/{bin,pkgconfig} || die
# Clean up, in case we were supposed to do a cheap update.
- rm -f ${workdir}/bin/python{,2,3,-config}
- rm -f ${workdir}/bin/2to3
- rm -f ${workdir}/pkgconfig/python{,2,3}.pc
+ rm -f ${workdir}/bin/python{,2,3,-config} || die
+ rm -f ${workdir}/bin/2to3 || die
+ rm -f ${workdir}/pkgconfig/python{,2,3}.pc || die
local EPYTHON PYTHON
python_export ${impl} EPYTHON PYTHON
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-build.eclass
williamh15/07/23 15:42:26
Modified: ChangeLog golang-build.eclass
Log:
Add functions to retrieve Go library paths and install Go packages.
Revision ChangesPath
1.1726 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1726view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1726content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1725r2=1.1726
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -r1.1725 -r1.1726
--- ChangeLog 22 Jul 2015 12:47:40 - 1.1725
+++ ChangeLog 23 Jul 2015 15:42:26 - 1.1726
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1725 2015/07/22
12:47:40 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1726 2015/07/23
15:42:26 williamh Exp $
+
+ 23 Jul 2015; William Hubbs willi...@gentoo.org golang-build.eclass:
+ Add functions to retrieve Go library paths and install Go packages.
22 Jul 2015; Michael Palimaka kensing...@gentoo.org kde4-meta.eclass:
Fix oldpim unpack by Andreas Sturmlechner andreas.sturmlech...@gmail.com
1.5 eclass/golang-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.5view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.5content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?r1=1.4r2=1.5
Index: golang-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- golang-build.eclass 6 Jul 2015 16:48:21 - 1.4
+++ golang-build.eclass 23 Jul 2015 15:42:26 - 1.5
@@ -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/eclass/golang-build.eclass,v 1.4 2015/07/06
16:48:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.5 2015/07/23
15:42:26 williamh Exp $
# @ECLASS: golang-build.eclass
# @MAINTAINER:
@@ -48,11 +48,40 @@
return 0
}
+# @FUNCTION: get_golibdir
+# @DESCRIPTION:
+# Return the non-prefixed library directory where Go packages
+# should be installed
+get_golibdir() {
+ echo /usr/lib/go-gentoo
+}
+
+# @FUNCTION: get_golibdir
+# @DESCRIPTION:
+# Return the library directory where Go packages should be installed
+# This is the prefixed version which should be included in GOPATH
+get_golibdir_gopath() {
+ echo ${EPREFIX}$(get_golibdir)
+}
+
+# @FUNCTION: golang_install_pkgs
+# @DESCRIPTION:
+# Install Go packages.
+# This function assumes that $cwd is a Go workspace.
+golang_install_pkgs() {
+ debug-print-function ${FUNCNAME} $@
+
+ _golang-build_setup
+ insinto $(get_golibdir)
+ insopts -m0644 -p # preserve timestamps for bug 551486
+ doins -r pkg src
+}
+
golang-build_src_compile() {
debug-print-function ${FUNCNAME} $@
_golang-build_setup
- set -- env GOPATH=${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo \
+ set -- env GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) \
go build -v -work -x ${EGO_PN}
echo $@
$@ || die
@@ -62,20 +91,18 @@
debug-print-function ${FUNCNAME} $@
_golang-build_setup
- set -- env GOPATH=${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo \
+ set -- env GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) \
go install -v -work -x ${EGO_PN}
echo $@
$@ || die
- insinto /usr/lib/go-gentoo
- insopts -m0644 -p # preserve timestamps for bug 551486
- doins -r pkg src
+ golang_install_pkgs
}
golang-build_src_test() {
debug-print-function ${FUNCNAME} $@
_golang-build_setup
- set -- env GOPATH=${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo \
+ set -- env GOPATH=${WORKDIR}/${P}:$(get_golibdir_gopath) \
go test -v -work -x ${EGO_PN}
echo $@
$@ || die
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
monsieurp15/07/22 09:20:07
Modified: ChangeLog java-utils-2.eclass
Log:
Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES
array to readily get rid of useless files. Derived from perl_rm_files by Kent
Fredric.
Revision ChangesPath
1.1724 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1724view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1724content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1723r2=1.1724
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1723
retrieving revision 1.1724
diff -u -r1.1723 -r1.1724
--- ChangeLog 20 Jul 2015 15:05:49 - 1.1723
+++ ChangeLog 22 Jul 2015 09:20:07 - 1.1724
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1723 2015/07/20
15:05:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1724 2015/07/22
09:20:07 monsieurp Exp $
+
+ 22 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
+ Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES
+ array to readily get rid of useless files.
20 Jul 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
1.166eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.166view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.166content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.165r2=1.166
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- java-utils-2.eclass 28 Jun 2015 13:33:48 - 1.165
+++ java-utils-2.eclass 22 Jul 2015 09:20:07 - 1.166
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165
2015/06/28 13:33:48 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.166
2015/07/22 09:20:07 monsieurp Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -248,6 +248,46 @@
popd /dev/null || die popd failed
}
+# @FUNCTION: java-pkg_rm_files
+# @USAGE: java-pkg_rm_files File1.java File2.java ...
+# @DESCRIPTION:
+# Remove unneeded files in ${S}.
+#
+# Every now and then, you'll run into situations whereby a file needs removing,
+# be it a unit test or a regular java class.
+#
+# You can use this function by either:
+# - calling it yourself in java_prepare() and feeding java-pkg_rm_files with
+# the list of files you wish to remove.
+# - defining an array in the ebuild named JAVA_RM_FILES with the list of files
+# you wish to remove.
+#
+# Both way work and it is left to the developer's preferences. If the
+# JAVA_RM_FILES array is defined, it is will be automatically handed over to
+# java-pkg_rm_files.
+#
+# See java-utils-2_src_prepare.
+#
+# @CODE
+#
+# @param $* - list of files to remove.
+# JAVA_RM_FILES - array containing files to remove.
+# if defined, automatically handed over to java-pkg_rm_files in
java-utils-2_src_prepare.
+#
+# @CODE
+java-pkg_rm_files() {
+ debug-print-function ${FUNCNAME} $*
+ OIFS=$IFS
+ IFS=\n
+ for filename in $@; do
+ [[ ! -f ${filename} ]] die ${filename} is not a regular
file. Aborting.
+ einfo Removing unneeded file ${filename}
+ rm -f ${S}/${filename} || die cannot remove ${filename}
+ eend $?
+ done
+ IFS=$OIFS
+}
+
# @FUNCTION: java-pkg_dojar
# @USAGE: jar1 [jar2 ...]
# @DESCRIPTION:
@@ -1782,6 +1822,12 @@
[[ ${EBUILD_PHASE} == prepare ]]
java-pkg_func-exists java_prepare java_prepare
+ # Check for files in JAVA_RM_FILES array.
+ if [[ ${JAVA_RM_FILES[@]} ]]; then
+ debug-print $FUNCNAME: removing unneeded files
+ java-pkg_rm_files ${JAVA_RM_FILES[@]}
+ fi
+
# Remember that eant will call this unless called via Portage
if [[ ! -e ${T}/java-utils-2_src_prepare-run ]] is-java-strict;
then
echo Searching for bundled jars:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-meta.eclass
kensington15/07/22 12:47:40
Modified: ChangeLog kde4-meta.eclass
Log:
Fix oldpim unpack by Andreas Sturmlechner andreas.sturmlech...@gmail.com
wrt bug #66.
Revision ChangesPath
1.1725 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1725view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1725content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1724r2=1.1725
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1724
retrieving revision 1.1725
diff -u -r1.1724 -r1.1725
--- ChangeLog 22 Jul 2015 09:20:07 - 1.1724
+++ ChangeLog 22 Jul 2015 12:47:40 - 1.1725
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1724 2015/07/22
09:20:07 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1725 2015/07/22
12:47:40 kensington Exp $
+
+ 22 Jul 2015; Michael Palimaka kensing...@gentoo.org kde4-meta.eclass:
+ Fix oldpim unpack by Andreas Sturmlechner andreas.sturmlech...@gmail.com
+ wrt bug #66.
22 Jul 2015; Patrice Clement monsie...@gentoo.org java-utils-2.eclass:
Introduce java-pkg_rm_files as a helper function along with JAVA_RM_FILES
1.80 eclass/kde4-meta.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.80view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.80content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.79r2=1.80
Index: kde4-meta.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- kde4-meta.eclass15 Jul 2015 09:03:11 - 1.79
+++ kde4-meta.eclass22 Jul 2015 12:47:40 - 1.80
@@ -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/eclass/kde4-meta.eclass,v 1.79 2015/07/15
09:03:11 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.80 2015/07/22
12:47:40 kensington Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -182,7 +182,7 @@
else
local abort tarball tarfile f extractlist postfix
- if [[ ${PV} =~ '4\.4\.[12].*' ]]; then
+ if [[ ${PV} =~ 4.4.11 ]]; then
postfix=bz2
KMTARPARAMS+= --bzip2
else
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog haskell-cabal.eclass
slyfox 15/07/20 15:05:49
Modified: ChangeLog haskell-cabal.eclass
Log:
Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
ghc's haddock for doc generation.
Revision ChangesPath
1.1723 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1723view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1723content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1722r2=1.1723
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1722
retrieving revision 1.1723
diff -u -r1.1722 -r1.1723
--- ChangeLog 19 Jul 2015 15:46:03 - 1.1722
+++ ChangeLog 20 Jul 2015 15:05:49 - 1.1723
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1722 2015/07/19
15:46:03 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1723 2015/07/20
15:05:49 slyfox Exp $
+
+ 20 Jul 2015; Sergei Trofimovich sly...@gentoo.org haskell-cabal.eclass:
+ Workaround upstream cabal tests hangup bug #537500 by Michael Orlitzky; use
+ ghc's haddock for doc generation.
19 Jul 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
Change kernel upgrade http link and remove reference to deblob in elog
1.52 eclass/haskell-cabal.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.52view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?rev=1.52content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/haskell-cabal.eclass?r1=1.51r2=1.52
Index: haskell-cabal.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- haskell-cabal.eclass4 Apr 2015 20:33:05 - 1.51
+++ haskell-cabal.eclass20 Jul 2015 15:05:49 - 1.52
@@ -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/eclass/haskell-cabal.eclass,v 1.51
2015/04/04 20:33:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.52
2015/07/20 15:05:49 slyfox Exp $
# @ECLASS: haskell-cabal.eclass
# @MAINTAINER:
@@ -172,6 +172,8 @@
cabal-bootstrap() {
local setupmodule
local cabalpackage
+ local setup_bootstrap_args=()
+
if [[ -f ${S}/Setup.lhs ]]; then
setupmodule=${S}/Setup.lhs
elif [[ -f ${S}/Setup.hs ]]; then
@@ -192,8 +194,16 @@
cabalpackage=Cabal-$(cabal-version)
einfo Using cabal-$(cabal-version).
+ if $(ghc-supports-threaded-runtime); then
+ # Cabal has a bug that deadlocks non-threaded RTS:
+ # https://bugs.gentoo.org/537500
+ # https://github.com/haskell/cabal/issues/2398
+ setup_bootstrap_args+=(-threaded)
+ fi
+
make_setup() {
set -- -package ${cabalpackage} --make ${setupmodule} \
+ ${setup_bootstrap_args} \
${HCFLAGS} \
${GHC_BOOTSTRAP_FLAGS} \
$@ \
@@ -311,7 +321,15 @@
has ${EAPI:-0} 0 1 2 ! use prefix EPREFIX=
if [[ -n ${CABAL_USE_HADDOCK} ]] use doc; then
- cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+ # We use the bundled with GHC version if exists
+ # Haddock is very picky about index files
+ # it generates for ghc's base and other packages.
+ local p=${EPREFIX}/usr/bin/haddock-ghc-$(ghc-version)
+ if [[ -f $p ]]; then
+ cabalconf+=(--with-haddock=${p})
+ else
+ cabalconf+=(--with-haddock=${EPREFIX}/usr/bin/haddock)
+ fi
fi
if [[ -n ${CABAL_USE_PROFILE} ]] use profile; then
cabalconf+=(--enable-library-profiling)
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass
johu15/07/19 10:46:47
Modified: ChangeLog kde4-base.eclass
Log:
Cleanup SRC_URIs.
Revision ChangesPath
1.1721 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1721view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1721content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1720r2=1.1721
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1720
retrieving revision 1.1721
diff -u -r1.1720 -r1.1721
--- ChangeLog 18 Jul 2015 00:07:01 - 1.1720
+++ ChangeLog 19 Jul 2015 10:46:47 - 1.1721
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1720 2015/07/18
00:07:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1721 2015/07/19
10:46:47 johu Exp $
+
+ 19 Jul 2015; Johannes Huber j...@gentoo.org kde4-base.eclass:
+ Cleanup SRC_URIs.
18 Jul 2015; Mike Gilbert flop...@gentoo.org distutils-r1.eclass:
Add entire python directory to SANDBOX_PREDICT, bug 554252.
1.158eclass/kde4-base.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.158view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.158content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.157r2=1.158
Index: kde4-base.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- kde4-base.eclass1 Jul 2015 11:28:23 - 1.157
+++ kde4-base.eclass19 Jul 2015 10:46:47 - 1.158
@@ -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/eclass/kde4-base.eclass,v 1.157 2015/07/01
11:28:23 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.158 2015/07/19
10:46:47 johu Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -440,36 +440,18 @@
4.11.14)
# Part of 4.14 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/4.14.3/src/${_kmname_pv}.tar.xz ;;
- 4.11.17)
- # Part of 14.12.3 actually, sigh. Not
stable for next release!
-
SRC_URI=mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz ;;
- 4.11.18)
- # Part of 15.04.0 actually, sigh. Not
stable for next release!
-
SRC_URI=mirror://kde/stable/applications/15.04.0/src/${_kmname_pv}.tar.xz ;;
4.11.19)
# Part of 15.04.1 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz ;;
- 4.11.20)
- # Part of 15.04.2 actually, sigh. Not
stable for next release!
-
SRC_URI=mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz ;;
4.11.21)
# Part of 15.04.3 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz ;;
4.14.3)
# Last SC release
SRC_URI=mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz ;;
- 4.14.6)
- # Part of 14.12.3 actually, sigh. Not
stable for next release!
-
SRC_URI=mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz ;;
- 4.14.7)
- # Part of 15.04.0 actually, sigh. Not
stable for next release!
-
SRC_URI=mirror://kde/stable/applications/15.04.0/src/${_kmname_pv}.tar.xz ;;
4.14.8)
# Part of 15.04.1 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/15.04.1/src/${_kmname_pv}.tar.xz ;;
-
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
mpagano 15/07/19 15:46:03
Modified: ChangeLog kernel-2.eclass
Log:
Change kernel upgrade http link and remove reference to deblob in elog
message. See bug #553484
Revision ChangesPath
1.1722 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1722view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1722content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1721r2=1.1722
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1721
retrieving revision 1.1722
diff -u -r1.1721 -r1.1722
--- ChangeLog 19 Jul 2015 10:46:47 - 1.1721
+++ ChangeLog 19 Jul 2015 15:46:03 - 1.1722
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1721 2015/07/19
10:46:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1722 2015/07/19
15:46:03 mpagano Exp $
+
+ 19 Jul 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
+ Change kernel upgrade http link and remove reference to deblob in elog
+ message. See bug #553484
19 Jul 2015; Johannes Huber j...@gentoo.org kde4-base.eclass:
Cleanup SRC_URIs.
1.311eclass/kernel-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.311view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.311content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.310r2=1.311
Index: kernel-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- kernel-2.eclass 27 Jun 2015 17:41:20 - 1.310
+++ kernel-2.eclass 19 Jul 2015 15:46:03 - 1.311
@@ -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/eclass/kernel-2.eclass,v 1.310 2015/06/27
17:41:20 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.311 2015/07/19
15:46:03 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -824,7 +824,7 @@
echo
elog If you are upgrading from a previous kernel, you may be
interested
elog in the following document:
- elog - General upgrade guide:
http://www.gentoo.org/doc/en/kernel-upgrade.xml;
+ elog - General upgrade guide:
https://wiki.gentoo.org/wiki/Kernel/Upgrade;
echo
# if K_EXTRAEINFO is set then lets display it now
@@ -847,10 +847,7 @@
# optionally display security unsupported message
# Start with why
- if [[ ${K_SECURITY_UNSUPPORTED} = deblob ]]; then
- ewarn Deblobbed kernels may not be up-to-date security-wise
- ewarn as they depend on external scripts.
- elif [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
+ if [[ -n ${K_SECURITY_UNSUPPORTED} ]]; then
ewarn ${PN} is UNSUPPORTED by Gentoo Security.
fi
# And now the general message.
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v6.38.eclass mozconfig-v6.39.eclass
axs 15/07/17 17:34:54 Modified: ChangeLog mozconfig-v6.38.eclass mozconfig-v6.39.eclass Log: Added gst-plugins-mad:1.0 dependency for USE=gstreamer to ensure mp3 streaming support Revision ChangesPath 1.1716 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1716view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1716content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1715r2=1.1716 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1715 retrieving revision 1.1716 diff -u -r1.1715 -r1.1716 --- ChangeLog 16 Jul 2015 17:42:19 - 1.1715 +++ ChangeLog 17 Jul 2015 17:34:54 - 1.1716 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1715 2015/07/16 17:42:19 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1716 2015/07/17 17:34:54 axs Exp $ + + 17 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org + mozconfig-v6.38.eclass, mozconfig-v6.39.eclass: + Added gst-plugins-mad:1.0 dependency for USE=gstreamer to ensure mp3 + streaming support 16 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org mozlinguas.eclass: minor update within mozlinguas.eclass 1.3 eclass/mozconfig-v6.38.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?r1=1.2r2=1.3 Index: mozconfig-v6.38.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.38.eclass,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mozconfig-v6.38.eclass 16 Jul 2015 16:25:47 - 1.2 +++ mozconfig-v6.38.eclass 17 Jul 2015 17:34:54 - 1.3 @@ -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/eclass/mozconfig-v6.38.eclass,v 1.2 2015/07/16 16:25:47 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.38.eclass,v 1.3 2015/07/17 17:34:54 axs Exp $ # # @ECLASS: mozconfig-v5.33.eclass # @MAINTAINER: @@ -77,6 +77,7 @@ =media-libs/gst-plugins-base-1.2.3:1.0 =media-libs/gst-plugins-good-1.2.3:1.0 =media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0 + =media-plugins/gst-plugins-mad-1.2.3:1.0 ) gstreamer-0? ( media-plugins/gst-plugins-meta:0.10[ffmpeg] 1.3 eclass/mozconfig-v6.39.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.39.eclass?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.39.eclass?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.39.eclass?r1=1.2r2=1.3 Index: mozconfig-v6.39.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.39.eclass,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mozconfig-v6.39.eclass 16 Jul 2015 16:25:47 - 1.2 +++ mozconfig-v6.39.eclass 17 Jul 2015 17:34:54 - 1.3 @@ -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/eclass/mozconfig-v6.39.eclass,v 1.2 2015/07/16 16:25:47 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.39.eclass,v 1.3 2015/07/17 17:34:54 axs Exp $ # # @ECLASS: mozconfig-v5.33.eclass # @MAINTAINER: @@ -77,6 +77,7 @@ =media-libs/gst-plugins-base-1.2.3:1.0 =media-libs/gst-plugins-good-1.2.3:1.0 =media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0 + =media-plugins/gst-plugins-mad-1.2.3:1.0 ) gstreamer-0? ( =media-libs/gstreamer-0.10.25:0.10
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-common-r1.eclass php-ext-base-r1.eclass php-ezc.eclass
grknight15/07/17 18:02:35 Modified: ChangeLog Removed: php-common-r1.eclass php-ext-base-r1.eclass php-ezc.eclass Log: Drop old, unused eclasses wrt bug 551910 Revision ChangesPath 1.1717 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1717view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1717content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1716r2=1.1717 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1716 retrieving revision 1.1717 diff -u -r1.1716 -r1.1717 --- ChangeLog 17 Jul 2015 17:34:54 - 1.1716 +++ ChangeLog 17 Jul 2015 18:02:35 - 1.1717 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1716 2015/07/17 17:34:54 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1717 2015/07/17 18:02:35 grknight Exp $ + + 17 Jul 2015; Brian Evans grkni...@gentoo.org -php-common-r1.eclass, + -php-ext-base-r1.eclass, -php-ezc.eclass: + Drop old, unused eclasses wrt bug 551910 17 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org mozconfig-v6.38.eclass, mozconfig-v6.39.eclass:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog
axs 15/07/17 18:36:23 Modified: ChangeLog Log: fixed my b0rked changelog entry on my last commit Revision ChangesPath 1.1719 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1719view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1719content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1718r2=1.1719 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1718 retrieving revision 1.1719 diff -u -r1.1718 -r1.1719 --- ChangeLog 17 Jul 2015 18:29:39 - 1.1718 +++ ChangeLog 17 Jul 2015 18:36:23 - 1.1719 @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1718 2015/07/17 18:29:39 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1719 2015/07/17 18:36:23 axs Exp $ + + 17 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org + mozconfig-v6.38.eclass, mozconfig-v6.39.eclass: + Updated gstreamer dependencies to current stable and dropped gst-plugins-mad + since gst-plugins-libav now officially provides mp3 decoding 17 Jul 2015; Brian Evans grkni...@gentoo.org depend.php.eclass: Remove deprecated functions from depend.php.eclass as announced 30 days ago
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
grknight15/07/17 18:29:39
Modified: ChangeLog depend.php.eclass
Log:
Remove deprecated functions from depend.php.eclass as announced 30 days ago
Revision ChangesPath
1.1718 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1718view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1718content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1717r2=1.1718
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1717
retrieving revision 1.1718
diff -u -r1.1717 -r1.1718
--- ChangeLog 17 Jul 2015 18:02:35 - 1.1717
+++ ChangeLog 17 Jul 2015 18:29:39 - 1.1718
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1717 2015/07/17
18:02:35 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1718 2015/07/17
18:29:39 grknight Exp $
+
+ 17 Jul 2015; Brian Evans grkni...@gentoo.org depend.php.eclass:
+ Remove deprecated functions from depend.php.eclass as announced 30 days ago
17 Jul 2015; Brian Evans grkni...@gentoo.org -php-common-r1.eclass,
-php-ext-base-r1.eclass, -php-ezc.eclass:
1.37 eclass/depend.php.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.37view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.37content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.36r2=1.37
Index: depend.php.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- depend.php.eclass 24 Jun 2015 13:36:03 - 1.36
+++ depend.php.eclass 17 Jul 2015 18:29:39 - 1.37
@@ -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/eclass/depend.php.eclass,v 1.36 2015/06/24
13:36:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.37 2015/07/17
18:29:39 grknight Exp $
# @DEAD
# @ECLASS: depend.php.eclass
@@ -21,28 +21,6 @@
# PHP5-only depend functions
-# @FUNCTION: need_php5_cli
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires
PHP5
-# with cli SAPI.
-need_php5_cli() {
- eqawarn (need_php5_cli) Deprecated function call. Set to be removed
on 2015-07-17
- DEPEND=${DEPEND} =dev-lang/php-5*
- RDEPEND=${RDEPEND} =dev-lang/php-5*
- PHP_VERSION=5
-}
-
-# @FUNCTION: need_php5_httpd
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires
PHP5
-# with either cgi or apache2 SAPI.
-need_php5_httpd() {
- eqawarn (need_php5_httpd) Deprecated function call. Set to be removed
on 2015-07-17
- DEPEND=${DEPEND} =virtual/httpd-php-5*
- RDEPEND=${RDEPEND} =virtual/httpd-php-5*
- PHP_VERSION=5
-}
-
# @FUNCTION: need_php5
# @DESCRIPTION:
# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires
PHP5
@@ -74,16 +52,6 @@
# general PHP depend functions
-# @FUNCTION: need_php_cli
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires
PHP
-# (any version) with cli SAPI.
-need_php_cli() {
- eqawarn (need_php_cli) Deprecated function call. Set to be removed on
2015-07-17
- DEPEND=${DEPEND} dev-lang/php
- RDEPEND=${RDEPEND} dev-lang/php
-}
-
# @FUNCTION: need_php_httpd
# @DESCRIPTION:
# Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires
PHP
@@ -103,20 +71,6 @@
PHP_SHARED_CAT=php
}
-# @FUNCTION: need_php_by_category
-# @DESCRIPTION:
-# Set this after setting DEPEND/RDEPEND in your ebuild to depend on PHP version
-# determined by ${CATEGORY} - any PHP version or PHP5 for dev-php or
-# dev-php5, respectively.
-need_php_by_category() {
- eqawarn (need_php_by_category) Deprecated function call. Set to be
removed on 2015-07-17
- case ${CATEGORY} in
- dev-php) need_php ;;
- *) die Version of PHP required by packages in category
${CATEGORY} unknown
- esac
-}
-
-
# @FUNCTION: has_php
# @DESCRIPTION:
# Call this function from your pkg_setup, src_compile, src_install etc. if you
@@ -135,50 +89,6 @@
uses_php${PHP_VERSION}
}
-# @FUNCTION: require_php_sapi_from
-# @USAGE: list of SAPIs
-# @DESCRIPTION:
-# Call this function from pkg_setup if your package only works with
-# specific SAPI(s) and specify a list of PHP SAPI USE flags that are
-#
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass
floppym 15/07/18 00:07:01
Modified: ChangeLog distutils-r1.eclass
Log:
Add entire python directory to SANDBOX_PREDICT, bug 554252.
Revision ChangesPath
1.1720 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1720view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1720content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1719r2=1.1720
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1719
retrieving revision 1.1720
diff -u -r1.1719 -r1.1720
--- ChangeLog 17 Jul 2015 18:36:23 - 1.1719
+++ ChangeLog 18 Jul 2015 00:07:01 - 1.1720
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1719 2015/07/17
18:36:23 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1720 2015/07/18
00:07:01 floppym Exp $
+
+ 18 Jul 2015; Mike Gilbert flop...@gentoo.org distutils-r1.eclass:
+ Add entire python directory to SANDBOX_PREDICT, bug 554252.
17 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
mozconfig-v6.38.eclass, mozconfig-v6.39.eclass:
1.116eclass/distutils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.116view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.116content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.115r2=1.116
Index: distutils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- distutils-r1.eclass 16 Jul 2015 14:29:39 - 1.115
+++ distutils-r1.eclass 18 Jul 2015 00:07:01 - 1.116
@@ -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/eclass/distutils-r1.eclass,v 1.115
2015/07/16 14:29:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.116
2015/07/18 00:07:01 floppym Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -505,7 +505,7 @@
# python likes to compile any module it sees, which triggers sandbox
# failures if some packages haven't compiled their modules yet.
- addpredict $(python_get_sitedir)
+ addpredict ${EPREFIX}/usr/$(get_libdir)/${EPYTHON}
addpredict /usr/lib/portage/pym
addpredict /usr/local # bug 498232
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozlinguas.eclass
axs 15/07/16 17:31:05
Modified: ChangeLog mozlinguas.eclass
Log:
Fixed the mozlinguas.eclass upgrade, recommitting.
Revision ChangesPath
1.1714 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1714view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1714content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1713r2=1.1714
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1713
retrieving revision 1.1714
diff -u -r1.1713 -r1.1714
--- ChangeLog 16 Jul 2015 16:25:47 - 1.1713
+++ ChangeLog 16 Jul 2015 17:31:04 - 1.1714
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1713 2015/07/16
16:25:47 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1714 2015/07/16
17:31:04 axs Exp $
+
+ 16 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org mozlinguas.eclass:
+ Fixed the mozlinguas.eclass upgrade, recommitting.
16 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
mozconfig-v6.38.eclass, mozconfig-v6.39.eclass, mozcoreconf-v3.eclass,
1.9 eclass/mozlinguas.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozlinguas.eclass?rev=1.9view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozlinguas.eclass?rev=1.9content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozlinguas.eclass?r1=1.8r2=1.9
Index: mozlinguas.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mozlinguas.eclass 16 Jul 2015 16:40:07 - 1.8
+++ mozlinguas.eclass 16 Jul 2015 17:31:04 - 1.9
@@ -1,16 +1,18 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.8 2015/07/16
16:40:07 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.9 2015/07/16
17:31:04 axs Exp $
# @ECLASS: mozlinguas.eclass
# @MAINTAINER:
# mozi...@gentoo.org
# @AUTHOR:
# Nirbheek Chauhan nirbh...@gentoo.org
+# Ian Stakenvicius a...@gentoo.org
# @BLURB: Handle language packs for mozilla products
# @DESCRIPTION:
# Sets IUSE according to MOZ_LANGS (language packs available). Also exports
-# src_unpack and src_install for use in ebuilds.
+# src_unpack, src_compile and src_install for use in ebuilds, and provides
+# supporting functions for langpack generation and installation.
inherit mozextension
@@ -18,7 +20,7 @@
0|1)
die EAPI ${EAPI:-0} does not support the '-' SRC_URI
operator;;
2|3|4|5)
- EXPORT_FUNCTIONS src_unpack src_install;;
+ EXPORT_FUNCTIONS src_unpack src_compile src_install;;
*)
die EAPI ${EAPI} is not supported, contact eclass
maintainers;;
esac
@@ -53,6 +55,11 @@
# The ftp URI prefix for the release tarballs and language packs.
: ${MOZ_FTP_URI:=}
+# @ECLASS-VARIABLE: MOZ_HTTP_URI
+# @DESCRIPTION:
+# The http URI prefix for the release tarballs and language packs.
+: ${MOZ_HTTP_URI:=}
+
# @ECLASS-VARIABLE: MOZ_LANGPACK_PREFIX
# @DESCRIPTION:
# The relative path till the lang code in the langpack file URI.
@@ -65,21 +72,86 @@
# Defaults to '.xpi'
: ${MOZ_LANGPACK_SUFFIX:=.xpi}
+# @ECLASS-VARIABLE: MOZ_LANGPACK_UNOFFICIAL
+# @DESCRIPTION:
+# The status of the langpack, used to differentiate within
+# Manifests and on Gentoo mirrors as to when the langpacks are
+# generated officially by Mozilla or if they were generated
+# unofficially by others (ie the Gentoo mozilla team). When
+# this var is set, the distfile will have a .unofficial.xpi
+# suffix.
+: ${MOZ_LANGPACK_UNOFFICIAL:=}
+
+# @ECLASS-VARIABLE: MOZ_GENERATE_LANGPACKS
+# @DESCRIPTION:
+# This flag specifies whether or not the langpacks should be
+# generated directly during the build process, rather than
+# being downloaded and installed from upstream pre-built
+# extensions. Primarily it supports pre-release builds.
+# Defaults to empty.
+: ${MOZ_GENERATE_LANGPACKS:=}
+
+# @ECLASS-VARIABLE: MOZ_L10N_SOURCEDIR
+# @DESCRIPTION:
+# The path that l10n sources can be found at, once unpacked.
+# Defaults to ${WORKDIR}/l10n-sources
+: ${MOZ_L10N_SOURCEDIR:=${WORKDIR}/l10n-sources}
+
+# @ECLASS-VARIABLE: MOZ_L10N_URI_PREFIX
+# @DESCRIPTION:
+# The full URI prefix of the distfile for each l10n locale. The
+# AB_CD and MOZ_L10N_URI_SUFFIX will be appended to this to complete the
+# SRC_URI when
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozlinguas.eclass
axs 15/07/16 17:42:19
Modified: ChangeLog mozlinguas.eclass
Log:
minor update within mozlinguas.eclass
Revision ChangesPath
1.1715 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1715view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1715content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1714r2=1.1715
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1714
retrieving revision 1.1715
diff -u -r1.1714 -r1.1715
--- ChangeLog 16 Jul 2015 17:31:04 - 1.1714
+++ ChangeLog 16 Jul 2015 17:42:19 - 1.1715
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1714 2015/07/16
17:31:04 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1715 2015/07/16
17:42:19 axs Exp $
+
+ 16 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org mozlinguas.eclass:
+ minor update within mozlinguas.eclass
16 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org mozlinguas.eclass:
Fixed the mozlinguas.eclass upgrade, recommitting.
1.10 eclass/mozlinguas.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozlinguas.eclass?rev=1.10view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozlinguas.eclass?rev=1.10content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozlinguas.eclass?r1=1.9r2=1.10
Index: mozlinguas.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mozlinguas.eclass 16 Jul 2015 17:31:04 - 1.9
+++ mozlinguas.eclass 16 Jul 2015 17:42:19 - 1.10
@@ -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/eclass/mozlinguas.eclass,v 1.9 2015/07/16
17:31:04 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozlinguas.eclass,v 1.10 2015/07/16
17:42:19 axs Exp $
# @ECLASS: mozlinguas.eclass
# @MAINTAINER:
@@ -275,6 +275,7 @@
if [[ -n ${1} ]] ; then modules=( $@ ) ; fi
mozlinguas_export
+ mkdir -p ${modpath}/chrome || die
for l in ${mozlinguas[@]}; do for c in ${modules[@]} ; do
if [[ -e ${srcprefix}-${l}/chrome/${c}-${l} ]]; then
cp -RLp -t ${modpath}/chrome
${srcprefix}-${l}/chrome/${c}-${l} || die
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v6.38.eclass mozconfig-v6.39.eclass mozcoreconf-v3.eclass mozextension.eclass mozlinguas.eclass
axs 15/07/16 16:25:47
Modified: ChangeLog mozconfig-v6.38.eclass
mozconfig-v6.39.eclass mozcoreconf-v3.eclass
mozextension.eclass mozlinguas.eclass
Log:
Update mozilla support eclasses
Revision ChangesPath
1.1713 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1713view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1713content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1712r2=1.1713
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1712
retrieving revision 1.1713
diff -u -r1.1712 -r1.1713
--- ChangeLog 16 Jul 2015 14:29:39 - 1.1712
+++ ChangeLog 16 Jul 2015 16:25:47 - 1.1713
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1712 2015/07/16
14:29:39 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1713 2015/07/16
16:25:47 axs Exp $
+
+ 16 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
+ mozconfig-v6.38.eclass, mozconfig-v6.39.eclass, mozcoreconf-v3.eclass,
+ mozextension.eclass, mozlinguas.eclass:
+ Update mozilla support eclasses
16 Jul 2015; Michał Górny mgo...@gentoo.org distutils-r1.eclass:
Forbid also installing examples package, bug #555038.
1.2 eclass/mozconfig-v6.38.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?r1=1.1r2=1.2
Index: mozconfig-v6.38.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.38.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozconfig-v6.38.eclass 7 Jul 2015 14:11:37 - 1.1
+++ mozconfig-v6.38.eclass 16 Jul 2015 16:25:47 - 1.2
@@ -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/eclass/mozconfig-v6.38.eclass,v 1.1
2015/07/07 14:11:37 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.38.eclass,v 1.2
2015/07/16 16:25:47 axs Exp $
#
# @ECLASS: mozconfig-v5.33.eclass
# @MAINTAINER:
@@ -122,6 +122,9 @@
RDEPEND+=
selinux? ( sec-policy/selinux-mozilla )
+# only one of gstreamer and gstreamer-0 can be enabled at a time, so set
REQUIRED_USE to signify this
+REQUIRED_USE=?? ( gstreamer gstreamer-0 )
+
# @FUNCTION: mozconfig_config
# @DESCRIPTION:
# Set common configure options for mozilla packages.
@@ -218,12 +221,10 @@
mozconfig_annotate '' --target=${CTARGET:-${CHOST}}
mozconfig_annotate '' --build=${CTARGET:-${CHOST}}
- if use gstreamer || use gstreamer-0 ; then
- if use gstreamer-0 ; then
- mozconfig_annotate '+gstreamer-0'
--enable-gstreamer=0.10
- else
- mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
- fi
+ if use gstreamer ; then
+ mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
+ elif use gstreamer-0 ; then
+ mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
else
mozconfig_annotate '' --disable-gstreamer
fi
1.2 eclass/mozconfig-v6.39.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.39.eclass?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.39.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.39.eclass?r1=1.1r2=1.2
Index: mozconfig-v6.39.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.39.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozconfig-v6.39.eclass 7 Jul 2015 14:11:37 - 1.1
+++ mozconfig-v6.39.eclass 16 Jul 2015 16:25:47 - 1.2
@@ -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/eclass/mozconfig-v6.39.eclass,v 1.1
2015/07/07 14:11:37 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.39.eclass,v 1.2
2015/07/16 16:25:47 axs Exp $
#
# @ECLASS: mozconfig-v5.33.eclass
# @MAINTAINER:
@@ -222,12 +222,10 @@
mozconfig_annotate ''
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass
mgorny 15/07/16 14:29:39
Modified: ChangeLog distutils-r1.eclass
Log:
Forbid also installing examples package, bug #555038.
Revision ChangesPath
1.1712 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1712view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1712content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1711r2=1.1712
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -r1.1711 -r1.1712
--- ChangeLog 16 Jul 2015 06:06:59 - 1.1711
+++ ChangeLog 16 Jul 2015 14:29:39 - 1.1712
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1711 2015/07/16
06:06:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1712 2015/07/16
14:29:39 mgorny Exp $
+
+ 16 Jul 2015; Michał Górny mgo...@gentoo.org distutils-r1.eclass:
+ Forbid also installing examples package, bug #555038.
16 Jul 2015; Lars Wendler polynomia...@gentoo.org apache-2.eclass:
Added slot dependency for openssl. Raised minimum required EAPI version to 5.
1.115eclass/distutils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.115view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.115content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.114r2=1.115
Index: distutils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- distutils-r1.eclass 4 Jul 2015 15:26:17 - 1.114
+++ distutils-r1.eclass 16 Jul 2015 14:29:39 - 1.115
@@ -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/eclass/distutils-r1.eclass,v 1.114
2015/07/04 15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.115
2015/07/16 14:29:39 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -549,9 +549,13 @@
esetup.py install --root=${root} ${args[@]}
- if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
- die Package installs 'tests' package, file collisions likely.
- fi
+ local forbidden_package_names=( examples test tests )
+ local p
+ for p in ${forbidden_package_names[@]}; do
+ if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then
+ die Package installs '${p}' package which is forbidden
and likely a bug in the build system.
+ fi
+ done
if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
eqawarn Package installs 'share' in PyPy prefix, see bug
#465546.
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-meta.eclass
dilfridge15/07/15 09:03:11
Modified: ChangeLog kde4-meta.eclass
Log:
Fix unpacking of noakonadi branch
Revision ChangesPath
1.1710 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1710view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1710content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1709r2=1.1710
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1709
retrieving revision 1.1710
diff -u -r1.1709 -r1.1710
--- ChangeLog 14 Jul 2015 11:51:39 - 1.1709
+++ ChangeLog 15 Jul 2015 09:03:11 - 1.1710
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1709 2015/07/14
11:51:39 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1710 2015/07/15
09:03:11 dilfridge Exp $
+
+ 15 Jul 2015; Andreas K. Huettel dilfri...@gentoo.org kde4-meta.eclass:
+ Fix unpacking of noakonadi branch
14 Jul 2015; Anthony G. Basile bluen...@gentoo.org bitcoincore.eclass:
Update for bitcoind 0.11.0.
1.79 eclass/kde4-meta.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.79view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.79content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.78r2=1.79
Index: kde4-meta.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kde4-meta.eclass29 Mar 2015 10:29:42 - 1.78
+++ kde4-meta.eclass15 Jul 2015 09:03:11 - 1.79
@@ -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/eclass/kde4-meta.eclass,v 1.78 2015/03/29
10:29:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.79 2015/07/15
09:03:11 dilfridge Exp $
#
# @ECLASS: kde4-meta.eclass
# @MAINTAINER:
@@ -182,7 +182,7 @@
else
local abort tarball tarfile f extractlist postfix
- if [[ ${PV} =~ 4.[47].[12345] ]]; then
+ if [[ ${PV} =~ '4\.4\.[12].*' ]]; then
postfix=bz2
KMTARPARAMS+= --bzip2
else
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog bitcoincore.eclass
blueness15/07/14 11:51:40
Modified: ChangeLog bitcoincore.eclass
Log:
Update for bitcoind 0.11.0.
Revision ChangesPath
1.1709 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1709view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1709content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1708r2=1.1709
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1708
retrieving revision 1.1709
diff -u -r1.1708 -r1.1709
--- ChangeLog 13 Jul 2015 00:51:16 - 1.1708
+++ ChangeLog 14 Jul 2015 11:51:39 - 1.1709
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1708 2015/07/13
00:51:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1709 2015/07/14
11:51:39 blueness Exp $
+
+ 14 Jul 2015; Anthony G. Basile bluen...@gentoo.org bitcoincore.eclass:
+ Update for bitcoind 0.11.0.
13 Jul 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
Initial support for Qt 5.5
1.5 eclass/bitcoincore.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bitcoincore.eclass?rev=1.5view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bitcoincore.eclass?rev=1.5content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bitcoincore.eclass?r1=1.4r2=1.5
Index: bitcoincore.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/bitcoincore.eclass,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bitcoincore.eclass 27 May 2015 00:18:02 - 1.4
+++ bitcoincore.eclass 14 Jul 2015 11:51:39 - 1.5
@@ -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/eclass/bitcoincore.eclass,v 1.4 2015/05/27
00:18:02 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bitcoincore.eclass,v 1.5 2015/07/14
11:51:39 blueness Exp $
#
# @ECLASS: bitcoincore.eclass
# @MAINTAINER:
@@ -76,13 +76,27 @@
0.10*)
BITCOINCORE_SERIES=0.10.x
LIBSECP256K1_DEPEND==dev-libs/libsecp256k1-0.0.0_pre20141212
-
BITCOINCORE_RBF_DIFF=16f45600c8c372a738ffef544292864256382601...a23678edc70204599299459a206709a00e039db7
- BITCOINCORE_RBF_PATCHFILE=${MyPN}-rbf-v0.10.2.patch
+ case ${PVR} in
+ 0.10.2)
+
BITCOINCORE_RBF_DIFF=16f45600c8c372a738ffef544292864256382601...a23678edc70204599299459a206709a00e039db7
+ BITCOINCORE_RBF_PATCHFILE=${MyPN}-rbf-v0.10.2.patch
+ ;;
+ *)
+
BITCOINCORE_RBF_DIFF=16f45600c8c372a738ffef544292864256382601...4890416cde69eba09d3fd6f79db7d0d6314a
+ BITCOINCORE_RBF_PATCHFILE=${MyPN}-rbf-v0.10.2-r1.patch
+ ;;
+ esac
BITCOINCORE_XT_DIFF=047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f
;;
+0.11*)
+ BITCOINCORE_SERIES=0.11.x
+ LIBSECP256K1_DEPEND==dev-libs/libsecp256k1-0.0.0_pre20150423
+
BITCOINCORE_RBF_DIFF=5f032c75eefb0fe8ff79ed9595da1112c05f5c4a...660b96d24916b8ef4e0677e5d6162e24e2db447e
+ BITCOINCORE_RBF_PATCHFILE=${MyPN}-rbf-v0.11.0rc3.patch
+ ;;
*)
BITCOINCORE_SERIES=
- LIBSECP256K1_DEPEND==dev-libs/libsecp256k1-
+ LIBSECP256K1_DEPEND=dev-libs/libsecp256k1-0.0.0_pre20150422
;;
*)
die Unrecognised version
@@ -100,7 +114,7 @@
EGIT_PROJECT='bitcoin'
EGIT_REPO_URI=git://github.com/bitcoin/bitcoin.git
https://github.com/bitcoin/bitcoin.git;
else
-
SRC_URI=https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz
- ${MyPN}-v${PV}.tgz
+
SRC_URI=https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz
- ${MyPN}-v${PV}${BITCOINCORE_SRC_SUFFIX}.tgz
if [ -z ${BITCOINCORE_NO_SYSLIBS} ]; then
SRC_URI=${SRC_URI}
http://luke.dashjr.org/programs/${MyPN}/files/${MyPN}d/luke-jr/${BITCOINCORE_SERIES}/$(LJR_PV
ljr)/${LJR_PATCHDIR}.txz - ${LJR_PATCHDIR}.tar.xz
fi
@@ -177,6 +191,9 @@
einfo Extra functionality improvements to Bitcoin Core are
enabled.
bitcoincore_policymsg_flag=true
fi
+ bitcoincore_policymsg cltv \
+ CLTV policy is enabled: Your node will recognise and assist
OP_CHECKLOCKTIMEVERIFY (BIP65) transactions. \
+ CLTV policy is disabled: Your node will not recognise
OP_CHECKLOCKTIMEVERIFY (BIP65) transactions.
bitcoincore_policymsg cpfp \
CPFP
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
pesa15/07/13 00:51:16
Modified: ChangeLog qt5-build.eclass
Log:
Initial support for Qt 5.5
Revision ChangesPath
1.1708 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1708view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1708content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1707r2=1.1708
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1707
retrieving revision 1.1708
diff -u -r1.1707 -r1.1708
--- ChangeLog 9 Jul 2015 20:21:05 - 1.1707
+++ ChangeLog 13 Jul 2015 00:51:16 - 1.1708
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1707 2015/07/09
20:21:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1708 2015/07/13
00:51:16 pesa Exp $
+
+ 13 Jul 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
+ Initial support for Qt 5.5
09 Jul 2015; Michał Górny mgo...@gentoo.org git-r3.eclass:
Do not attempt to use submodules for which the checkout path does not exist
1.21 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.21view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.21content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.20r2=1.21
Index: qt5-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt5-build.eclass17 Jun 2015 15:48:58 - 1.20
+++ qt5-build.eclass13 Jul 2015 00:51:16 - 1.21
@@ -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/eclass/qt5-build.eclass,v 1.20 2015/06/17
15:48:58 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.21 2015/07/13
00:51:16 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -535,9 +535,6 @@
-system-zlib
-system-pcre
- # don't specify -no-gif because there is no way to override it
later
- #-no-gif
-
# disable everything to prevent automagic deps (part 1)
-no-mtdev
-no-journald
@@ -545,8 +542,12 @@
-no-freetype -no-harfbuzz
-no-openssl
$([[ ${QT5_MINOR_VERSION} -ge 5 ]] echo -no-libproxy)
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] echo
-no-xkbcommon-{x11,evdev})
-no-xinput2 -no-xcb-xlib
+ # don't specify -no-gif because there is no way to override it
later
+ #-no-gif
+
# always enable glib event loop support
-glib
@@ -578,7 +579,10 @@
-iconv
# disable everything to prevent automagic deps (part 3)
- -no-cups -no-evdev -no-icu -no-fontconfig -no-dbus
+ -no-cups -no-evdev
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] echo -no-tslib)
+ -no-icu -no-fontconfig
+ -no-dbus
# don't strip
-no-strip
@@ -614,9 +618,16 @@
# typedef qreal to double (warning: changing this flag breaks
the ABI)
-qreal double
- # disable opengl and egl by default, override in qtgui and
qtopengl
+ # disable OpenGL and EGL support by default, override in qtgui,
+ # qtopengl, qtprintsupport and qtwidgets
-no-opengl -no-egl
+ # disable libinput-based generic plugin by default, override in
qtgui
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] echo -no-libinput)
+
+ # disable gstreamer by default, override in qtmultimedia
+ $([[ ${QT5_MINOR_VERSION} -ge 5 ]] echo -no-gstreamer)
+
# use upstream default
#-no-system-proxies
@@ -673,7 +684,7 @@
QMAKE_LFLAGS_DEBUG= \
${projectdir} \
$@ \
- || die qmake failed (${projectdir})
+ || die qmake failed (${projectdir#${S}/})
}
# @FUNCTION: qt5_install_module_qconfigs
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome2.eclass
mgorny 15/07/09 15:43:03
Modified: ChangeLog gnome2.eclass
Log:
Remove meaningless nonfatal from elibtoolize call, bug #551154.
Revision ChangesPath
1.1706 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1706view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1706content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1705r2=1.1706
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1705
retrieving revision 1.1706
diff -u -r1.1705 -r1.1706
--- ChangeLog 9 Jul 2015 07:11:25 - 1.1705
+++ ChangeLog 9 Jul 2015 15:43:03 - 1.1706
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1705 2015/07/09
07:11:25 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1706 2015/07/09
15:43:03 mgorny Exp $
+
+ 09 Jul 2015; Michał Górny mgo...@gentoo.org gnome2.eclass:
+ Remove meaningless nonfatal from elibtoolize call, bug #551154.
09 Jul 2015; Hans de Graaff gra...@gentoo.org ruby-single.eclass:
Update documentation.
1.132eclass/gnome2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.132view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.132content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.131r2=1.132
Index: gnome2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- gnome2.eclass 18 Apr 2015 13:19:47 - 1.131
+++ gnome2.eclass 9 Jul 2015 15:43:03 - 1.132
@@ -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/eclass/gnome2.eclass,v 1.131 2015/04/18
13:19:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.132 2015/07/09
15:43:03 mgorny Exp $
# @ECLASS: gnome2.eclass
# @MAINTAINER:
@@ -84,8 +84,7 @@
gnome2_disable_deprecation_warning
# Run libtoolize
- # Everything is fatal EAPI 4 onwards
- nonfatal elibtoolize ${ELTCONF}
+ elibtoolize ${ELTCONF}
}
# @FUNCTION: gnome2_src_configure
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mgorny 15/07/09 20:21:05
Modified: ChangeLog git-r3.eclass
Log:
Do not attempt to use submodules for which the checkout path does not exist
(has been removed), bug #551100.
Revision ChangesPath
1.1707 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1707view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1707content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1706r2=1.1707
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1706
retrieving revision 1.1707
diff -u -r1.1706 -r1.1707
--- ChangeLog 9 Jul 2015 15:43:03 - 1.1706
+++ ChangeLog 9 Jul 2015 20:21:05 - 1.1707
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1706 2015/07/09
15:43:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1707 2015/07/09
20:21:05 mgorny Exp $
+
+ 09 Jul 2015; Michał Górny mgo...@gentoo.org git-r3.eclass:
+ Do not attempt to use submodules for which the checkout path does not exist
+ (has been removed), bug #551100.
09 Jul 2015; Michał Górny mgo...@gentoo.org gnome2.eclass:
Remove meaningless nonfatal from elibtoolize call, bug #551154.
1.50 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.50view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.50content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.49r2=1.50
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- git-r3.eclass 22 Jun 2015 08:39:36 - 1.49
+++ git-r3.eclass 9 Jul 2015 20:21:05 - 1.50
@@ -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/eclass/git-r3.eclass,v 1.49 2015/06/22
08:39:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.50 2015/07/09
20:21:05 mgorny Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
@@ -710,16 +710,23 @@
local subname=${submodules[0]}
local url=${submodules[1]}
local path=${submodules[2]}
- local commit=$(git rev-parse ${local_ref}:${path})
- if [[ ! ${commit} ]]; then
- die Unable to get commit id for submodule
${subname}
- fi
+ # use only submodules for which path does exist
+ # (this is in par with 'git submodule'), bug #551100
+ # note: git cat-file does not work for submodules
+ if [[ $(git ls-tree -d ${local_ref} ${path}) ]]
+ then
+ local commit=$(git rev-parse
${local_ref}:${path} || die)
- local subrepos
- _git-r3_set_subrepos ${url} ${repos[@]}
+ if [[ ! ${commit} ]]; then
+ die Unable to get commit id for
submodule ${subname}
+ fi
- git-r3_fetch ${subrepos[*]} ${commit}
${local_id}/${subname}
+ local subrepos
+ _git-r3_set_subrepos ${url} ${repos[@]}
+
+ git-r3_fetch ${subrepos[*]} ${commit}
${local_id}/${subname}
+ fi
submodules=( ${submodules[@]:3} ) # shift
done
@@ -849,11 +856,16 @@
local subname=${submodules[0]}
local url=${submodules[1]}
local path=${submodules[2]}
- local subrepos
- _git-r3_set_subrepos ${url} ${repos[@]}
- git-r3_checkout ${subrepos[*]} ${out_dir}/${path} \
- ${local_id}/${subname}
+ # use only submodules for which path does exist
+ # (this is in par with 'git submodule'), bug #551100
+ if [[ -d ${out_dir}/${path} ]]; then
+ local subrepos
+ _git-r3_set_subrepos ${url} ${repos[@]}
+
+ git-r3_checkout ${subrepos[*]}
${out_dir}/${path} \
+
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog webapp.eclass
voyageur15/07/08 09:33:48
Modified: ChangeLog webapp.eclass
Log:
Fix elog in webapp_serverowned and ebeep in newer EAPIs
Revision ChangesPath
1.1704 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1704view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1704content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1703r2=1.1704
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1703
retrieving revision 1.1704
diff -u -r1.1703 -r1.1704
--- ChangeLog 7 Jul 2015 14:11:37 - 1.1703
+++ ChangeLog 8 Jul 2015 09:33:47 - 1.1704
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1703 2015/07/07
14:11:37 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1704 2015/07/08
09:33:47 voyageur Exp $
+
+ 08 Jul 2015; Bernard Cafarelli voyag...@gentoo.org webapp.eclass:
+ Fix elog in webapp_serverowned and ebeep in newer EAPIs
07 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
-mozconfig-v4.31.eclass, -mozconfig-v5.33.eclass, +mozconfig-v6.38.eclass,
1.75 eclass/webapp.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.75view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?rev=1.75content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/webapp.eclass?r1=1.74r2=1.75
Index: webapp.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- webapp.eclass 2 Jul 2015 14:02:34 - 1.74
+++ webapp.eclass 8 Jul 2015 09:33:47 - 1.75
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.74 2015/07/02
14:02:34 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.75 2015/07/08
09:33:47 voyageur Exp $
# @ECLASS: webapp.eclass
# @MAINTAINER:
@@ -244,7 +244,6 @@
local my_file=$(webapp_strip_appdir ${1})
my_file=$(webapp_strip_cwd ${my_file})
- elog (server owned) ${my_file}
echo ${my_file} ${D}/${WA_SOLIST}
}
@@ -413,7 +412,9 @@
ewarn This ebuild may be overwriting important files.
ewarn
echo
- ebeep 10
+ if has ${EAPI:-0} 0 1 2; then
+ ebeep 10
+ fi
elif [[ $(echo ${my_output} | awk '{ print $1 }') != ${PN} ]]; then
echo
eerror You already have ${my_output} installed in ${my_dir}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v4.31.eclass mozconfig-v5.33.eclass mozconfig-v6.38.eclass mozconfig-v6.39.eclass
axs 15/07/07 14:11:37
Modified: ChangeLog
Added:mozconfig-v6.38.eclass mozconfig-v6.39.eclass
Removed: mozconfig-v4.31.eclass mozconfig-v5.33.eclass
Log:
removed old mozconfig eclasses, added new
Revision ChangesPath
1.1703 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1703view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1703content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1702r2=1.1703
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1702
retrieving revision 1.1703
diff -u -r1.1702 -r1.1703
--- ChangeLog 6 Jul 2015 16:48:21 - 1.1702
+++ ChangeLog 7 Jul 2015 14:11:37 - 1.1703
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1702 2015/07/06
16:48:21 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1703 2015/07/07
14:11:37 axs Exp $
+
+ 07 Jul 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
+ -mozconfig-v4.31.eclass, -mozconfig-v5.33.eclass, +mozconfig-v6.38.eclass,
+ +mozconfig-v6.39.eclass:
+ removed old mozconfig eclasses, added new
06 Jul 2015; William Hubbs willi...@gentoo.org golang-build.eclass:
Add back the subslot operator in the dependency on Go. We need this so that
1.1 eclass/mozconfig-v6.38.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?rev=1.1view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v6.38.eclass?rev=1.1content-type=text/plain
Index: mozconfig-v6.38.eclass
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v6.38.eclass,v 1.1
2015/07/07 14:11:37 axs Exp $
#
# @ECLASS: mozconfig-v5.33.eclass
# @MAINTAINER:
# mozilla team mozi...@gentoo.org
# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
# @DESCRIPTION:
# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
# to provide a single common place for the common mozilla engine compoments.
#
# The eclass provides all common dependencies as well as common use flags.
#
# Some use flags which may be optional in particular mozilla packages can be
# supported through setting eclass variables.
#
# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
# and so ebuilds inheriting this eclass do not need to inherit that.
inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
case ${EAPI} in
0|1|2|3|4) die EAPI=${EAPI} not supported
esac
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
# @DESCRIPTION:
# Set this variable before the inherit line, when an ebuild needs to provide
# optional necko-wifi support via IUSE=wifi. Currently this would include
# ebuilds for firefox, and potentially seamonkey.
#
# Leave the variable UNSET if necko-wifi support should not be available.
# Set the variable to enabled if the use flag should be enabled by default.
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
# @DESCRIPTION:
# Set this variable before the inherit line, when an ebuild needs to provide
# optional necko-wifi support via IUSE=jit. Currently this would include
# ebuilds for firefox, and potentially seamonkey.
#
# Leave the variable UNSET if optional jit support should not be available.
# Set the variable to enabled if the use flag should be enabled by default.
# Set the variable to any value if the use flag should exist but not be
default-enabled.
# use-flags common among all mozilla ebuilds
IUSE=${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux
startup-notification system-cairo system-icu system-jpeg system-sqlite
system-libvpx
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs
2.14
# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
RDEPEND==app-text/hunspell-1.2
dev-libs/atk
dev-libs/expat
=dev-libs/libevent-1.4.7
=x11-libs/cairo-1.10[X]
=x11-libs/gtk+-2.18:2
x11-libs/gdk-pixbuf
=x11-libs/pango-1.22.0
=media-libs/libpng-1.6.16:0=[apng]
=media-libs/mesa-10.2:*
media-libs/fontconfig
=media-libs/freetype-2.4.10
kernel_linux? ( media-libs/alsa-lib )
pulseaudio? ( media-sound/pulseaudio )
virtual/freedesktop-icon-theme
dbus? ( =sys-apps/dbus-0.60
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-build.eclass
williamh15/07/06 16:48:21 Modified: ChangeLog golang-build.eclass Log: Add back the subslot operator in the dependency on Go. We need this so that we have the Go version the package was built with recorded. Revision ChangesPath 1.1702 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1702view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1702content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1701r2=1.1702 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1701 retrieving revision 1.1702 diff -u -r1.1701 -r1.1702 --- ChangeLog 6 Jul 2015 15:48:51 - 1.1701 +++ ChangeLog 6 Jul 2015 16:48:21 - 1.1702 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1701 2015/07/06 15:48:51 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1702 2015/07/06 16:48:21 williamh Exp $ + + 06 Jul 2015; William Hubbs willi...@gentoo.org golang-build.eclass: + Add back the subslot operator in the dependency on Go. We need this so that + we have the Go version the package was built with recorded. 06 Jul 2015; Michael Palimaka kensing...@gentoo.org kde5.eclass: Add missing USE dependency default wrt bug #554056. 1.4 eclass/golang-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.4view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.4content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?r1=1.3r2=1.4 Index: golang-build.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- golang-build.eclass 3 Jul 2015 21:45:06 - 1.3 +++ golang-build.eclass 6 Jul 2015 16:48:21 - 1.4 @@ -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/eclass/golang-build.eclass,v 1.3 2015/07/03 21:45:06 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.4 2015/07/06 16:48:21 williamh Exp $ # @ECLASS: golang-build.eclass # @MAINTAINER: @@ -24,7 +24,7 @@ _GOLANG_BUILD=1 -DEPEND==dev-lang/go-1.4.2 +DEPEND==dev-lang/go-1.4.2:= STRIP_MASK=*.a # @ECLASS-VARIABLE: EGO_PN
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass
kensington15/07/06 15:48:51
Modified: ChangeLog kde5.eclass
Log:
Add missing USE dependency default wrt bug #554056.
Revision ChangesPath
1.1701 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1701view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1701content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1700r2=1.1701
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1700
retrieving revision 1.1701
diff -u -r1.1700 -r1.1701
--- ChangeLog 5 Jul 2015 09:10:53 - 1.1700
+++ ChangeLog 6 Jul 2015 15:48:51 - 1.1701
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1700 2015/07/05
09:10:53 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1701 2015/07/06
15:48:51 kensington Exp $
+
+ 06 Jul 2015; Michael Palimaka kensing...@gentoo.org kde5.eclass:
+ Add missing USE dependency default wrt bug #554056.
05 Jul 2015; Hans de Graaff gra...@gentoo.org ruby-fakegem.eclass:
Document that some variables must be set before inheriting the eclass.
1.13 eclass/kde5.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.13view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.13content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.12r2=1.13
Index: kde5.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kde5.eclass 28 Jun 2015 13:12:52 - 1.12
+++ kde5.eclass 6 Jul 2015 15:48:51 - 1.13
@@ -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/eclass/kde5.eclass,v 1.12 2015/06/28
13:12:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.13 2015/07/06
15:48:51 kensington Exp $
# @ECLASS: kde5.eclass
# @MAINTAINER:
@@ -136,7 +136,7 @@
if [[ ${CATEGORY} = kde-plasma ]]; then
RDEPEND+=
- !kde-apps/kde4-l10n[-minimal]
+ !kde-apps/kde4-l10n[-minimal(-)]
!kde-base/kde-l10n:4[-minimal(-)]
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-fakegem.eclass
graaff 15/07/05 09:10:53
Modified: ChangeLog ruby-fakegem.eclass
Log:
Document that some variables must be set before inheriting the eclass.
Revision ChangesPath
1.1700 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1700view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1700content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1699r2=1.1700
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1699
retrieving revision 1.1700
diff -u -r1.1699 -r1.1700
--- ChangeLog 4 Jul 2015 15:26:17 - 1.1699
+++ ChangeLog 5 Jul 2015 09:10:53 - 1.1700
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1699 2015/07/04
15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1700 2015/07/05
09:10:53 graaff Exp $
+
+ 05 Jul 2015; Hans de Graaff gra...@gentoo.org ruby-fakegem.eclass:
+ Document that some variables must be set before inheriting the eclass.
04 Jul 2015; Mike Gilbert flop...@gentoo.org distutils-r1.eclass,
python-any-r1.eclass, python-r1.eclass, python-single-r1.eclass,
1.45 eclass/ruby-fakegem.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.45view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?rev=1.45content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-fakegem.eclass?r1=1.44r2=1.45
Index: ruby-fakegem.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ruby-fakegem.eclass 28 Dec 2014 10:13:18 - 1.44
+++ ruby-fakegem.eclass 5 Jul 2015 09:10:53 - 1.45
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.44
2014/12/28 10:13:18 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-fakegem.eclass,v 1.45
2015/07/05 09:10:53 graaff Exp $
# @ECLASS: ruby-fakegem.eclass
# @MAINTAINER:
@@ -18,11 +18,13 @@
# @ECLASS-VARIABLE: RUBY_FAKEGEM_NAME
# @DESCRIPTION:
# Sets the Gem name for the generated fake gemspec.
+# This variable MUST be set before inheriting the eclass.
# RUBY_FAKEGEM_NAME=${PN}
# @ECLASS-VARIABLE: RUBY_FAKEGEM_VERSION
# @DESCRIPTION:
# Sets the Gem version for the generated fake gemspec.
+# This variable MUST be set before inheriting the eclass.
# RUBY_FAKEGEM_VERSION=${PV}
# @ECLASS-VARIABLE: RUBY_FAKEGEM_TASK_DOC
@@ -294,7 +296,7 @@
# so better taking this into consideration.
local quoted_description=${DESCRIPTION//\/\\\}
cat - $1 EOF
-# generated by ruby-fakegem.eclass $Revision: 1.44 $
+# generated by ruby-fakegem.eclass $Revision: 1.45 $
Gem::Specification.new do |s|
s.name = ${RUBY_FAKEGEM_NAME}
s.version = ${RUBY_FAKEGEM_VERSION}
@@ -347,7 +349,7 @@
#!${rubycmd}
# This is a simplified version of the RubyGems wrapper
#
-# Generated by ruby-fakegem.eclass $Revision: 1.44 $
+# Generated by ruby-fakegem.eclass $Revision: 1.45 $
require 'rubygems'
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass python-any-r1.eclass python-r1.eclass python-single-r1.eclass python-utils-r1.eclass
floppym 15/07/04 15:26:17
Modified: ChangeLog distutils-r1.eclass python-any-r1.eclass
python-r1.eclass python-single-r1.eclass
python-utils-r1.eclass
Log:
Replace links to python-r1 dev guide with links to the wiki.
Revision ChangesPath
1.1699 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1699view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1699content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1698r2=1.1699
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1698
retrieving revision 1.1699
diff -u -r1.1698 -r1.1699
--- ChangeLog 4 Jul 2015 15:22:41 - 1.1698
+++ ChangeLog 4 Jul 2015 15:26:17 - 1.1699
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1698 2015/07/04
15:22:41 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1699 2015/07/04
15:26:17 floppym Exp $
+
+ 04 Jul 2015; Mike Gilbert flop...@gentoo.org distutils-r1.eclass,
+ python-any-r1.eclass, python-r1.eclass, python-single-r1.eclass,
+ python-utils-r1.eclass:
+ Replace links to python-r1 dev guide with links to the wiki.
04 Jul 2015; Manuel Rüger mr...@gentoo.org python-r1.eclass:
Update URI.
1.114eclass/distutils-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.114view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.114content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.113r2=1.114
Index: distutils-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- distutils-r1.eclass 20 Feb 2015 17:57:22 - 1.113
+++ distutils-r1.eclass 4 Jul 2015 15:26:17 - 1.114
@@ -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/eclass/distutils-r1.eclass,v 1.113
2015/02/20 17:57:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.114
2015/07/04 15:26:17 floppym Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -40,8 +40,8 @@
# as well. Thus, all the variables defined and documented there are
# relevant to the packages using distutils-r1.
#
-# For more information, please see the python-r1 Developer's Guide:
-# http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
+# For more information, please see the wiki:
+# https://wiki.gentoo.org/wiki/Project:Python/distutils-r1
case ${EAPI:-0} in
0|1|2|3)
1.19 eclass/python-any-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?rev=1.19view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?rev=1.19content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-any-r1.eclass?r1=1.18r2=1.19
Index: python-any-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-any-r1.eclass9 Nov 2014 22:27:58 - 1.18
+++ python-any-r1.eclass4 Jul 2015 15:26:17 - 1.19
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.18
2014/11/09 22:27:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.19
2015/07/04 15:26:17 floppym Exp $
# @ECLASS: python-any-r1
# @MAINTAINER:
@@ -33,8 +33,8 @@
# packages using python-any-r1, and there is no need ever to inherit
# both.
#
-# For more information, please see the python-r1 Developer's Guide:
-# http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
+# For more information, please see the wiki:
+# https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
case ${EAPI:-0} in
0|1|2|3|4|5)
1.92 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.92view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.92content-type=text/plain
diff :
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass
mrueg 15/07/04 15:22:41
Modified: ChangeLog python-r1.eclass
Log:
Update URI.
Revision ChangesPath
1.1698 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1698view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1698content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1697r2=1.1698
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1697
retrieving revision 1.1698
diff -u -r1.1697 -r1.1698
--- ChangeLog 3 Jul 2015 21:45:06 - 1.1697
+++ ChangeLog 4 Jul 2015 15:22:41 - 1.1698
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1697 2015/07/03
21:45:06 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1698 2015/07/04
15:22:41 mrueg Exp $
+
+ 04 Jul 2015; Manuel Rüger mr...@gentoo.org python-r1.eclass:
+ Update URI.
03 Jul 2015; William Hubbs willi...@gentoo.org golang-build.eclass:
drop the slot dependency; it was pointed out to me that they do not trigger
1.91 eclass/python-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.91view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.91content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.90r2=1.91
Index: python-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- python-r1.eclass21 Mar 2015 14:55:33 - 1.90
+++ python-r1.eclass4 Jul 2015 15:22:41 - 1.91
@@ -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/eclass/python-r1.eclass,v 1.90 2015/03/21
14:55:33 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.91 2015/07/04
15:22:41 mrueg Exp $
# @ECLASS: python-r1
# @MAINTAINER:
@@ -26,8 +26,8 @@
# in the packages using python-r1, and there is no need ever to inherit
# both.
#
-# For more information, please see the python-r1 Developer's Guide:
-# http://www.gentoo.org/proj/en/Python/python-r1/dev-guide.xml
+# For more information, please see the python-r1 wiki article:
+# https://wiki.gentoo.org/wiki/Project:Python/python-r1
case ${EAPI:-0} in
0|1|2|3)
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-build.eclass
williamh15/07/03 21:45:06 Modified: ChangeLog golang-build.eclass Log: golang-build.eclass: drop the slot dependency; it was pointed out to me that they do not force rebuilds in DEPEND Revision ChangesPath 1.1697 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1697view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1697content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1696r2=1.1697 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1696 retrieving revision 1.1697 diff -u -r1.1696 -r1.1697 --- ChangeLog 1 Jul 2015 11:28:23 - 1.1696 +++ ChangeLog 3 Jul 2015 21:45:06 - 1.1697 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1696 2015/07/01 11:28:23 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1697 2015/07/03 21:45:06 williamh Exp $ + + 03 Jul 2015; William Hubbs willi...@gentoo.org golang-build.eclass: + drop the slot dependency; it was pointed out to me that they do not trigger + rebuilds in DEPEND 01 Jul 2015; Manuel Rüger mr...@gentoo.org kde4-base.eclass: Sync with overlay. Add SRC_URIs for newer KDE SC, KDE Workspace releases and 1.3 eclass/golang-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.3view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.3content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?r1=1.2r2=1.3 Index: golang-build.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- golang-build.eclass 24 Jun 2015 17:04:53 - 1.2 +++ golang-build.eclass 3 Jul 2015 21:45:06 - 1.3 @@ -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/eclass/golang-build.eclass,v 1.2 2015/06/24 17:04:53 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.3 2015/07/03 21:45:06 williamh Exp $ # @ECLASS: golang-build.eclass # @MAINTAINER: @@ -24,7 +24,7 @@ _GOLANG_BUILD=1 -DEPEND==dev-lang/go-1.4.2:= +DEPEND==dev-lang/go-1.4.2 STRIP_MASK=*.a # @ECLASS-VARIABLE: EGO_PN
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass
mrueg 15/07/01 11:28:23
Modified: ChangeLog kde4-base.eclass
Log:
Sync with overlay. Add SRC_URIs for newer KDE SC, KDE Workspace releases and
KDEPIM 4.4 no-akonadi branches.
Revision ChangesPath
1.1696 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1696view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1696content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1695r2=1.1696
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1695
retrieving revision 1.1696
diff -u -r1.1695 -r1.1696
--- ChangeLog 29 Jun 2015 11:01:31 - 1.1695
+++ ChangeLog 1 Jul 2015 11:28:23 - 1.1696
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1695 2015/06/29
11:01:31 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1696 2015/07/01
11:28:23 mrueg Exp $
+
+ 01 Jul 2015; Manuel Rüger mr...@gentoo.org kde4-base.eclass:
+ Sync with overlay. Add SRC_URIs for newer KDE SC, KDE Workspace releases and
+ KDEPIM 4.4 no-akonadi branches.
29 Jun 2015; Manuel Rüger mr...@gentoo.org ruby-ng.eclass:
Quote RUBY_S and sub_S as the directory could contain spaces.
1.157eclass/kde4-base.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.157view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.157content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.156r2=1.157
Index: kde4-base.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kde4-base.eclass15 Jun 2015 14:04:44 - 1.156
+++ kde4-base.eclass1 Jul 2015 11:28:23 - 1.157
@@ -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/eclass/kde4-base.eclass,v 1.156 2015/06/15
14:04:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.157 2015/07/01
11:28:23 mrueg Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -430,6 +430,10 @@
# KDEPIM 4.4, special case
# TODO: Remove this part when KDEPIM
4.4 gets out of the tree
SRC_URI=mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2 ;;
+ 4.4.20*)
+ # KDEPIM 4.4 no-akonadi branch, special
case
+ # TODO: Remove this part when KDEPIM
4.4 gets out of the tree
+
SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/${_kmname_pv}.tar.xz; ;;
4.?.[6-9]? | 4.??.[6-9]?)
# Unstable KDE SC releases
SRC_URI=mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.xz ;;
@@ -448,6 +452,9 @@
4.11.20)
# Part of 15.04.2 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz ;;
+ 4.11.21)
+ # Part of 15.04.3 actually, sigh. Not
stable for next release!
+
SRC_URI=mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz ;;
4.14.3)
# Last SC release
SRC_URI=mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz ;;
@@ -463,6 +470,9 @@
4.14.9)
# Part of 15.04.2 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz ;;
+ 4.14.10)
+ # Part of 15.04.3 actually, sigh. Not
stable for next release!
+
SRC_URI=mirror://kde/stable/applications/15.04.3/src/${_kmname_pv}.tar.xz ;;
??.?.[6-9]? | ??.??.[4-9]?)
# Unstable KDE Applications releases
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog ruby-ng.eclass
mrueg 15/06/29 11:01:31
Modified: ChangeLog ruby-ng.eclass
Log:
Quote RUBY_S and sub_S as the directory could contain spaces.
Revision ChangesPath
1.1695 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1695view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1695content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1694r2=1.1695
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1694
retrieving revision 1.1695
diff -u -r1.1694 -r1.1695
--- ChangeLog 29 Jun 2015 00:27:17 - 1.1694
+++ ChangeLog 29 Jun 2015 11:01:31 - 1.1695
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29
00:27:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1695 2015/06/29
11:01:31 mrueg Exp $
+
+ 29 Jun 2015; Manuel Rüger mr...@gentoo.org ruby-ng.eclass:
+ Quote RUBY_S and sub_S as the directory could contain spaces.
29 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
1.58 eclass/ruby-ng.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.58view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?rev=1.58content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ruby-ng.eclass?r1=1.57r2=1.58
Index: ruby-ng.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ruby-ng.eclass 31 May 2015 05:57:23 - 1.57
+++ ruby-ng.eclass 29 Jun 2015 11:01:31 - 1.58
@@ -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/eclass/ruby-ng.eclass,v 1.57 2015/05/31
05:57:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.58 2015/06/29
11:01:31 mrueg Exp $
# @ECLASS: ruby-ng.eclass
# @MAINTAINER:
@@ -302,7 +302,7 @@
old_S=${S}
case ${EAPI} in
4|5)
- if [ -z ${RUBY_S} ]; then
+ if [ -z ${RUBY_S} ]; then
sub_S=${P}
else
sub_S=${RUBY_S}
@@ -316,7 +316,7 @@
# Special case, for the always-lovely GitHub fetches. With this,
# we allow the star glob to just expand to whatever directory it's
# called.
- if [[ ${sub_S} = *** ]]; then
+ if [[ ${sub_S} = *** ]]; then
case ${EAPI} in
2|3)
#The old method of setting S depends on
undefined package
@@ -325,7 +325,7 @@
;;
esac
pushd ${WORKDIR}/all /dev/null
- sub_S=$(eval ls -d ${sub_S} 2/dev/null)
+ sub_S=$(eval ls -d ${sub_S} 2/dev/null)
popd /dev/null
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5.eclass
johu15/06/28 13:12:52
Modified: ChangeLog kde5.eclass
Log:
Loop optimization as suggested by Michal Górny mgo...@gentoo.org on -dev ml.
Revision ChangesPath
1.1692 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1692view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1692content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1691r2=1.1692
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1691
retrieving revision 1.1692
diff -u -r1.1691 -r1.1692
--- ChangeLog 27 Jun 2015 22:02:21 - 1.1691
+++ ChangeLog 28 Jun 2015 13:12:52 - 1.1692
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1691 2015/06/27
22:02:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1692 2015/06/28
13:12:52 johu Exp $
+
+ 28 Jun 2015; Johannes Huber j...@gentoo.org kde5.eclass:
+ Loop optimization as suggested by Michal Górny mgo...@gentoo.org on -dev
+ ml.
27 Jun 2015; Johannes Huber j...@gentoo.org kde5-functions.eclass,
kde5.eclass:
1.12 eclass/kde5.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.12view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.12content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.11r2=1.12
Index: kde5.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kde5.eclass 27 Jun 2015 22:02:21 - 1.11
+++ kde5.eclass 28 Jun 2015 13:12:52 - 1.12
@@ -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/eclass/kde5.eclass,v 1.11 2015/06/27
22:02:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.12 2015/06/28
13:12:52 johu Exp $
# @ECLASS: kde5.eclass
# @MAINTAINER:
@@ -375,7 +375,7 @@
if [[ ${KDE_BUILD_TYPE} = release ]] ; then
if [[ -d po ]] ; then
pushd po /dev/null
- for lang in $(ls) ; do
+ for lang in *; do
if ! has ${lang} ${LINGUAS} ; then
if [[ ${lang} != CMakeLists.txt ]] ;
then
rm -rf ${lang}
@@ -390,7 +390,7 @@
if [[ ${KDE_HANDBOOK} = true ]] ; then
pushd doc /dev/null
- for lang in $(ls) ; do
+ for lang in *; do
if ! has ${lang} ${LINGUAS} ; then
comment_add_subdirectory ${lang}
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/06/28 13:33:48
Modified: ChangeLog java-utils-2.eclass
Log:
The -source flag was added in 1.3 or 1.4 (not sure) and we have
special code to handle this but no one in their right mind would build
with 1.2 or 1.3 now. Removing this code allows the ecj-gcj ebuild to
call java-pkg_javac-args without a proper VM present.
Revision ChangesPath
1.1693 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1692r2=1.1693
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -r1.1692 -r1.1693
--- ChangeLog 28 Jun 2015 13:12:52 - 1.1692
+++ ChangeLog 28 Jun 2015 13:33:48 - 1.1693
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1692 2015/06/28
13:12:52 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28
13:33:48 chewi Exp $
+
+ 28 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
+ to handle this but no one in their right mind would build with 1.2 or 1.3
+ now. Removing this code allows the ecj-gcj ebuild to call java-pkg_javac-args
+ without a proper VM present.
28 Jun 2015; Johannes Huber j...@gentoo.org kde5.eclass:
Loop optimization as suggested by Michal Górny mgo...@gentoo.org on -dev
1.165eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.164r2=1.165
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- java-utils-2.eclass 19 Jun 2015 14:11:24 - 1.164
+++ java-utils-2.eclass 28 Jun 2015 13:33:48 - 1.165
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164
2015/06/19 14:11:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165
2015/06/28 13:33:48 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1592,11 +1592,7 @@
echo Could not find valid -source/-target values for javac
return 1
else
- if java-pkg_is-vm-version-ge 1.4; then
- echo ${source_str} ${target_str}
- else
- echo ${target_str}
- fi
+ echo ${source_str} ${target_str}
fi
}
@@ -2190,14 +2186,11 @@
continue
fi
- # -source was introduced in 1.3, so only check 1.3 and
on
- if version_is_at_least ${desired_soure} 1.3; then
- # Verify that the compiler supports source
- local supported_source=$(source ${compiler_env}
1/dev/null 21; echo ${SUPPORTED_SOURCE})
- if ! has ${desired_source} ${supported_source};
then
- ewarn ${compiler} does not support
-source ${desired_source}, skipping
- continue
- fi
+ # Verify that the compiler supports source
+ local supported_source=$(source ${compiler_env}
1/dev/null 21; echo ${SUPPORTED_SOURCE})
+ if ! has ${desired_source} ${supported_source}; then
+ ewarn ${compiler} does not support -source
${desired_source}, skipping
+ continue
fi
# if you get here, then the compiler should be good to
go
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/06/29 00:27:17
Modified: ChangeLog qmake-utils.eclass
Log:
Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
Revision ChangesPath
1.1694 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1694content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1693r2=1.1694
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1693
retrieving revision 1.1694
diff -u -r1.1693 -r1.1694
--- ChangeLog 28 Jun 2015 13:33:48 - 1.1693
+++ ChangeLog 29 Jun 2015 00:27:17 - 1.1694
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28
13:33:48 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1694 2015/06/29
00:27:17 pesa Exp $
+
+ 29 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
+ Introduce qt{4,5}_get_plugindir(). Rephrase some eclass doc.
28 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
The -source flag was added in 1.3 or 1.4 (not sure) and we have special code
1.12 eclass/qmake-utils.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.12content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.11r2=1.12
Index: qmake-utils.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qmake-utils.eclass 22 Jun 2015 14:18:19 - 1.11
+++ qmake-utils.eclass 29 Jun 2015 00:27:17 - 1.12
@@ -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/eclass/qmake-utils.eclass,v 1.11 2015/06/22
14:18:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.12 2015/06/29
00:27:17 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -22,6 +22,7 @@
# @FUNCTION: qt4_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt4 binaries are installed.
+# EPREFIX is already prepended to the returned path.
qt4_get_bindir() {
has ${EAPI:-0} 0 1 2 use !prefix EPREFIX=
@@ -36,7 +37,6 @@
# @FUNCTION: qt4_get_headerdir
# @DESCRIPTION:
# Echoes the directory where Qt4 headers are installed.
-# Does not take EPREFIX into account.
qt4_get_headerdir() {
echo /usr/include/qt4
}
@@ -44,7 +44,6 @@
# @FUNCTION: qt4_get_libdir
# @DESCRIPTION:
# Echoes the directory where Qt4 libraries are installed.
-# Does not take EPREFIX into account.
qt4_get_libdir() {
echo /usr/$(get_libdir)/qt4
}
@@ -52,14 +51,21 @@
# @FUNCTION: qt4_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt4 mkspecs are installed.
-# Does not take EPREFIX into account.
qt4_get_mkspecsdir() {
echo /usr/share/qt4/mkspecs
}
+# @FUNCTION: qt4_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 plugins are installed.
+qt4_get_plugindir() {
+ echo $(qt4_get_libdir)/plugins
+}
+
# @FUNCTION: qt5_get_bindir
# @DESCRIPTION:
# Echoes the directory where Qt5 binaries are installed.
+# EPREFIX is already prepended to the returned path.
qt5_get_bindir() {
has ${EAPI:-0} 0 1 2 use !prefix EPREFIX=
@@ -69,7 +75,6 @@
# @FUNCTION: qt5_get_headerdir
# @DESCRIPTION:
# Echoes the directory where Qt5 headers are installed.
-# Does not take EPREFIX into account.
qt5_get_headerdir() {
echo /usr/include/qt5
}
@@ -77,7 +82,6 @@
# @FUNCTION: qt5_get_libdir
# @DESCRIPTION:
# Echoes the directory where Qt5 libraries are installed.
-# Does not take EPREFIX into account.
qt5_get_libdir() {
echo /usr/$(get_libdir)
}
@@ -85,11 +89,17 @@
# @FUNCTION: qt5_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt5 mkspecs are installed.
-# Does not take EPREFIX into account.
qt5_get_mkspecsdir() {
echo $(qt5_get_libdir)/qt5/mkspecs
}
+# @FUNCTION: qt5_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 plugins are installed.
+qt5_get_plugindir() {
+ echo $(qt5_get_libdir)/qt5/plugins
+}
+
# @FUNCTION: qmake-utils_find_pro_file
# @RETURN: zero or one qmake .pro file names
# @INTERNAL
@@ -136,10 +146,10 @@
# @FUNCTION: eqmake4
# @USAGE: [project_file] [parameters to qmake]
# @DESCRIPTION:
-# Wrapper for Qt4's qmake. If project_file isn't specified, eqmake4 will
-# look
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
mpagano 15/06/27 17:27:15
Modified: ChangeLog kernel-2.eclass
Log:
Fix for kdbus. Thanks to Arfrever.
Revision ChangesPath
1.1689 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1689view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1689content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1688r2=1.1689
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1688
retrieving revision 1.1689
diff -u -r1.1688 -r1.1689
--- ChangeLog 27 Jun 2015 15:36:06 - 1.1688
+++ ChangeLog 27 Jun 2015 17:27:15 - 1.1689
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1688 2015/06/27
15:36:06 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1689 2015/06/27
17:27:15 mpagano Exp $
+
+ 27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
+ Fix for kdbus. Thanks to Arfrever.
27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
Add the kdbus use flag and eclass variable to the kernel-2.eclass for
1.309eclass/kernel-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.309view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.309content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.308r2=1.309
Index: kernel-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- kernel-2.eclass 27 Jun 2015 15:36:06 - 1.308
+++ kernel-2.eclass 27 Jun 2015 17:27:15 - 1.309
@@ -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/eclass/kernel-2.eclass,v 1.308 2015/06/27
15:36:06 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.309 2015/06/27
17:27:15 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -454,7 +454,7 @@
DESCRIPTION=Sources based on the Linux Kernel.
IUSE=symlink build
- if [[ -n K_KDBUS_AVAILABLE ]]; then
+ if [[ -n ${K_KDBUS_AVAILABLE} ]]; then
IUSE=${IUSE} kdbus
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
mpagano 15/06/27 17:41:20
Modified: ChangeLog kernel-2.eclass
Log:
Fix conditional bug for UNIPATCH_DROP
Revision ChangesPath
1.1690 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1690view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1690content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1689r2=1.1690
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1689
retrieving revision 1.1690
diff -u -r1.1689 -r1.1690
--- ChangeLog 27 Jun 2015 17:27:15 - 1.1689
+++ ChangeLog 27 Jun 2015 17:41:20 - 1.1690
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1689 2015/06/27
17:27:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27
17:41:20 mpagano Exp $
+
+ 27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
+ Fix conditional bug for UNIPATCH_DROP
27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
Fix for kdbus. Thanks to Arfrever.
1.310eclass/kernel-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.310view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.310content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.309r2=1.310
Index: kernel-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- kernel-2.eclass 27 Jun 2015 17:27:15 - 1.309
+++ kernel-2.eclass 27 Jun 2015 17:41:20 - 1.310
@@ -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/eclass/kernel-2.eclass,v 1.309 2015/06/27
17:27:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.310 2015/06/27
17:41:20 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -1022,10 +1022,12 @@
fi
# if kdbus use flag is not set, drop the kdbus patch
-if [[ $UNIPATCH_DROP != *5015_kdbus*.patch* ]] ! use kdbus;
then
- UNIPATCH_DROP=${UNIPATCH_DROP}
5015_kdbus*.patch
+if [[ $UNIPATCH_DROP != *5015_kdbus*.patch* ]]; then
+ if ! has kdbus ${IUSE} || ! use kdbus; then
+ UNIPATCH_DROP=${UNIPATCH_DROP}
5015_kdbus*.patch
+ fi
fi
- fi
+ fi
done
#populate KPATCH_DIRS so we know where to look to remove the excludes
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
mpagano 15/06/27 15:36:07
Modified: ChangeLog kernel-2.eclass
Log:
Add the kdbus use flag and eclass variable to the kernel-2.eclass for
optional kdbus inclusion.
Revision ChangesPath
1.1688 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1688view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1688content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1687r2=1.1688
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1687
retrieving revision 1.1688
diff -u -r1.1687 -r1.1688
--- ChangeLog 27 Jun 2015 00:50:55 - 1.1687
+++ ChangeLog 27 Jun 2015 15:36:06 - 1.1688
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1687 2015/06/27
00:50:55 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1688 2015/06/27
15:36:06 mpagano Exp $
+
+ 27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
+ Add the kdbus use flag and eclass variable to the kernel-2.eclass for
+ optional kdbus inclusion.
27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds.
1.308eclass/kernel-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.308view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.308content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.307r2=1.308
Index: kernel-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- kernel-2.eclass 27 Jun 2015 00:50:55 - 1.307
+++ kernel-2.eclass 27 Jun 2015 15:36:06 - 1.308
@@ -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/eclass/kernel-2.eclass,v 1.307 2015/06/27
00:50:55 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.308 2015/06/27
15:36:06 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -65,6 +65,9 @@
# K_LONGTERM - If set, the eclass will search for the kernel
source
#in the long term directories
on the upstream servers
#as the location has been
changed by upstream
+# K_KDBUS_AVAILABLE- If set, the ebuild contains the option of
installing the
+#kdbus patch. This patch is
not installed without the 'kdbus'
+#and 'experimental' use flags.
# H_SUPPORTEDARCH - this should be a space separated list of
ARCH's which
#can be supported by the
headers ebuild
@@ -451,6 +454,10 @@
DESCRIPTION=Sources based on the Linux Kernel.
IUSE=symlink build
+ if [[ -n K_KDBUS_AVAILABLE ]]; then
+ IUSE=${IUSE} kdbus
+ fi
+
# Bug #266157, deblob for libre support
if [[ -z ${K_PREDEBLOBBED} ]] ; then
# Bug #359865, force a call to detect_version if needed
@@ -1013,6 +1020,11 @@
UNIPATCH_DROP+=
5000_enable-additional-cpu-optimizations-for-gcc.patch
fi
fi
+
+ # if kdbus use flag is not set, drop the kdbus patch
+if [[ $UNIPATCH_DROP != *5015_kdbus*.patch* ]] ! use kdbus;
then
+ UNIPATCH_DROP=${UNIPATCH_DROP}
5015_kdbus*.patch
+ fi
fi
done
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde5-functions.eclass kde5.eclass
johu15/06/27 22:02:21
Modified: ChangeLog kde5-functions.eclass kde5.eclass
Log:
Sync kde5*eclass with kde overlay. Handle more whitespace variations by
Michael Palimaka kensing...@gentoo.org. Fixes translation handling by Michael
Palimaka kensing...@gentoo.org and Andreas Sturmlechner
andreas.sturmlech...@gmail.com, bug #552664. Raises deps on KDE Frameworks
and KDE Plasma Manuel Rüger mr...@gentoo.org.
Revision ChangesPath
1.1691 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1691content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1690r2=1.1691
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1690
retrieving revision 1.1691
diff -u -r1.1690 -r1.1691
--- ChangeLog 27 Jun 2015 17:41:20 - 1.1690
+++ ChangeLog 27 Jun 2015 22:02:21 - 1.1691
@@ -1,6 +1,14 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1690 2015/06/27
17:41:20 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1691 2015/06/27
22:02:21 johu Exp $
+
+ 27 Jun 2015; Johannes Huber j...@gentoo.org kde5-functions.eclass,
+ kde5.eclass:
+ Sync kde5*eclass with kde overlay. Handle more whitespace variations by
+ Michael Palimaka kensing...@gentoo.org. Fixes translation handling by
+ Michael Palimaka kensing...@gentoo.org and Andreas Sturmlechner
+ andreas.sturmlech...@gmail.com, bug #552664. Raises deps on KDE Frameworks
+ and KDE Plasma Manuel Rüger mr...@gentoo.org.
27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
Fix conditional bug for UNIPATCH_DROP
1.9 eclass/kde5-functions.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?rev=1.9content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5-functions.eclass?r1=1.8r2=1.9
Index: kde5-functions.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kde5-functions.eclass 8 Jun 2015 12:27:32 - 1.8
+++ kde5-functions.eclass 27 Jun 2015 22:02:21 - 1.9
@@ -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/eclass/kde5-functions.eclass,v 1.8
2015/06/08 12:27:32 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.9
2015/06/27 22:02:21 johu Exp $
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
@@ -26,12 +26,12 @@
# @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
# @DESCRIPTION:
# Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.10.0}
+: ${FRAMEWORKS_MINIMAL:=5.11.0}
# @ECLASS-VARIABLE: PLASMA_MINIMAL
# @DESCRIPTION:
# Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.3.0}
+: ${PLASMA_MINIMAL:=5.3.1}
# @ECLASS-VARIABLE: KDE_APPS_MINIMAL
# @DESCRIPTION:
@@ -218,7 +218,7 @@
local prefix=${1}
local dep=${2}
- pcregrep -Mn (?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)
CMakeLists.txt ${T}/bogus${dep}
+ pcregrep -Mn (?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)
CMakeLists.txt ${T}/bogus${dep}
# pcregrep returns non-zero on no matches/error
if [[ $? != 0 ]] ; then
@@ -232,7 +232,7 @@
sed -e ${first},${last}s/${dep}// -i CMakeLists.txt || die
if [[ ${length} = 1 ]] ; then
- sed -e
/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d -i CMakeLists.txt ||
die
+ sed -e
/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d -i CMakeLists.txt
|| die
fi
}
1.11 eclass/kde5.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?rev=1.11content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde5.eclass?r1=1.10r2=1.11
Index: kde5.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kde5.eclass 31 May 2015 15:51:21 - 1.10
+++ kde5.eclass 27 Jun 2015 22:02:21 - 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog multilib-build.eclass
mgorny 15/06/26 20:43:13
Modified: ChangeLog multilib-build.eclass
Log:
Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
Revision ChangesPath
1.1685 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1684r2=1.1685
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1684
retrieving revision 1.1685
diff -u -r1.1684 -r1.1685
--- ChangeLog 24 Jun 2015 17:04:53 - 1.1684
+++ ChangeLog 26 Jun 2015 20:43:13 - 1.1685
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1684 2015/06/24
17:04:53 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1685 2015/06/26
20:43:13 mgorny Exp $
+
+ 26 Jun 2015; Michał Górny mgo...@gentoo.org multilib-build.eclass:
+ Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
24 Jun 2015; William Hubbs willi...@gentoo.org golang-build.eclass:
typo fix, use double brackets
1.66 eclass/multilib-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.65r2=1.66
Index: multilib-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- multilib-build.eclass 13 Dec 2014 08:41:37 - 1.65
+++ multilib-build.eclass 26 Jun 2015 20:43:13 - 1.66
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.65
2014/12/13 08:41:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.66
2015/06/26 20:43:13 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -513,14 +513,6 @@
sed -e /${MULTILIB_ABI_FLAG}
/serror.*include ${CHOST}${f} \
-i ${wrapper} || die
- # Hack for emul-linux-x86 compatibility.
- # It assumes amd64 will come after x86,
and will use amd64
- # headers if no specific x86 headers
were installed.
- if [[ ${ABI} == amd64 ]]; then
- sed -e /abi_x86_32
/serror.*include ${CHOST}${f} \
- -i ${wrapper} || die
- fi
-
# Needed for swig.
if multilib_is_native_abi; then
sed -e /Native
ABI/serror.*include ${CHOST}${f} \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
mpagano 15/06/27 00:50:55
Modified: ChangeLog kernel-2.eclass
Log:
Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds.
Revision ChangesPath
1.1687 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1687view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1687content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1686r2=1.1687
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1686
retrieving revision 1.1687
diff -u -r1.1686 -r1.1687
--- ChangeLog 26 Jun 2015 22:32:49 - 1.1686
+++ ChangeLog 27 Jun 2015 00:50:55 - 1.1687
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1686 2015/06/26
22:32:49 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1687 2015/06/27
00:50:55 mpagano Exp $
+
+ 27 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
+ Reverting kdbus changes in eclass. Caused invalid iuse for other ebuilds.
26 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
Add the option to include the kdbus patchset into gentoo-sources. Default is
1.307eclass/kernel-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.307view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.307content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.306r2=1.307
Index: kernel-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- kernel-2.eclass 26 Jun 2015 22:32:49 - 1.306
+++ kernel-2.eclass 27 Jun 2015 00:50:55 - 1.307
@@ -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/eclass/kernel-2.eclass,v 1.306 2015/06/26
22:32:49 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.307 2015/06/27
00:50:55 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -449,7 +449,7 @@
SLOT=${PVR}
DESCRIPTION=Sources based on the Linux Kernel.
- IUSE=symlink build kdbus
+ IUSE=symlink build
# Bug #266157, deblob for libre support
if [[ -z ${K_PREDEBLOBBED} ]] ; then
@@ -1013,11 +1013,6 @@
UNIPATCH_DROP+=
5000_enable-additional-cpu-optimizations-for-gcc.patch
fi
fi
-
- # if kdbus use flag is not set, drop the kdbus patch
- if [[ $UNIPATCH_DROP != *5015_kdbus*.patch* ]] !
use kdbus; then
- UNIPATCH_DROP=${UNIPATCH_DROP}
5015_kdbus*.patch
- fi
fi
done
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
mpagano 15/06/26 22:32:49
Modified: ChangeLog kernel-2.eclass
Log:
Add the option to include the kdbus patchset into gentoo-sources. Default is
not to include it.
Revision ChangesPath
1.1686 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1686view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1686content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1685r2=1.1686
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1685
retrieving revision 1.1686
diff -u -r1.1685 -r1.1686
--- ChangeLog 26 Jun 2015 20:43:13 - 1.1685
+++ ChangeLog 26 Jun 2015 22:32:49 - 1.1686
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1685 2015/06/26
20:43:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1686 2015/06/26
22:32:49 mpagano Exp $
+
+ 26 Jun 2015; Mike Pagano mpag...@gentoo.org kernel-2.eclass:
+ Add the option to include the kdbus patchset into gentoo-sources. Default is
+ not to include it.
26 Jun 2015; Michał Górny mgo...@gentoo.org multilib-build.eclass:
Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
1.306eclass/kernel-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.306view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.306content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.305r2=1.306
Index: kernel-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- kernel-2.eclass 30 May 2015 16:09:05 - 1.305
+++ kernel-2.eclass 26 Jun 2015 22:32:49 - 1.306
@@ -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/eclass/kernel-2.eclass,v 1.305 2015/05/30
16:09:05 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.306 2015/06/26
22:32:49 mpagano Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -449,7 +449,7 @@
SLOT=${PVR}
DESCRIPTION=Sources based on the Linux Kernel.
- IUSE=symlink build
+ IUSE=symlink build kdbus
# Bug #266157, deblob for libre support
if [[ -z ${K_PREDEBLOBBED} ]] ; then
@@ -1013,6 +1013,11 @@
UNIPATCH_DROP+=
5000_enable-additional-cpu-optimizations-for-gcc.patch
fi
fi
+
+ # if kdbus use flag is not set, drop the kdbus patch
+ if [[ $UNIPATCH_DROP != *5015_kdbus*.patch* ]] !
use kdbus; then
+ UNIPATCH_DROP=${UNIPATCH_DROP}
5015_kdbus*.patch
+ fi
fi
done
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog waf-utils.eclass
jlec15/06/24 06:32:12
Modified: ChangeLog waf-utils.eclass
Log:
Drop base.eclass usage
Revision ChangesPath
1.1680 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1680view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1680content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1679r2=1.1680
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1679
retrieving revision 1.1680
diff -u -r1.1679 -r1.1680
--- ChangeLog 23 Jun 2015 18:59:43 - 1.1679
+++ ChangeLog 24 Jun 2015 06:32:12 - 1.1680
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1679 2015/06/23
18:59:43 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1680 2015/06/24
06:32:12 jlec Exp $
+
+ 24 Jun 2015; Justin Lecher j...@gentoo.org waf-utils.eclass:
+ Drop base.eclass usage
23 Jun 2015; William Hubbs willi...@gentoo.org golang-vcs.eclass:
The GOPATH environment variable is now passed directly to the
1.23 eclass/waf-utils.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.23view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?rev=1.23content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/waf-utils.eclass?r1=1.22r2=1.23
Index: waf-utils.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- waf-utils.eclass3 Jan 2015 14:50:34 - 1.22
+++ waf-utils.eclass24 Jun 2015 06:32:12 - 1.23
@@ -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/eclass/waf-utils.eclass,v 1.22 2015/01/03
14:50:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/waf-utils.eclass,v 1.23 2015/06/24
06:32:12 jlec Exp $
# @ECLASS: waf-utils.eclass
# @MAINTAINER:
@@ -15,10 +15,10 @@
# waf-based packages much easier.
# Its main features are support of common portage default settings.
-inherit base eutils multilib toolchain-funcs multiprocessing
+inherit eutils multilib toolchain-funcs multiprocessing
case ${EAPI:-0} in
- 3|4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
+ 4|5) EXPORT_FUNCTIONS src_configure src_compile src_install ;;
*) die EAPI=${EAPI} is not supported ;;
esac
@@ -125,5 +125,5 @@
${WAF_BINARY} --destdir=${D} install || die Make install failed
# Manual document installation
- base_src_install_docs
+ einstalldocs
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
grknight15/06/24 13:36:03 Modified: ChangeLog depend.php.eclass Log: depend.php.eclass is deprecated and is set to be removed 30 days after bug 552836 is resolved Revision ChangesPath 1.1682 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1682view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1682content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1681r2=1.1682 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1681 retrieving revision 1.1682 diff -u -r1.1681 -r1.1682 --- ChangeLog 24 Jun 2015 13:22:02 - 1.1681 +++ ChangeLog 24 Jun 2015 13:36:03 - 1.1682 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1681 2015/06/24 13:22:02 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1682 2015/06/24 13:36:03 grknight Exp $ + + 24 Jun 2015; grkni...@gentoo.org depend.php.eclass: + depend.php.eclass is deprecated and is set to be removed 30 days after bug + 552836 is resolved 24 Jun 2015; grkni...@gentoo.org php-lib-r1.eclass: Remove depend.php and dodoc-php in favor of just dodoc 1.36 eclass/depend.php.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.36view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.36content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.35r2=1.36 Index: depend.php.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- depend.php.eclass 18 Jun 2015 14:22:59 - 1.35 +++ depend.php.eclass 24 Jun 2015 13:36:03 - 1.36 @@ -1,7 +1,8 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.35 2015/06/18 14:22:59 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.36 2015/06/24 13:36:03 grknight Exp $ +# @DEAD # @ECLASS: depend.php.eclass # @MAINTAINER: # Gentoo PHP team php-b...@gentoo.org @@ -14,6 +15,7 @@ # This eclass provides functions that allow ebuilds to depend on php5 and check # for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to install # documentation for PHP packages to php-specific location. +# This eclass is deprecated and is set to be removed 30 days after bug 552836 is resolved inherit eutils multilib
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-lib-r1.eclass
grknight15/06/24 13:22:02
Modified: ChangeLog php-lib-r1.eclass
Log:
Remove depend.php and dodoc-php in favor of just dodoc
Revision ChangesPath
1.1681 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1681view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1681content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1680r2=1.1681
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1680
retrieving revision 1.1681
diff -u -r1.1680 -r1.1681
--- ChangeLog 24 Jun 2015 06:32:12 - 1.1680
+++ ChangeLog 24 Jun 2015 13:22:02 - 1.1681
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1680 2015/06/24
06:32:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1681 2015/06/24
13:22:02 grknight Exp $
+
+ 24 Jun 2015; grkni...@gentoo.org php-lib-r1.eclass:
+ Remove depend.php and dodoc-php in favor of just dodoc
24 Jun 2015; Justin Lecher j...@gentoo.org waf-utils.eclass:
Drop base.eclass usage
1.13 eclass/php-lib-r1.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-lib-r1.eclass?rev=1.13view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-lib-r1.eclass?rev=1.13content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-lib-r1.eclass?r1=1.12r2=1.13
Index: php-lib-r1.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- php-lib-r1.eclass 14 Apr 2015 18:32:51 - 1.12
+++ php-lib-r1.eclass 24 Jun 2015 13:22:02 - 1.13
@@ -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/eclass/php-lib-r1.eclass,v 1.12 2015/04/14
18:32:51 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-lib-r1.eclass,v 1.13 2015/06/24
13:22:02 grknight Exp $
# @ECLASS: php-lib-r1.eclass
# @MAINTAINER:
@@ -13,8 +13,6 @@
# This eclass provides a unified interface for adding new PHP libraries.
# PHP libraries are PHP scripts designed for reuse inside other PHP scripts.
-inherit depend.php
-
EXPORT_FUNCTIONS src_install
# Silence repoman warnings
case ${EAPI:-0} in
@@ -58,6 +56,6 @@
done
for doc in ${DOCS} ; do
- [[ -s ${doc} ]] dodoc-php ${doc}
+ [[ -s ${doc} ]] dodoc ${doc}
done
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-build.eclass
williamh15/06/24 15:38:34
Modified: ChangeLog
Added:golang-build.eclass
Log:
Add an eclass for building Go software
Revision ChangesPath
1.1683 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1683view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1683content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1682r2=1.1683
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1682
retrieving revision 1.1683
diff -u -r1.1682 -r1.1683
--- ChangeLog 24 Jun 2015 13:36:03 - 1.1682
+++ ChangeLog 24 Jun 2015 15:38:33 - 1.1683
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1682 2015/06/24
13:36:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1683 2015/06/24
15:38:33 williamh Exp $
+
+ 24 Jun 2015; William Hubbs willi...@gentoo.org +golang-build.eclass:
+ Add an eclass for building Go software
24 Jun 2015; grkni...@gentoo.org depend.php.eclass:
depend.php.eclass is deprecated and is set to be removed 30 days after bug
1.1 eclass/golang-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.1view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.1content-type=text/plain
Index: golang-build.eclass
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.1 2015/06/24
15:38:33 williamh Exp $
# @ECLASS: golang-build.eclass
# @MAINTAINER:
# William Hubbs willi...@gentoo.org
# @BLURB: Eclass for compiling go packages.
# @DESCRIPTION:
# This eclass provides default src_compile, src_test and src_install
# functions for software written in the Go programming language.
case ${EAPI:-0} in
5)
;;
*)
die ${ECLASS}: Unsupported eapi (EAPI=${EAPI})
;;
esac
EXPORT_FUNCTIONS src_compile src_install src_test
if [[ -z ${_GOLANG_BUILD} ]]; then
_GOLANG_BUILD=1
DEPEND==dev-lang/go-1.4.2:=
STRIP_MASK=*.a
# @ECLASS-VARIABLE: EGO_PN
# @REQUIRED
# @DESCRIPTION:
# This is the import path for the go package(s) to build. Please emerge
# dev-lang/go and read go help importpath for syntax.
#
# Example:
# @CODE
# EGO_PN=github.com/user/package
# @CODE
# @FUNCTION: _golang-build_setup
# @INTERNAL
# @DESCRIPTION:
# Make sure EGO_PN has a value.
_golang-build_setup() {
[ -z ${EGO_PN} ]
die ${ECLASS}.eclass: EGO_PN is not set
return 0
}
golang-build_src_compile() {
debug-print-function ${FUNCNAME} $@
_golang-build_setup
set -- env GOPATH=${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo \
go build -v -work -x ${EGO_PN}
echo $@
$@ || die
}
golang-build_src_install() {
debug-print-function ${FUNCNAME} $@
_golang-build_setup
set -- env GOPATH=${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo \
go install -v -work -x ${EGO_PN}
echo $@
$@ || die
insinto /usr/lib/go-gentoo
insopts -m0644 -p # preserve timestamps for bug 551486
doins -r pkg src
}
golang-build_src_test() {
debug-print-function ${FUNCNAME} $@
_golang-build_setup
set -- env GOPATH=${WORKDIR}/${P}:${EPREFIX}/usr/lib/go-gentoo \
go test -v -work -x ${EGO_PN}
echo $@
$@ || die
}
fi
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-build.eclass
williamh15/06/24 17:04:54
Modified: ChangeLog golang-build.eclass
Log:
Typo fix, use double brackets.
Revision ChangesPath
1.1684 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1684view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1684content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1683r2=1.1684
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1683
retrieving revision 1.1684
diff -u -r1.1683 -r1.1684
--- ChangeLog 24 Jun 2015 15:38:33 - 1.1683
+++ ChangeLog 24 Jun 2015 17:04:53 - 1.1684
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1683 2015/06/24
15:38:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1684 2015/06/24
17:04:53 williamh Exp $
+
+ 24 Jun 2015; William Hubbs willi...@gentoo.org golang-build.eclass:
+ typo fix, use double brackets
24 Jun 2015; William Hubbs willi...@gentoo.org +golang-build.eclass:
Add an eclass for building Go software
1.2 eclass/golang-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-build.eclass?r1=1.1r2=1.2
Index: golang-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- golang-build.eclass 24 Jun 2015 15:38:33 - 1.1
+++ golang-build.eclass 24 Jun 2015 17:04:53 - 1.2
@@ -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/eclass/golang-build.eclass,v 1.1 2015/06/24
15:38:33 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-build.eclass,v 1.2 2015/06/24
17:04:53 williamh Exp $
# @ECLASS: golang-build.eclass
# @MAINTAINER:
@@ -43,7 +43,7 @@
# @DESCRIPTION:
# Make sure EGO_PN has a value.
_golang-build_setup() {
- [ -z ${EGO_PN} ]
+ [[ -z ${EGO_PN} ]]
die ${ECLASS}.eclass: EGO_PN is not set
return 0
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-vcs.eclass
williamh15/06/23 18:59:43
Modified: ChangeLog golang-vcs.eclass
Log:
The GOPATH environment variable is now passed directly to the
commands that need it.
The correct directory of source files is copied to the correct
location under ${S}.
Revision ChangesPath
1.1679 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1679view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1679content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1678r2=1.1679
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1678
retrieving revision 1.1679
diff -u -r1.1678 -r1.1679
--- ChangeLog 22 Jun 2015 14:18:19 - 1.1678
+++ ChangeLog 23 Jun 2015 18:59:43 - 1.1679
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1678 2015/06/22
14:18:19 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1679 2015/06/23
18:59:43 williamh Exp $
+
+ 23 Jun 2015; William Hubbs willi...@gentoo.org golang-vcs.eclass:
+ The GOPATH environment variable is now passed directly to the
+ commands that need it.
+ The correct directory of source files is copied to the correct
+ location under ${S}.
22 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
Introduce qt{4,5}_get_libdir().
1.3 eclass/golang-vcs.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?rev=1.3view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?rev=1.3content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?r1=1.2r2=1.3
Index: golang-vcs.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- golang-vcs.eclass 18 Jun 2015 15:19:04 - 1.2
+++ golang-vcs.eclass 23 Jun 2015 18:59:43 - 1.3
@@ -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/eclass/golang-vcs.eclass,v 1.2 2015/06/18
15:19:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v 1.3 2015/06/23
18:59:43 williamh Exp $
# @ECLASS: golang-vcs.eclass
# @MAINTAINER:
@@ -50,7 +50,7 @@
#
# Example:
# @CODE
-# EGO_PN=github.com/user/repository/package
+# EGO_PN=github.com/user/repository/...
# EGO_SRC=github.com/user/repository
# @CODE
@@ -79,7 +79,7 @@
# @FUNCTION: _golang-vcs_env_setup
# @INTERNAL
# @DESCRIPTION:
-# Create EGO_STORE_DIR if necessary and set GOPATH.
+# Create EGO_STORE_DIR if necessary.
_golang-vcs_env_setup() {
debug-print-function ${FUNCNAME} $@
@@ -96,7 +96,6 @@
fi
addwrite ${EGO_STORE_DIR}
- export GOPATH=${EGO_STORE_DIR}
[[ -n ${EVCS_UMASK} ]] eumask_pop
mkdir -p ${WORKDIR}/${P}/src ||
@@ -118,32 +117,26 @@
[[ -z ${EGO_PN} ]]
die ${ECLASS}: EGO_PN is not set
- if [[ -n ${EVCS_OFFLINE} ]]; then
- export GOPATH=${WORKDIR}/${P}:${GOPATH}
- return 0
- fi
-
- [[ -n ${EVCS_UMASK} ]] eumask_push ${EVCS_UMASK}
+ if [[ -z ${EVCS_OFFLINE} ]]; then
+ [[ -n ${EVCS_UMASK} ]] eumask_push ${EVCS_UMASK}
- set -- go get -d -t -u -v -x ${EGO_PN}
- echo $@
- $@ || die
- # The above dies if you pass repositories in EGO_PN instead of
- # packages, e.g. golang.org/x/tools instead of
golang.org/x/tools/cmd/vet.
- # This is being discussed in the following upstream issue:
- # https://github.com/golang/go/issues/11090
- # I am hoping this will be fixed so go get -d is successful if
- # downloading the top level repository is successful.
+ set -- env GOPATH=${EGO_STORE_DIR} go get -d -t -u -v -x
${EGO_PN}
+ echo $@
+ $@ || die
+ # The above dies if you pass repositories in EGO_PN instead of
+ # packages, e.g. golang.org/x/tools instead of
golang.org/x/tools/cmd/vet.
+ # This is being discussed in the following upstream issue:
+ # https://github.com/golang/go/issues/11090
- [[ -n ${EVCS_UMASK} ]] eumask_pop
- export GOPATH=${WORKDIR}/${P}:${EGO_STORE_DIR}
- set -- mkdir -p ${WORKDIR}/${P}/src/${EGO_SRC}
+ [[ -n ${EVCS_UMASK} ]] eumask_pop
+ fi
+ set -- mkdir -p ${WORKDIR}/${P}/src/${EGO_SRC%/*}
echo $@
- $@ || die Unable to create
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog git-r3.eclass
mrueg 15/06/22 08:39:36
Modified: ChangeLog git-r3.eclass
Log:
Fix typo.
Revision ChangesPath
1.1677 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1677view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1677content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1676r2=1.1677
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1676
retrieving revision 1.1677
diff -u -r1.1676 -r1.1677
--- ChangeLog 19 Jun 2015 14:11:24 - 1.1676
+++ ChangeLog 22 Jun 2015 08:39:36 - 1.1677
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1676 2015/06/19
14:11:24 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1677 2015/06/22
08:39:36 mrueg Exp $
+
+ 22 Jun 2015; Manuel Rüger mr...@gentoo.org git-r3.eclass:
+ Fix typo.
19 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH is
1.49 eclass/git-r3.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.49view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?rev=1.49content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/git-r3.eclass?r1=1.48r2=1.49
Index: git-r3.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- git-r3.eclass 4 Feb 2015 09:44:24 - 1.48
+++ git-r3.eclass 22 Jun 2015 08:39:36 - 1.49
@@ -1,13 +1,13 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.48 2015/02/04
09:44:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/git-r3.eclass,v 1.49 2015/06/22
08:39:36 mrueg Exp $
# @ECLASS: git-r3.eclass
# @MAINTAINER:
# Michał Górny mgo...@gentoo.org
# @BLURB: Eclass for fetching and unpacking git repositories.
# @DESCRIPTION:
-# Third generation eclass for easing maitenance of live ebuilds using
+# Third generation eclass for easing maintenance of live ebuilds using
# git as remote repository.
case ${EAPI:-0} in
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/06/22 14:18:19
Modified: ChangeLog qmake-utils.eclass
Log:
Introduce qt{4,5}_get_libdir().
Revision ChangesPath
1.1678 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1678view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1678content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1677r2=1.1678
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1677
retrieving revision 1.1678
diff -u -r1.1677 -r1.1678
--- ChangeLog 22 Jun 2015 08:39:36 - 1.1677
+++ ChangeLog 22 Jun 2015 14:18:19 - 1.1678
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1677 2015/06/22
08:39:36 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1678 2015/06/22
14:18:19 pesa Exp $
+
+ 22 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
+ Introduce qt{4,5}_get_libdir().
22 Jun 2015; Manuel Rüger mr...@gentoo.org git-r3.eclass:
Fix typo.
1.11 eclass/qmake-utils.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.11view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.11content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.10r2=1.11
Index: qmake-utils.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qmake-utils.eclass 16 Jun 2015 17:47:24 - 1.10
+++ qmake-utils.eclass 22 Jun 2015 14:18:19 - 1.11
@@ -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/eclass/qmake-utils.eclass,v 1.10 2015/06/16
17:47:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.11 2015/06/22
14:18:19 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -25,7 +25,7 @@
qt4_get_bindir() {
has ${EAPI:-0} 0 1 2 use !prefix EPREFIX=
- local qtbindir=${EPREFIX}/usr/$(get_libdir)/qt4/bin
+ local qtbindir=${EPREFIX}$(qt4_get_libdir)/bin
if [[ -d ${qtbindir} ]]; then
echo ${qtbindir}
else
@@ -41,6 +41,14 @@
echo /usr/include/qt4
}
+# @FUNCTION: qt4_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt4 libraries are installed.
+# Does not take EPREFIX into account.
+qt4_get_libdir() {
+ echo /usr/$(get_libdir)/qt4
+}
+
# @FUNCTION: qt4_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt4 mkspecs are installed.
@@ -55,7 +63,7 @@
qt5_get_bindir() {
has ${EAPI:-0} 0 1 2 use !prefix EPREFIX=
- echo ${EPREFIX}/usr/$(get_libdir)/qt5/bin
+ echo ${EPREFIX}$(qt5_get_libdir)/qt5/bin
}
# @FUNCTION: qt5_get_headerdir
@@ -66,12 +74,20 @@
echo /usr/include/qt5
}
+# @FUNCTION: qt5_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt5 libraries are installed.
+# Does not take EPREFIX into account.
+qt5_get_libdir() {
+ echo /usr/$(get_libdir)
+}
+
# @FUNCTION: qt5_get_mkspecsdir
# @DESCRIPTION:
# Echoes the directory where Qt5 mkspecs are installed.
# Does not take EPREFIX into account.
qt5_get_mkspecsdir() {
- echo /usr/$(get_libdir)/qt5/mkspecs
+ echo $(qt5_get_libdir)/qt5/mkspecs
}
# @FUNCTION: qmake-utils_find_pro_file
@@ -233,9 +249,9 @@
QMAKE_LFLAGS=${LDFLAGS} \
QMAKE_LFLAGS_RELEASE= \
QMAKE_LFLAGS_DEBUG= \
- QMAKE_LIBDIR_QT=${EPREFIX}/usr/$(get_libdir)/qt4 \
- QMAKE_LIBDIR_X11=${EPREFIX}/usr/$(get_libdir) \
- QMAKE_LIBDIR_OPENGL=${EPREFIX}/usr/$(get_libdir) \
+ QMAKE_LIBDIR_QT=${EPREFIX}$(qt4_get_libdir) \
+ QMAKE_LIBDIR_X11=${EPREFIX}/usr/$(get_libdir) \
+ QMAKE_LIBDIR_OPENGL=${EPREFIX}/usr/$(get_libdir) \
${qmake_args[@]}
if ! eend $? ; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/06/19 14:11:24
Modified: ChangeLog java-utils-2.eclass
Log:
Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH
is unset.
Revision ChangesPath
1.1676 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1676view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1676content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1675r2=1.1676
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1675
retrieving revision 1.1676
diff -u -r1.1675 -r1.1676
--- ChangeLog 18 Jun 2015 15:19:04 - 1.1675
+++ ChangeLog 19 Jun 2015 14:11:24 - 1.1676
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1675 2015/06/18
15:19:04 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1676 2015/06/19
14:11:24 chewi Exp $
+
+ 19 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Allow EANT_GENTOO_CLASSPATH_EXTRA to work when EANT_GENTOO_CLASSPATH is
+ unset.
18 Jun 2015; William Hubbs willi...@gentoo.org golang-vcs.eclass:
Add the EGO_SRC variable for repositories that contain multiple Go
1.164eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.164view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.164content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.163r2=1.164
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- java-utils-2.eclass 15 Jun 2015 21:09:06 - 1.163
+++ java-utils-2.eclass 19 Jun 2015 14:11:24 - 1.164
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163
2015/06/15 21:09:06 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164
2015/06/19 14:11:24 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -1934,17 +1934,15 @@
local cp
for atom in ${gcp}; do
- cp=${cp}:$(java-pkg_getjars ${getjarsarg} ${atom})
+ cp+=:$(java-pkg_getjars ${getjarsarg} ${atom})
done
- [[ -n ${EANT_NEEDS_TOOLS} ]] cp=${cp}:$(java-config --tools)
+ [[ ${EANT_NEEDS_TOOLS} ]] cp+=:$(java-config --tools)
+ [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]]
cp+=:${EANT_GENTOO_CLASSPATH_EXTRA}
- if [[ ${cp} ]]; then
+ if [[ ${cp#:} ]]; then
# It seems ant does not like single quotes around ${cp}
- cp=${cp#:}
- [[ ${EANT_GENTOO_CLASSPATH_EXTRA} ]] \
- cp=${cp}:${EANT_GENTOO_CLASSPATH_EXTRA}
- antflags=${antflags} -Dgentoo.classpath=\${cp}\
+ antflags=${antflags} -Dgentoo.classpath=\${cp#:}\
fi
[[ -n ${JAVA_PKG_DEBUG} ]] echo ant ${antflags} ${@}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
grknight15/06/18 14:22:59
Modified: ChangeLog depend.php.eclass
Log:
Remove phpconfutils calls in preparation for its deprecation
Revision ChangesPath
1.1674 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1674view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1674content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1673r2=1.1674
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1673
retrieving revision 1.1674
diff -u -r1.1673 -r1.1674
--- ChangeLog 17 Jun 2015 20:11:28 - 1.1673
+++ ChangeLog 18 Jun 2015 14:22:59 - 1.1674
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1673 2015/06/17
20:11:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1674 2015/06/18
14:22:59 grknight Exp $
+
+ 18 Jun 2015; grkni...@gentoo.org depend.php.eclass:
+ Remove phpconfutils calls in preparation for its deprecation
17 Jun 2015; grkni...@gentoo.org depend.php.eclass:
Add require_php_cli to the list of deprecated functions to be removed
1.35 eclass/depend.php.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.35view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.35content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.34r2=1.35
Index: depend.php.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- depend.php.eclass 17 Jun 2015 20:11:28 - 1.34
+++ depend.php.eclass 18 Jun 2015 14:22:59 - 1.35
@@ -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/eclass/depend.php.eclass,v 1.34 2015/06/17
20:11:28 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.35 2015/06/18
14:22:59 grknight Exp $
# @ECLASS: depend.php.eclass
# @MAINTAINER:
@@ -15,7 +15,7 @@
# for specific PHP features, SAPIs etc. Also provides dodoc-php wrapper to
install
# documentation for PHP packages to php-specific location.
-inherit eutils multilib phpconfutils
+inherit eutils multilib
# PHP5-only depend functions
@@ -158,7 +158,7 @@
einfo Checking for compatible SAPI(s)
for x in $@ ; do
- if built_with_use =${PHP_PKG} ${x} ||
phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
+ if built_with_use =${PHP_PKG} ${x} ; then
einfo Discovered compatible SAPI ${x}
has_sapi=1
fi
@@ -219,7 +219,7 @@
;;
esac
- if ! built_with_use =${PHP_PKG} ${x} !
phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
+ if ! built_with_use =${PHP_PKG} ${x} ; then
einfo Discovered missing USE flag: ${x}
missing_use=${missing_use} ${x}
fi
@@ -262,7 +262,7 @@
einfo Checking for required PHP feature(s) ...
for x in $@ ; do
- if built_with_use =${PHP_PKG} ${x} ||
phpconfutils_built_with_use =${PHP_PKG} ${x} ; then
+ if built_with_use =${PHP_PKG} ${x} ; then
einfo USE flag ${x} is enabled, ok ...
return
else
@@ -305,7 +305,7 @@
eqawarn (has_zts) Deprecated function call. Set to be removed on
2015-07-17
has_php
- if built_with_use =${PHP_PKG} apache2 threads ||
phpconfutils_built_with_use =${PHP_PKG} apache2 threads ; then
+ if built_with_use =${PHP_PKG} apache2 threads ; then
return 0
fi
@@ -320,7 +320,7 @@
eqawarn (has_debug) Deprecated function call. Set to be removed on
2015-07-17
has_php
- if built_with_use =${PHP_PKG} debug || phpconfutils_built_with_use
=${PHP_PKG} debug ; then
+ if built_with_use =${PHP_PKG} debug ; then
return 0
fi
@@ -335,7 +335,7 @@
eqawarn (has_concurrentmodphp) Deprecated function call. Set to be
removed on 2015-07-17
has_php
- if built_with_use =${PHP_PKG} apache2 concurrentmodphp ||
phpconfutils_built_with_use =${PHP_PKG} apache2 concurrentmodphp ; then
+ if built_with_use =${PHP_PKG} apache2 concurrentmodphp ; then
return 0
fi
@@ -360,7 +360,7 @@
has_php
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-vcs.eclass
williamh15/06/18 15:19:04
Modified: ChangeLog golang-vcs.eclass
Log:
golang-vcs.eclass:
Add the EGO_SRC variable for repositories that contain multiple Go
packages.
Change references from ${S} to ${WORKDIR}/${P} to match other eclasses.
Copy the appropriate sources to${WORKDIR}/${P}.
Revision ChangesPath
1.1675 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1675view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1675content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1674r2=1.1675
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1674
retrieving revision 1.1675
diff -u -r1.1674 -r1.1675
--- ChangeLog 18 Jun 2015 14:22:59 - 1.1674
+++ ChangeLog 18 Jun 2015 15:19:04 - 1.1675
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1674 2015/06/18
14:22:59 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1675 2015/06/18
15:19:04 williamh Exp $
+
+ 18 Jun 2015; William Hubbs willi...@gentoo.org golang-vcs.eclass:
+ Add the EGO_SRC variable for repositories that contain multiple Go
+ packages.
+ Change references from ${S} to ${WORKDIR}/${P} to match other eclasses.
+ Copy the appropriate sources to${WORKDIR}/${P}.
18 Jun 2015; grkni...@gentoo.org depend.php.eclass:
Remove phpconfutils calls in preparation for its deprecation
1.2 eclass/golang-vcs.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?r1=1.1r2=1.2
Index: golang-vcs.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- golang-vcs.eclass 16 Jun 2015 21:40:51 - 1.1
+++ golang-vcs.eclass 18 Jun 2015 15:19:04 - 1.2
@@ -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/eclass/golang-vcs.eclass,v 1.1 2015/06/16
21:40:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v 1.2 2015/06/18
15:19:04 williamh Exp $
# @ECLASS: golang-vcs.eclass
# @MAINTAINER:
@@ -40,6 +40,20 @@
# EGO_PN=github.com/user1/package1 github.com/user2/package2
# @CODE
+# @ECLASS-VARIABLE: EGO_SRC
+# @DESCRIPTION:
+# This is the Go upstream repository which will be copied to
+# ${WORKDIR}/${P}.
+# If it isn't set, it defaults to the first word of ${EGO_PN}.
+# This should be set if you are retrieving a repository that includes
+# multiple packages, e.g. golang.org/x/tools.
+#
+# Example:
+# @CODE
+# EGO_PN=github.com/user/repository/package
+# EGO_SRC=github.com/user/repository
+# @CODE
+
# @ECLASS-VARIABLE: EGO_STORE_DIR
# @DESCRIPTION:
# Storage directory for Go sources.
@@ -85,8 +99,12 @@
export GOPATH=${EGO_STORE_DIR}
[[ -n ${EVCS_UMASK} ]] eumask_pop
- mkdir -p ${S} ||
- die ${ECLASS}: unable to create ${S}
+ mkdir -p ${WORKDIR}/${P}/src ||
+ die ${ECLASS}: unable to create ${WORKDIR}/${P}
+ if [ -z ${EGO_SRC} ]; then
+ set -- ${EGO_PN}
+ EGO_SRC=$1
+ fi
return 0
}
@@ -101,7 +119,7 @@
die ${ECLASS}: EGO_PN is not set
if [[ -n ${EVCS_OFFLINE} ]]; then
- export GOPATH=${S}:${GOPATH}
+ export GOPATH=${WORKDIR}/${P}:${GOPATH}
return 0
fi
@@ -118,7 +136,14 @@
# downloading the top level repository is successful.
[[ -n ${EVCS_UMASK} ]] eumask_pop
- export GOPATH=${S}:${EGO_STORE_DIR}
+ export GOPATH=${WORKDIR}/${P}:${EGO_STORE_DIR}
+ set -- mkdir -p ${WORKDIR}/${P}/src/${EGO_SRC}
+ echo $@
+ $@ || die Unable to create ${WORKDIR}/${P}/src/${EGO_SRC}
+ set -- cp -r ${EGO_STORE_DIR}/src/${EGO_SRC}/* \
+ ${WORKDIR}/${P}/src/${EGO_SRC}
+ echo $@
+ $@ || die Unable to copy sources to ${WORKDIR}/${P}
return 0
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog php-common-r1.eclass php-ext-base-r1.eclass php-ezc.eclass
grknight15/06/17 19:23:34 Modified: ChangeLog php-common-r1.eclass php-ext-base-r1.eclass php-ezc.eclass Log: Mark 3 eclasses as deprecated for removal on 2015-07-17 wrt bug 551910; Fix missing ChangeLog entry for previous commit Revision ChangesPath 1.1672 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1672view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1672content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1671r2=1.1672 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1671 retrieving revision 1.1672 diff -u -r1.1671 -r1.1672 --- ChangeLog 17 Jun 2015 15:48:58 - 1.1671 +++ ChangeLog 17 Jun 2015 19:23:34 - 1.1672 @@ -1,6 +1,13 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1671 2015/06/17 15:48:58 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1672 2015/06/17 19:23:34 grknight Exp $ + + 17 Jun 2015; grkni...@gentoo.org php-common-r1.eclass, + php-ext-base-r1.eclass, php-ezc.eclass: + Mark 3 eclasses as deprecated for removal on 2015-07-17 wrt bug 551910 + + 17 Jun 2015; grkni...@gentoo.org depend.php.eclass + Deprecate unused functions in depend.php.eclass 17 Jun 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass: Update from qt overlay: allow configuring debug/release on a per-package 1.20 eclass/php-common-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-common-r1.eclass?rev=1.20view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-common-r1.eclass?rev=1.20content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-common-r1.eclass?r1=1.19r2=1.20 Index: php-common-r1.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- php-common-r1.eclass28 Apr 2013 16:15:33 - 1.19 +++ php-common-r1.eclass17 Jun 2015 19:23:34 - 1.20 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.19 2013/04/28 16:15:33 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-common-r1.eclass,v 1.20 2015/06/17 19:23:34 grknight Exp $ # Based on robbat2's work on the php4 sapi eclass # Based on stuart's work on the php5 sapi eclass @@ -13,7 +13,8 @@ # This eclass provides common functions which are shared between the PHP4 and PHP5 packages. # It is only used by php*-sapi eclasses currently and the functions are not intended # for direct use in ebuilds. - +# This eclass is no longer in use and scheduled to be removed on 2015-07-17 +# @DEAD # # CFLAG SANITY 1.18 eclass/php-ext-base-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-base-r1.eclass?rev=1.18view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-base-r1.eclass?rev=1.18content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ext-base-r1.eclass?r1=1.17r2=1.18 Index: php-ext-base-r1.eclass === RCS file: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- php-ext-base-r1.eclass 22 Aug 2011 04:46:32 - 1.17 +++ php-ext-base-r1.eclass 17 Jun 2015 19:23:34 - 1.18 @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.17 2011/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-base-r1.eclass,v 1.18 2015/06/17 19:23:34 grknight Exp $ # @ECLASS: php-ext-base-r1.eclass # @MAINTAINER: @@ -17,6 +17,8 @@ # # Combined with php-ext-source-r1, we have a standardised solution for supporting # PHP extensions. +# This eclass is no longer in use and scheduled to be removed on 2015-07-17 +# @DEAD # Block ebuilds with minor version slotting. Quite temporary fix DEPEND=!=dev-lang/php-5.3.3-r2 1.8 eclass/php-ezc.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/php-ezc.eclass?rev=1.8view=markup plain:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog depend.php.eclass
grknight15/06/17 20:11:28
Modified: ChangeLog depend.php.eclass
Log:
Add require_php_cli to the list of deprecated functions to be removed from
depend.php.eclass
Revision ChangesPath
1.1673 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1673view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1673content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1672r2=1.1673
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1672
retrieving revision 1.1673
diff -u -r1.1672 -r1.1673
--- ChangeLog 17 Jun 2015 19:23:34 - 1.1672
+++ ChangeLog 17 Jun 2015 20:11:28 - 1.1673
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1672 2015/06/17
19:23:34 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1673 2015/06/17
20:11:28 grknight Exp $
+
+ 17 Jun 2015; grkni...@gentoo.org depend.php.eclass:
+ Add require_php_cli to the list of deprecated functions to be removed
17 Jun 2015; grkni...@gentoo.org php-common-r1.eclass,
php-ext-base-r1.eclass, php-ezc.eclass:
1.34 eclass/depend.php.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.34view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?rev=1.34content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/depend.php.eclass?r1=1.33r2=1.34
Index: depend.php.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- depend.php.eclass 17 Jun 2015 18:54:44 - 1.33
+++ depend.php.eclass 17 Jun 2015 20:11:28 - 1.34
@@ -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/eclass/depend.php.eclass,v 1.33 2015/06/17
18:54:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.34 2015/06/17
20:11:28 grknight Exp $
# @ECLASS: depend.php.eclass
# @MAINTAINER:
@@ -380,6 +380,7 @@
# depending on the CLI SAPI.
# @RETURN: die if feature is missing
require_php_cli() {
+ eqawarn (require_php_cli) Deprecated function call. Set to be removed
on 2015-07-17
# If PHP_PKG is set, then we have remembered our PHP settings
# from last time
if [[ -n ${PHP_PKG} ]] ; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-2.eclass
chewi 15/06/17 09:48:12
Modified: ChangeLog java-pkg-2.eclass
Log:
Remove eclass dependency on python[xml] and replace with some ugly
grep that should suffice. Closes #552332.
Revision ChangesPath
1.1670 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1670view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1670content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1669r2=1.1670
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1669
retrieving revision 1.1670
diff -u -r1.1669 -r1.1670
--- ChangeLog 16 Jun 2015 21:40:51 - 1.1669
+++ ChangeLog 17 Jun 2015 09:48:12 - 1.1670
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1669 2015/06/16
21:40:51 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1670 2015/06/17
09:48:12 chewi Exp $
+
+ 17 Jun 2015; James Le Cuirot ch...@gentoo.org java-pkg-2.eclass:
+ Remove eclass dependency on python[xml] and replace with some ugly grep that
+ should suffice. Closes #552332.
16 Jun 2015; William Hubbs willi...@gentoo.org +golang-vcs.eclass:
Add golang-vcs.eclass to retrieve go packages from vcs repositories
1.41 eclass/java-pkg-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.41view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?rev=1.41content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-2.eclass?r1=1.40r2=1.41
Index: java-pkg-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- java-pkg-2.eclass 28 Apr 2015 20:35:40 - 1.40
+++ java-pkg-2.eclass 17 Jun 2015 09:48:12 - 1.41
@@ -5,7 +5,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.40 2015/04/28
20:35:40 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-2.eclass,v 1.41 2015/06/17
09:48:12 chewi Exp $
# @ECLASS: java-pkg-2.eclass
# @MAINTAINER:
@@ -96,25 +96,6 @@
fi
}
-
-# @FUNCTION: java-pkg-2_supports-test
-# @INTERNAL
-# @DESCRIPTION:
-# test whether a build.xml has a test target.
-
-java-pkg-2_supports-test() {
- python EOF
-from xml.dom.minidom import parse
-import sys
-dom = parse(${1})
-for elem in dom.getElementsByTagName('target'):
- if elem.getAttribute('name') == 'test':
- sys.exit(0)
-sys.exit(1)
-EOF
- return $?
-}
-
# @FUNCTION: java-pkg-2_src_test
# @DESCRIPTION:
# src_test, not exported.
@@ -122,7 +103,7 @@
java-pkg-2_src_test() {
[[ -e ${EANT_BUILD_XML:=build.xml} ]] || return
- if [[ ${EANT_TEST_TARGET} ]] || java-pkg-2_supports-test
${EANT_BUILD_XML}; then
+ if [[ ${EANT_TEST_TARGET} ]] || ${EANT_BUILD_XML} tr -d \n | grep
-Eq target\b[^]*\bname=[\']test[\']; then
local opts task_re junit_re pkg
if [[ ${EANT_TEST_JUNIT_INTO} ]]; then
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt5-build.eclass
pesa15/06/17 15:48:58
Modified: ChangeLog qt5-build.eclass
Log:
Update from qt overlay: allow configuring debug/release on a per-package
basis; add instruction set support (similarly to qt4-build-multilib); use
usex().
Revision ChangesPath
1.1671 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1671view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1671content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1670r2=1.1671
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1670
retrieving revision 1.1671
diff -u -r1.1670 -r1.1671
--- ChangeLog 17 Jun 2015 09:48:12 - 1.1670
+++ ChangeLog 17 Jun 2015 15:48:58 - 1.1671
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1670 2015/06/17
09:48:12 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1671 2015/06/17
15:48:58 pesa Exp $
+
+ 17 Jun 2015; Davide Pesavento p...@gentoo.org qt5-build.eclass:
+ Update from qt overlay: allow configuring debug/release on a per-package
+ basis; add instruction set support (similarly to qt4-build-multilib); use
+ usex().
17 Jun 2015; James Le Cuirot ch...@gentoo.org java-pkg-2.eclass:
Remove eclass dependency on python[xml] and replace with some ugly grep that
1.20 eclass/qt5-build.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.20view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.20content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.19r2=1.20
Index: qt5-build.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt5-build.eclass9 Jun 2015 20:16:59 - 1.19
+++ qt5-build.eclass17 Jun 2015 15:48:58 - 1.20
@@ -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/eclass/qt5-build.eclass,v 1.19 2015/06/09
20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.20 2015/06/17
15:48:58 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -39,19 +39,19 @@
EGIT_BRANCH=dev
;;
5.?.)
- # git stable branches (5.x)
+ # git stable branch
QT5_BUILD_TYPE=live
EGIT_BRANCH=${PV%.}
;;
*_alpha*|*_beta*|*_rc*)
- # development releases
+ # development release
QT5_BUILD_TYPE=release
MY_P=${QT5_MODULE}-opensource-src-${PV/_/-}
SRC_URI=http://download.qt.io/development_releases/qt/${PV%.*}/${PV/_/-}/submodules/${MY_P}.tar.xz;
S=${WORKDIR}/${MY_P}
;;
*)
- # official stable releases
+ # official stable release
QT5_BUILD_TYPE=release
MY_P=${QT5_MODULE}-opensource-src-${PV}
SRC_URI=http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${MY_P}.tar.xz;
@@ -77,9 +77,9 @@
if [[ ${PN} != qttest ]]; then
if [[ ${QT5_MODULE} == qtbase ]]; then
- DEPEND+= test? ( ~dev-qt/qttest-${PV}[debug=] )
+ DEPEND+= test? ( ~dev-qt/qttest-${PV} )
else
- DEPEND+= test? ( =dev-qt/qttest-${PV}:5[debug=] )
+ DEPEND+= test? ( =dev-qt/qttest-${PV}:5 )
fi
fi
RDEPEND=
@@ -321,18 +321,17 @@
## Public helpers ##
# @FUNCTION: qt_use
-# @USAGE: flag [feature] [enableopt]
+# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
# flag is the name of a flag in IUSE.
#
-# Echoes -${enableopt}-${feature} if flag is enabled, or -no-${feature}
-# if it is disabled. If [feature] is not specified, it defaults to the value
-# of flag. If [enableopt] is not specified, the whole -${enableopt} prefix
-# is omitted.
+# Outputs -${enableval}-${feature} if flag is enabled, -no-${feature}
+# otherwise. If [feature] is not specified, flag is used in its place.
+# If [enableval] is not specified, the -${enableval} prefix is omitted.
qt_use() {
[[ $# -ge 1 ]] || die ${FUNCNAME}() requires at least one argument
- use $1 echo ${3:+-$3}-${2:-$1} || echo -no-${2:-$1}
+ usex $1 ${3:+-$3}-${2:-$1} -no-${2:-$1}
}
# @FUNCTION: qt_use_compile_test
@@ -490,8 +489,9 @@
-examplesdir
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/16 17:49:13
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Drop QT4_VERBOSE_BUILD variable (always true now).
Revision ChangesPath
1.1667 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1667view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1667content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1666r2=1.1667
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1666
retrieving revision 1.1667
diff -u -r1.1666 -r1.1667
--- ChangeLog 16 Jun 2015 17:47:24 - 1.1666
+++ ChangeLog 16 Jun 2015 17:49:13 - 1.1667
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1666 2015/06/16
17:47:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1667 2015/06/16
17:49:13 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Drop QT4_VERBOSE_BUILD variable (always true now).
16 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
Use use_if_iuse().
1.27 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.27view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.27content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.26r2=1.27
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4-build-multilib.eclass 13 Jun 2015 23:05:46 - 1.26
+++ qt4-build-multilib.eclass 16 Jun 2015 17:49:13 - 1.27
@@ -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/eclass/qt4-build-multilib.eclass,v 1.26
2015/06/13 23:05:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.27
2015/06/16 17:49:13 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -88,11 +88,6 @@
# Space-separated list of directories that will be configured,
# compiled, and installed. All paths must be relative to ${S}.
-# @ECLASS-VARIABLE: QT4_VERBOSE_BUILD
-# @DESCRIPTION:
-# Set to false to reduce build output during compilation.
-: ${QT4_VERBOSE_BUILD:=true}
-
# @ECLASS-VARIABLE: QCONFIG_ADD
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -381,8 +376,8 @@
# disable rpath on non-prefix (bugs 380415 and 417169)
$(usex prefix '' -no-rpath)
- # verbosity of the configure and build phases
- -verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
+ # print verbose information about each configure test
+ -verbose
# precompiled headers don't work on hardened, where the flag is
masked
$(in_iuse pch qt_use pch || echo -no-pch)
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qmake-utils.eclass
pesa15/06/16 17:47:24
Modified: ChangeLog qmake-utils.eclass
Log:
Use use_if_iuse().
Revision ChangesPath
1.1666 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1666content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1665r2=1.1666
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1665
retrieving revision 1.1666
diff -u -r1.1665 -r1.1666
--- ChangeLog 15 Jun 2015 21:09:06 - 1.1665
+++ ChangeLog 16 Jun 2015 17:47:24 - 1.1666
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1665 2015/06/15
21:09:06 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1666 2015/06/16
17:47:24 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento p...@gentoo.org qmake-utils.eclass:
+ Use use_if_iuse().
15 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
Add java-pkg_addres function for adding resource files to an existing jar.
1.10 eclass/qmake-utils.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?rev=1.10content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qmake-utils.eclass?r1=1.9r2=1.10
Index: qmake-utils.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qmake-utils.eclass 31 May 2015 12:51:07 - 1.9
+++ qmake-utils.eclass 16 Jun 2015 17:47:24 - 1.10
@@ -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/eclass/qmake-utils.eclass,v 1.9 2015/05/31
12:51:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qmake-utils.eclass,v 1.10 2015/06/16
17:47:24 pesa Exp $
# @ECLASS: qmake-utils.eclass
# @MAINTAINER:
@@ -141,14 +141,13 @@
local qmake_args=($@)
- # check if project file was passed as a first argument
- # if not, then search for it
+ # Check if the project file name was passed as first argument. If not,
look for candidates.
local regexp='.*\.pro'
if ! [[ ${1} =~ ${regexp} ]]; then
local project_file=$(qmake-utils_find_pro_file)
if [[ -z ${project_file} ]]; then
echo
- eerror No project files found in '${PWD}'!
+ eerror No project files found in '${PWD}'
eerror This shouldn't happen - please send a bug
report to https://bugs.gentoo.org/;
echo
die eqmake4 failed
@@ -156,13 +155,12 @@
qmake_args+=(${project_file})
fi
- # make sure CONFIG variable is correctly set
- # for both release and debug builds
- local config_add=release
- local config_remove=debug
- if has debug ${IUSE} use debug; then
- config_add=debug
- config_remove=release
+ # Make sure the CONFIG variable is correctly set for both release and
debug builds.
+ local config_add=release
+ local config_remove=debug
+ if use_if_iuse debug; then
+ config_add=debug
+ config_remove=release
fi
local awkscript='BEGIN {
@@ -240,7 +238,6 @@
QMAKE_LIBDIR_OPENGL=${EPREFIX}/usr/$(get_libdir) \
${qmake_args[@]}
- # was qmake successful?
if ! eend $? ; then
echo
eerror Running qmake has failed! (see above for details)
@@ -288,7 +285,6 @@
QMAKE_LFLAGS_DEBUG= \
$@
- # was qmake successful?
if ! eend $? ; then
echo
eerror Running qmake has failed! (see above for details)
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/16 21:38:00
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Minor changes to reduce diff with qt5-build.eclass
Revision ChangesPath
1.1668 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1668view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1668content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1667r2=1.1668
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1667
retrieving revision 1.1668
diff -u -r1.1667 -r1.1668
--- ChangeLog 16 Jun 2015 17:49:13 - 1.1667
+++ ChangeLog 16 Jun 2015 21:38:00 - 1.1668
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1667 2015/06/16
17:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1668 2015/06/16
21:38:00 pesa Exp $
+
+ 16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Minor changes to reduce diff with qt5-build.eclass
16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Drop QT4_VERBOSE_BUILD variable (always true now).
1.28 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.28view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.28content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.27r2=1.28
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- qt4-build-multilib.eclass 16 Jun 2015 17:49:13 - 1.27
+++ qt4-build-multilib.eclass 16 Jun 2015 21:38:00 - 1.28
@@ -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/eclass/qt4-build-multilib.eclass,v 1.27
2015/06/16 17:49:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.28
2015/06/16 21:38:00 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -25,16 +25,12 @@
case ${PV} in
4.?.)
+ # git stable branch
QT4_BUILD_TYPE=live
- EGIT_REPO_URI=(
- git://code.qt.io/qt/qt.git
- https://code.qt.io/git/qt/qt.git;
- https://github.com/qtproject/qt.git;
- )
EGIT_BRANCH=${PV%.}
- inherit git-r3
;;
*)
+ # official stable release
QT4_BUILD_TYPE=release
MY_P=qt-everywhere-opensource-src-${PV/_/-}
SRC_URI=http://download.qt.io/official_releases/qt/${PV%.*}/${PV}/${MY_P}.tar.gz;
@@ -42,6 +38,13 @@
;;
esac
+EGIT_REPO_URI=(
+ git://code.qt.io/qt/qt.git
+ https://code.qt.io/git/qt/qt.git;
+ https://github.com/qtproject/qt.git;
+)
+[[ ${QT4_BUILD_TYPE} == live ]] inherit git-r3
+
if [[ ${PN} != qttranslations ]]; then
IUSE=aqua debug pch
[[ ${PN} != qtxmlpatterns ]] IUSE+= +exceptions
@@ -507,21 +510,19 @@
find ${S}/src/${moduledir} -type f -name '*_p.h' -exec doins
'{}' + || die
fi
- # remove .la files since we are building only shared libraries
prune_libtool_files
}
# @FUNCTION: qt4-build-multilib_pkg_postinst
# @DESCRIPTION:
-# Regenerate configuration, plus throw a message about possible
-# breakages and proposed solutions.
+# Regenerate configuration after installation or upgrade/downgrade.
qt4-build-multilib_pkg_postinst() {
qt4_regenerate_global_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
-# Regenerate configuration when the package is completely removed.
+# Regenerate configuration when a module is completely removed.
qt4-build-multilib_pkg_postrm() {
qt4_regenerate_global_qconfigs
}
@@ -590,16 +591,19 @@
# @DESCRIPTION:
# Executes the given command inside each directory listed in
QT4_TARGET_DIRECTORIES.
qt4_foreach_target_subdir() {
- local subdir
+ local ret=0 subdir=
for subdir in ${QT4_TARGET_DIRECTORIES}; do
mkdir -p ${subdir} || die
pushd ${subdir} /dev/null || die
einfo Running $* ${subdir:+in ${subdir}}
$@
+ ((ret+=$?))
popd /dev/null || die
done
+
+ return ${ret}
}
#
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog golang-vcs.eclass
williamh15/06/16 21:40:51
Modified: ChangeLog
Added:golang-vcs.eclass
Log:
Add golang-vcs.eclass to retrieve go packages from vcs repositories for
software written in the Go programming language
Revision ChangesPath
1.1669 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1669view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1669content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1668r2=1.1669
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1668
retrieving revision 1.1669
diff -u -r1.1668 -r1.1669
--- ChangeLog 16 Jun 2015 21:38:00 - 1.1668
+++ ChangeLog 16 Jun 2015 21:40:51 - 1.1669
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1668 2015/06/16
21:38:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1669 2015/06/16
21:40:51 williamh Exp $
+
+ 16 Jun 2015; William Hubbs willi...@gentoo.org +golang-vcs.eclass:
+ Add golang-vcs.eclass to retrieve go packages from vcs repositories
+ for live ebuilds of software written in the Go programming language.
16 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Minor changes to reduce diff with qt5-build.eclass
1.1 eclass/golang-vcs.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?rev=1.1view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/golang-vcs.eclass?rev=1.1content-type=text/plain
Index: golang-vcs.eclass
===
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/golang-vcs.eclass,v 1.1 2015/06/16
21:40:51 williamh Exp $
# @ECLASS: golang-vcs.eclass
# @MAINTAINER:
# William Hubbs willi...@gentoo.org
# @BLURB: Eclass for fetching and unpacking go repositories.
# @DESCRIPTION:
# This eclass is written to ease the maintenance of live ebuilds
# of software written in the Go programming language.
inherit eutils
case ${EAPI:-0} in
5)
;;
*)
die ${ECLASS}: Unsupported eapi (EAPI=${EAPI})
;;
esac
EXPORT_FUNCTIONS src_unpack
if [[ -z ${_GOLANG_VCS} ]]; then
_GOLANG_VCS=1
DEPEND==dev-lang/go-1.4.2
# @ECLASS-VARIABLE: EGO_PN
# @REQUIRED
# @DESCRIPTION:
# This is the import path for the go package(s). Please emerge dev-lang/go
# and read go help importpath for syntax.
#
# Example:
# @CODE
# EGO_PN=github.com/user/package
# EGO_PN=github.com/user1/package1 github.com/user2/package2
# @CODE
# @ECLASS-VARIABLE: EGO_STORE_DIR
# @DESCRIPTION:
# Storage directory for Go sources.
#
# This is intended to be set by the user in make.conf. Ebuilds must not set
# it.
#
# EGO_STORE_DIR=${DISTDIR}/go-src
# @ECLASS-VARIABLE: EVCS_OFFLINE
# @DEFAULT_UNSET
# @DESCRIPTION:
# If non-empty, this variable prevents any online operations.
# @ECLASS-VARIABLE: EVCS_UMASK
# @DEFAULT_UNSET
# @DESCRIPTION:
# Set this variable to a custom umask. This is intended to be set by
# users. By setting this to something like 002, it can make life easier
# for people who do development as non-root (but are in the portage
# group) and use FEATURES=userpriv.
# @FUNCTION: _golang-vcs_env_setup
# @INTERNAL
# @DESCRIPTION:
# Create EGO_STORE_DIR if necessary and set GOPATH.
_golang-vcs_env_setup() {
debug-print-function ${FUNCNAME} $@
local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}
: ${EGO_STORE_DIR:=${distdir}/go-src}
[[ -n ${EVCS_UMASK} ]] eumask_push $EVCS_UMASK
if [[ ! -d ${EGO_STORE_DIR} ]]; then
(
addwrite /
mkdir -p ${EGO_STORE_DIR}
) || die ${ECLASS}: unable to create ${EGO_STORE_DIR}
fi
addwrite ${EGO_STORE_DIR}
export GOPATH=${EGO_STORE_DIR}
[[ -n ${EVCS_UMASK} ]] eumask_pop
mkdir -p ${S} ||
die ${ECLASS}: unable to create ${S}
return 0
}
# @FUNCTION: _golang-vcs_fetch
# @INTERNAL
# @DESCRIPTION:
# Retrieve the EGO_PN go package along with its dependencies.
_golang-vcs_fetch() {
debug-print-function ${FUNCNAME} $@
[[ -z ${EGO_PN} ]]
die ${ECLASS}: EGO_PN is not set
if [[ -n ${EVCS_OFFLINE} ]]; then
export GOPATH=${S}:${GOPATH}
return 0
fi
[[ -n ${EVCS_UMASK} ]] eumask_push ${EVCS_UMASK}
set -- go get -d -t -u -v -x ${EGO_PN}
echo $@
$@ || die
# The above dies if you
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kde4-base.eclass
kensington15/06/15 14:04:44
Modified: ChangeLog kde4-base.eclass
Log:
Fix SRC_URI for 4.14.3
Revision ChangesPath
1.1663 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1663view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1663content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1662r2=1.1663
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1662
retrieving revision 1.1663
diff -u -r1.1662 -r1.1663
--- ChangeLog 13 Jun 2015 22:57:59 - 1.1662
+++ ChangeLog 15 Jun 2015 14:04:44 - 1.1663
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1662 2015/06/13
22:57:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1663 2015/06/15
14:04:44 kensington Exp $
+
+ 15 Jun 2015; Michael Palimaka kensing...@gentoo.org kde4-base.eclass:
+ Fix SRC_URI for 4.14.3
13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Export MAKEFLAGS and OBJDUMP.
1.156eclass/kde4-base.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.156view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.156content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.155r2=1.156
Index: kde4-base.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- kde4-base.eclass4 Jun 2015 18:49:42 - 1.155
+++ kde4-base.eclass15 Jun 2015 14:04:44 - 1.156
@@ -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/eclass/kde4-base.eclass,v 1.155 2015/06/04
18:49:42 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.156 2015/06/15
14:04:44 kensington Exp $
# @ECLASS: kde4-base.eclass
# @MAINTAINER:
@@ -448,6 +448,9 @@
4.11.20)
# Part of 15.04.2 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/15.04.2/src/${_kmname_pv}.tar.xz ;;
+ 4.14.3)
+ # Last SC release
+
SRC_URI=mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz ;;
4.14.6)
# Part of 14.12.3 actually, sigh. Not
stable for next release!
SRC_URI=mirror://kde/stable/applications/14.12.3/src/${_kmname_pv}.tar.xz ;;
@@ -464,13 +467,8 @@
# Unstable KDE Applications releases
SRC_URI=mirror://kde/unstable/applications/${PV}/src/${_kmname}-${PV}.tar.xz
;;
*)
- if [[ ${CATEGORY} == kde-apps ]]; then
- # Stable KDE Applications
releases
-
SRC_URI=mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz
- else
- # Stable KDE SC releases
-
SRC_URI=mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.xz
- fi
+ # Stable KDE Applications releases
+
SRC_URI=mirror://kde/stable/applications/${PV}/src/${_kmname}-${PV}.tar.xz
;;
esac
;;
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog intel-sdp.eclass
jlec15/06/15 19:09:28
Modified: ChangeLog intel-sdp.eclass
Log:
Don't install uninstall informations, bug 551638; make use of path_exists()
Revision ChangesPath
1.1664 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1664view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1664content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1663r2=1.1664
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1663
retrieving revision 1.1664
diff -u -r1.1663 -r1.1664
--- ChangeLog 15 Jun 2015 14:04:44 - 1.1663
+++ ChangeLog 15 Jun 2015 19:09:28 - 1.1664
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1663 2015/06/15
14:04:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1664 2015/06/15
19:09:28 jlec Exp $
+
+ 15 Jun 2015; Justin Lecher j...@gentoo.org intel-sdp.eclass:
+ Don't install uninstall informations, bug 551638; make use of path_exists()
15 Jun 2015; Michael Palimaka kensing...@gentoo.org kde4-base.eclass:
Fix SRC_URI for 4.14.3
1.22 eclass/intel-sdp.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.22view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?rev=1.22content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/intel-sdp.eclass?r1=1.21r2=1.22
Index: intel-sdp.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- intel-sdp.eclass4 Jun 2015 10:36:27 - 1.21
+++ intel-sdp.eclass15 Jun 2015 19:09:28 - 1.22
@@ -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/eclass/intel-sdp.eclass,v 1.21 2015/06/04
10:36:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/intel-sdp.eclass,v 1.22 2015/06/15
19:09:28 jlec Exp $
# @ECLASS: intel-sdp.eclass
# @MAINTAINER:
@@ -416,7 +416,13 @@
# @DESCRIPTION:
# Install everything
intel-sdp_src_install() {
- if [[ -d ${INTEL_SDP_DIR}/Documentation ]]; then
+ if path_exists ${INTEL_SDP_DIR}/uninstall*; then
+ ebegin Cleaning out uninstall information
+ find ${INTEL_SDP_DIR}/uninstall* -delete || die
+ eend
+ fi
+
+ if path_exists ${INTEL_SDP_DIR}/Documentation; then
dodoc -r ${INTEL_SDP_DIR}/Documentation/*
ebegin Cleaning out documentation
@@ -424,7 +430,7 @@
eend
fi
- if [[ -d ${INTEL_SDP_DIR}/Samples ]]; then
+ if path_exists ${INTEL_SDP_DIR}/Samples; then
if use examples ; then
insinto /usr/share/${P}/examples/
doins -r ${INTEL_SDP_DIR}/Samples/*
@@ -434,7 +440,7 @@
eend
fi
- if [[ -d ${INTEL_SDP_DIR}/eclipse_support ]]; then
+ if path_exists ${INTEL_SDP_DIR}/eclipse_support; then
if has eclipse ${IUSE} use eclipse; then
_isdp_link_eclipse_plugins
else
@@ -444,7 +450,7 @@
fi
fi
- if [[ -d ${INTEL_SDP_DIR}/man ]]; then
+ if path_exists ${INTEL_SDP_DIR}/man; then
path_exists ${INTEL_SDP_DIR}/man/en_US/man1/* \
doman ${INTEL_SDP_DIR}/man/en_US/man1/*
path_exists ${INTEL_SDP_DIR}/man/man1/* \
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-utils-2.eclass
chewi 15/06/15 21:09:06
Modified: ChangeLog java-utils-2.eclass
Log:
Add java-pkg_addres function for adding resource files to an existing
jar.
Revision ChangesPath
1.1665 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1665view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1665content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1664r2=1.1665
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1664
retrieving revision 1.1665
diff -u -r1.1664 -r1.1665
--- ChangeLog 15 Jun 2015 19:09:28 - 1.1664
+++ ChangeLog 15 Jun 2015 21:09:06 - 1.1665
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1664 2015/06/15
19:09:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1665 2015/06/15
21:09:06 chewi Exp $
+
+ 15 Jun 2015; James Le Cuirot ch...@gentoo.org java-utils-2.eclass:
+ Add java-pkg_addres function for adding resource files to an existing jar.
15 Jun 2015; Justin Lecher j...@gentoo.org intel-sdp.eclass:
Don't install uninstall informations, bug 551638; make use of path_exists()
1.163eclass/java-utils-2.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.163view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.163content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.162r2=1.163
Index: java-utils-2.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- java-utils-2.eclass 24 May 2015 22:44:37 - 1.162
+++ java-utils-2.eclass 15 Jun 2015 21:09:06 - 1.163
@@ -6,7 +6,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.162
2015/05/24 22:44:37 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.163
2015/06/15 21:09:06 chewi Exp $
# @ECLASS: java-utils-2.eclass
# @MAINTAINER:
@@ -217,6 +217,37 @@
dosym ${dest} ${JAVA_PKG_SHAREPATH}/examples || die
}
+# @FUNCTION: java-pkg_addres
+# @USAGE: jar dir [find arguments ...]
+# @DESCRIPTION:
+# Adds resource files to an existing jar.
+# It is important that the directory given is actually the root of the
+# corresponding resource tree. The target directory as well as
+# sources.lst, MANIFEST.MF, *.class, *.jar, and *.java files are
+# automatically excluded. Symlinks are always followed. Additional
+# arguments are passed through to find.
+#
+# @CODE
+# java-pkg_addres ${PN}.jar resources ! -name *.html
+# @CODE
+#
+# @param $1 - jar file
+# @param $2 - resource tree directory
+# @param $* - arguments to pass to find
+java-pkg_addres() {
+ debug-print-function ${FUNCNAME} $*
+
+ [[ ${#} -lt 2 ]] die at least two arguments needed
+
+ local jar=$(realpath $1 || die realpath $1 failed)
+ local dir=$2
+ shift 2
+
+ pushd ${dir} /dev/null || die pushd ${dir} failed
+ find -L -type f ! -path ./target/* ! -path ./sources.lst ! -name
MANIFEST.MF ! -regex .*\.\(class\|jar\|java\) ${@} -print0 | xargs -0 jar
uf ${jar} || die jar failed
+ popd /dev/null || die popd failed
+}
+
# @FUNCTION: java-pkg_dojar
# @USAGE: jar1 [jar2 ...]
# @DESCRIPTION:
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 17:28:13
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
Revision ChangesPath
1.1659 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1659content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1658r2=1.1659
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1658
retrieving revision 1.1659
diff -u -r1.1658 -r1.1659
--- ChangeLog 13 Jun 2015 17:24:25 - 1.1658
+++ ChangeLog 13 Jun 2015 17:28:13 - 1.1659
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1658 2015/06/13
17:24:25 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1659 2015/06/13
17:28:13 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
13 Jun 2015; Alexandre Rostovtsev tetrom...@gentoo.org
-gnome-python-common.eclass:
1.23 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.23content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.22r2=1.23
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- qt4-build-multilib.eclass 13 Jun 2015 16:10:09 - 1.22
+++ qt4-build-multilib.eclass 13 Jun 2015 17:28:13 - 1.23
@@ -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/eclass/qt4-build-multilib.eclass,v 1.22
2015/06/13 16:10:09 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.23
2015/06/13 17:28:13 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -171,9 +171,20 @@
fi
fi
+ if [[ ${PN} == qtdeclarative ]]; then
+ # Bug 551560
+ # gcc-4.8 ICE with -Os, fixed in 4.9
+ if use x86 [[ $(gcc-version) == 4.8 ]]; then
+ replace-flags -Os -O2
+ fi
+ fi
+
if [[ ${PN} == qtwebkit ]]; then
# Bug 550780
- filter-flags -fgraphite-identity -floop-strip-mine
+ # various ICEs with graphite-related flags, gcc-5 works
+ if [[ $(gcc-major-version) -lt 5 ]]; then
+ filter-flags -fgraphite-identity -floop-strip-mine
+ fi
fi
# Bug 261632
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 16:10:09
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Simplify move of .pc files.
Revision ChangesPath
1.1657 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1657content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1656r2=1.1657
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1656
retrieving revision 1.1657
diff -u -r1.1656 -r1.1657
--- ChangeLog 13 Jun 2015 00:35:35 - 1.1656
+++ ChangeLog 13 Jun 2015 16:10:09 - 1.1657
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1656 2015/06/13
00:35:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1657 2015/06/13
16:10:09 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Simplify move of .pc files.
13 Jun 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
mozconfig-v4.31.eclass:
1.22 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.22content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.21r2=1.22
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qt4-build-multilib.eclass 12 Jun 2015 01:44:17 - 1.21
+++ qt4-build-multilib.eclass 13 Jun 2015 16:10:09 - 1.22
@@ -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/eclass/qt4-build-multilib.eclass,v 1.21
2015/06/12 01:44:17 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.22
2015/06/13 16:10:09 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -462,15 +462,10 @@
fi
fi
- # move pkgconfig files to the correct location
- eshopts_push -s nullglob
- local pcfile
- for pcfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
- dodir /usr/$(get_libdir)/pkgconfig
- mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
- done
- eshopts_pop
- rmdir ${D}/${QT4_LIBDIR}/pkgconfig
+ # move pkgconfig directory to the correct location
+ if [[ -d ${D}${QT4_LIBDIR}/pkgconfig ]]; then
+ mv ${D}${QT4_LIBDIR}/pkgconfig ${ED}usr/$(get_libdir) || die
+ fi
qt4_install_module_qconfigs
qt4_symlink_framework_headers
@@ -754,7 +749,7 @@
dosym ${rdir}/${f}/Headers ${dest}
# Link normal headers as well.
- for hdr in ${D}/${QT4_LIBDIR}/${f}/Headers/*; do
+ for hdr in ${D}${QT4_LIBDIR}/${f}/Headers/*; do
h=$(basename ${hdr})
dosym ../${rdir}/${f}/Headers/${h} \
${QT4_HEADERDIR#${EPREFIX}}/Qt/${h}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog gnome-python-common.eclass
tetromino15/06/13 17:24:25 Modified: ChangeLog Removed: gnome-python-common.eclass Log: Punt obsolete, unused eclass; it had a fixed set of users all of which have migrated to gnome-python-common-r1 (bug #551914, thanks to Michał Górny). Revision ChangesPath 1.1658 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1658view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1658content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1657r2=1.1658 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1657 retrieving revision 1.1658 diff -u -r1.1657 -r1.1658 --- ChangeLog 13 Jun 2015 16:10:09 - 1.1657 +++ ChangeLog 13 Jun 2015 17:24:25 - 1.1658 @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1657 2015/06/13 16:10:09 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1658 2015/06/13 17:24:25 tetromino Exp $ + + 13 Jun 2015; Alexandre Rostovtsev tetrom...@gentoo.org + -gnome-python-common.eclass: + Punt obsolete, unused eclass; it had a fixed set of users all of which + have migrated to gnome-python-common-r1 (bug #551914, thanks to Michał + Górny). 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass: Simplify move of .pc files.
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog perl-module.eclass
dilfridge15/06/13 19:01:10
Modified: ChangeLog perl-module.eclass
Log:
Allow dev-perl/Module-Build in QA check for Module::Build
Revision ChangesPath
1.1660 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1660view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1660content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1659r2=1.1660
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1659
retrieving revision 1.1660
diff -u -r1.1659 -r1.1660
--- ChangeLog 13 Jun 2015 17:28:13 - 1.1659
+++ ChangeLog 13 Jun 2015 19:01:10 - 1.1660
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1659 2015/06/13
17:28:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1660 2015/06/13
19:01:10 dilfridge Exp $
+
+ 13 Jun 2015; Andreas K. Huettel dilfri...@gentoo.org perl-module.eclass:
+ Allow dev-perl/Module-Build in QA check for Module::Build
13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Workaround gcc-4.8 ICE in qtdeclarative (bug 551560).
1.166eclass/perl-module.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/perl-module.eclass?rev=1.166view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/perl-module.eclass?rev=1.166content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/perl-module.eclass?r1=1.165r2=1.166
Index: perl-module.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- perl-module.eclass 25 May 2015 18:18:00 - 1.165
+++ perl-module.eclass 13 Jun 2015 19:01:10 - 1.166
@@ -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/eclass/perl-module.eclass,v 1.165
2015/05/25 18:18:00 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/perl-module.eclass,v 1.166
2015/06/13 19:01:10 dilfridge Exp $
# @ECLASS: perl-module.eclass
# @MAINTAINER:
@@ -141,9 +141,9 @@
fi
else
einfo Using Module::Build
- if [[ ${DEPEND} != *virtual/perl-Module-Build* ${PN}
!= Module-Build ]] ; then
+ if [[ ${DEPEND} != *virtual/perl-Module-Build*
${DEPEND} != *dev-perl/Module-Build* ${PN} != Module-Build ]] ; then
eqawarn QA Notice: The ebuild uses
Module::Build but doesn't depend on it.
- eqawarn Add virtual/perl-Module-Build to
DEPEND!
+ eqawarn Add dev-perl/Module-Build to DEPEND!
if [[ -n ${PERLQAFATAL} ]]; then
eerror Bailing out due to
PERLQAFATAL=1;
die
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 22:13:24
Modified: ChangeLog qt4-build-multilib.eclass
Log:
sh is supported, don't fallback to generic.
Also, don't die when tc-arch is unknown, the configure script can handle this
internally.
Revision ChangesPath
1.1661 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1661content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1660r2=1.1661
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1660
retrieving revision 1.1661
diff -u -r1.1660 -r1.1661
--- ChangeLog 13 Jun 2015 19:01:10 - 1.1660
+++ ChangeLog 13 Jun 2015 22:13:24 - 1.1661
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1660 2015/06/13
19:01:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13
22:13:24 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ sh is supported, don't fallback to generic. Also, don't die when tc-arch is
+ unknown, the configure script can handle this internally.
13 Jun 2015; Andreas K. Huettel dilfri...@gentoo.org perl-module.eclass:
Allow dev-perl/Module-Build in QA check for Module::Build
1.24 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.24content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.23r2=1.24
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- qt4-build-multilib.eclass 13 Jun 2015 17:28:13 - 1.23
+++ qt4-build-multilib.eclass 13 Jun 2015 22:13:24 - 1.24
@@ -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/eclass/qt4-build-multilib.eclass,v 1.23
2015/06/13 17:28:13 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.24
2015/06/13 22:13:24 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -300,17 +300,15 @@
STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
- local arch=
- case $(tc-arch) in
- amd64|x64-*) arch=x86_64 ;;
- ppc*-macos) arch=ppc ;;
- ppc*) arch=powerpc ;;
- sparc*) arch=sparc ;;
- x86-macos)arch=x86 ;;
- x86*) arch=i386 ;;
- alpha|arm|ia64|mips|s390) arch=$(tc-arch) ;;
- arm64|hppa|sh)arch=generic ;;
- *) die qt4-build-multilib.eclass: unsupported tc-arch
'$(tc-arch)' ;;
+ local arch=$(tc-arch)
+ case ${arch} in
+ amd64|x64-*)arch=x86_64 ;;
+ arm64|hppa) arch=generic ;;
+ ppc*-macos) arch=ppc ;;
+ ppc*) arch=powerpc ;;
+ sparc*) arch=sparc ;;
+ x86-macos) arch=x86 ;;
+ x86*) arch=i386 ;;
esac
# configure arguments
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/13 22:57:59
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Export MAKEFLAGS and OBJDUMP.
Revision ChangesPath
1.1662 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1662view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1662content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1661r2=1.1662
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1661
retrieving revision 1.1662
diff -u -r1.1661 -r1.1662
--- ChangeLog 13 Jun 2015 22:13:24 - 1.1661
+++ ChangeLog 13 Jun 2015 22:57:59 - 1.1662
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1661 2015/06/13
22:13:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1662 2015/06/13
22:57:59 pesa Exp $
+
+ 13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Export MAKEFLAGS and OBJDUMP.
13 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
sh is supported, don't fallback to generic. Also, don't die when tc-arch is
1.25 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.25view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.25content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.24r2=1.25
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- qt4-build-multilib.eclass 13 Jun 2015 22:13:24 - 1.24
+++ qt4-build-multilib.eclass 13 Jun 2015 22:57:59 - 1.25
@@ -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/eclass/qt4-build-multilib.eclass,v 1.24
2015/06/13 22:13:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.25
2015/06/13 22:57:59 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -296,7 +296,9 @@
CC=$(tc-getCC) \
CXX=$(tc-getCXX) \
LD=$(tc-getCXX) \
+ MAKEFLAGS=${MAKEOPTS} \
OBJCOPY=$(tc-getOBJCOPY) \
+ OBJDUMP=$(tc-getOBJDUMP) \
STRIP=$(tc-getSTRIP)
# convert tc-arch to the values supported by Qt
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-autotools.eclass mysql.eclass
grknight15/06/12 20:37:40 Modified: ChangeLog Removed: mysql-autotools.eclass mysql.eclass Log: Drop old, unused eclasses; Moved to mysql overlay Revision ChangesPath 1.1655 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1655view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1655content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1654r2=1.1655 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1654 retrieving revision 1.1655 diff -u -r1.1654 -r1.1655 --- ChangeLog 12 Jun 2015 19:23:14 - 1.1654 +++ ChangeLog 12 Jun 2015 20:37:40 - 1.1655 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1654 2015/06/12 19:23:14 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1655 2015/06/12 20:37:40 grknight Exp $ + + 12 Jun 2015; grkni...@gentoo.org -mysql.eclass, -mysql-autotools.eclass: + Drop old, unused eclasses; Moved to mysql overlay; bug 551908 12 Jun 2015; Mike Gilbert flop...@gentoo.org -zproduct.eclass: Remove obsolete/broken eclass, bug 551918.
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog zproduct.eclass
floppym 15/06/12 19:23:14 Modified: ChangeLog Removed: zproduct.eclass Log: Remove obsolete/broken eclass, bug 551918. Revision ChangesPath 1.1654 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1654view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1654content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1653r2=1.1654 Index: ChangeLog === RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1653 retrieving revision 1.1654 diff -u -r1.1653 -r1.1654 --- ChangeLog 12 Jun 2015 01:44:17 - 1.1653 +++ ChangeLog 12 Jun 2015 19:23:14 - 1.1654 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1653 2015/06/12 01:44:17 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1654 2015/06/12 19:23:14 floppym Exp $ + + 12 Jun 2015; Mike Gilbert flop...@gentoo.org -zproduct.eclass: + Remove obsolete/broken eclass, bug 551918. 12 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass: Don't die when trying to rmdir non-existent directory (bug 551676).
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mozconfig-v4.31.eclass
axs 15/06/13 00:35:35
Modified: ChangeLog mozconfig-v4.31.eclass
Log:
last rited mozconfig-v4.31
Revision ChangesPath
1.1656 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1656view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1656content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1655r2=1.1656
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1655
retrieving revision 1.1656
diff -u -r1.1655 -r1.1656
--- ChangeLog 12 Jun 2015 20:37:40 - 1.1655
+++ ChangeLog 13 Jun 2015 00:35:35 - 1.1656
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1655 2015/06/12
20:37:40 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1656 2015/06/13
00:35:35 axs Exp $
+
+ 13 Jun 2015; Ian Stakenvicius (_AxS_) a...@gentoo.org
+ mozconfig-v4.31.eclass:
+ last rited mozconfig-v4.31
12 Jun 2015; grkni...@gentoo.org -mysql.eclass, -mysql-autotools.eclass:
Drop old, unused eclasses; Moved to mysql overlay; bug 551908
1.2 eclass/mozconfig-v4.31.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.31.eclass?rev=1.2view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.31.eclass?rev=1.2content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mozconfig-v4.31.eclass?r1=1.1r2=1.2
Index: mozconfig-v4.31.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.31.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozconfig-v4.31.eclass 11 Sep 2014 22:10:35 - 1.1
+++ mozconfig-v4.31.eclass 13 Jun 2015 00:35:35 - 1.2
@@ -1,13 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.31.eclass,v 1.1
2014/09/11 22:10:35 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v4.31.eclass,v 1.2
2015/06/13 00:35:35 axs Exp $
#
# mozconfig-v4.1.eclass: the new mozilla.eclass
inherit multilib flag-o-matic toolchain-funcs mozcoreconf-2
case ${EAPI} in
- 0|1|2|3|4) die EAPI=${EAPI} not supported
+ 0|1|2|3|4) die EAPI=${EAPI} not supported ;;
+ *) die This eclass has been disabled and will be removed on
2015-06-30. If you need it, copy to your overlay and remove this line. ;;
esac
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/11 18:33:54
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Use usex().
Revision ChangesPath
1.1652 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1652content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1651r2=1.1652
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1651
retrieving revision 1.1652
diff -u -r1.1651 -r1.1652
--- ChangeLog 10 Jun 2015 18:08:02 - 1.1651
+++ ChangeLog 11 Jun 2015 18:33:54 - 1.1652
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10
18:08:02 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11
18:33:54 pesa Exp $
+
+ 11 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Use usex().
10 Jun 2015; grkni...@gentoo.org mysql-multilib.eclass:
Resolve cirucular dependency for bug 551686; Make USE=cluster die early for
1.20 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.20content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.19r2=1.20
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- qt4-build-multilib.eclass 9 Jun 2015 21:12:50 - 1.19
+++ qt4-build-multilib.eclass 11 Jun 2015 18:33:54 - 1.20
@@ -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/eclass/qt4-build-multilib.eclass,v 1.19
2015/06/09 21:12:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.20
2015/06/11 18:33:54 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -368,7 +368,7 @@
-nomake demos
# disable rpath on non-prefix (bugs 380415 and 417169)
- $(use prefix || echo -no-rpath)
+ $(usex prefix '' -no-rpath)
# verbosity of the configure and build phases
-verbose $(${QT4_VERBOSE_BUILD} || echo -silent)
@@ -531,22 +531,30 @@
# @FUNCTION: qt_use
# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
+# flag is the name of a flag in IUSE.
+#
# Outputs -${enableval}-${feature} if flag is enabled, -no-${feature}
# otherwise. If [feature] is not specified, flag is used in its place.
# If [enableval] is not specified, the -${enableval} prefix is omitted.
qt_use() {
- use $1 echo ${3:+-$3}-${2:-$1} || echo -no-${2:-$1}
+ [[ $# -ge 1 ]] || die ${FUNCNAME}() requires at least one argument
+
+ usex $1 ${3:+-$3}-${2:-$1} -no-${2:-$1}
}
# @FUNCTION: qt_native_use
# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
+# flag is the name of a flag in IUSE.
+#
# Outputs -${enableval}-${feature} if flag is enabled and we are currently
# building for the native ABI, -no-${feature} otherwise. If [feature] is not
# specified, flag is used in its place. If [enableval] is not specified,
# the -${enableval} prefix is omitted.
qt_native_use() {
- multilib_is_native_abi use $1 echo ${3:+-$3}-${2:-$1} || echo
-no-${2:-$1}
+ [[ $# -ge 1 ]] || die ${FUNCNAME}() requires at least one argument
+
+ multilib_is_native_abi qt_use $@ || echo -no-${2:-$1}
}
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/12 01:44:17
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Don't die when trying to rmdir non-existent directory (bug 551676).
Revision ChangesPath
1.1653 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1653content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1652r2=1.1653
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1652
retrieving revision 1.1653
diff -u -r1.1652 -r1.1653
--- ChangeLog 11 Jun 2015 18:33:54 - 1.1652
+++ ChangeLog 12 Jun 2015 01:44:17 - 1.1653
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1652 2015/06/11
18:33:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1653 2015/06/12
01:44:17 pesa Exp $
+
+ 12 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Don't die when trying to rmdir non-existent directory (bug 551676).
11 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
Use usex().
1.21 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.21content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.20r2=1.21
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qt4-build-multilib.eclass 11 Jun 2015 18:33:54 - 1.20
+++ qt4-build-multilib.eclass 12 Jun 2015 01:44:17 - 1.21
@@ -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/eclass/qt4-build-multilib.eclass,v 1.20
2015/06/11 18:33:54 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.21
2015/06/12 01:44:17 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -470,7 +470,7 @@
mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
done
eshopts_pop
- rmdir ${D}/${QT4_LIBDIR}/pkgconfig || die
+ rmdir ${D}/${QT4_LIBDIR}/pkgconfig
qt4_install_module_qconfigs
qt4_symlink_framework_headers
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog mysql-multilib.eclass
grknight15/06/10 18:08:02
Modified: ChangeLog mysql-multilib.eclass
Log:
Resolve cirucular dependency for bug 551686; Make USE=cluster die early for
all except dev-db/mysql-cluster; Documentation update for variables, remove 2
unused and add WSREP_REVISION; Clarify mariadb bindist USE
Revision ChangesPath
1.1651 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1651view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1651content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1650r2=1.1651
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1650
retrieving revision 1.1651
diff -u -r1.1650 -r1.1651
--- ChangeLog 9 Jun 2015 22:00:44 - 1.1650
+++ ChangeLog 10 Jun 2015 18:08:02 - 1.1651
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1650 2015/06/09
22:00:44 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1651 2015/06/10
18:08:02 grknight Exp $
+
+ 10 Jun 2015; grkni...@gentoo.org mysql-multilib.eclass:
+ Resolve cirucular dependency for bug 551686; Make USE=cluster die early for
+ all except dev-db/mysql-cluster; Documentation update for variables, remove 2
+ unused and add WSREP_REVISION; Clarify mariadb bindist USE
09 Jun 2015; Michael Weber x...@gentoo.org netsurf.eclass:
Update for buildsystem-1.3
1.21 eclass/mysql-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.21view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?rev=1.21content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql-multilib.eclass?r1=1.20r2=1.21
Index: mysql-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- mysql-multilib.eclass 24 May 2015 04:35:49 - 1.20
+++ mysql-multilib.eclass 10 Jun 2015 18:08:02 - 1.21
@@ -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/eclass/mysql-multilib.eclass,v 1.20
2015/05/24 04:35:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.21
2015/06/10 18:08:02 grknight Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@@ -101,16 +101,6 @@
# This eclass should only be used with at least mysql-5.5.35
mysql_version_is_at_least 5.5.35 || die This eclass should only be used
with =mysql-5.5.35
-# @ECLASS-VARIABLE: XTRADB_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Version of the XTRADB storage engine
-
-# @ECLASS-VARIABLE: PERCONA_VER
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# Designation by PERCONA for a MySQL version to apply an XTRADB release
-
# Work out the default SERVER_URI correctly
if [[ -z ${SERVER_URI} ]]; then
[[ -z ${MY_PV} ]] MY_PV=${PV//_/-}
@@ -120,8 +110,13 @@
MARIA_FULL_PV=$(replace_version_separator 3 '-'
${MY_PV})
MARIA_FULL_P=${PN}-${MARIA_FULL_PV}
SERVER_URI=
-
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+
http://mirrors.fe.up.pt/pub/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+
http://mirror2.hs-esslingen.de/mariadb/${MARIA_FULL_P}/source/${MARIA_FULL_P}.tar.gz
+
http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://mirror.jmu.edu/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://mirrors.coreix.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
http://mirrors.syringanetworks.net/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
@@ -353,6 +348,11 @@
virtual/perl-Time-HiRes )
fi
+# @ECLASS-VARIABLE: WSREP_REVISION
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Version of the sys-cluster/galera API (major version in portage) to use for
galera clustering
+
if [[ -n
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vala.eclass
eva 15/06/09 10:18:38
Modified: ChangeLog vala.eclass
Log:
Add support for newer vala slot
Revision ChangesPath
1.1645 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1645view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1645content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1644r2=1.1645
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1644
retrieving revision 1.1645
diff -u -r1.1644 -r1.1645
--- ChangeLog 8 Jun 2015 12:27:32 - 1.1644
+++ ChangeLog 9 Jun 2015 10:18:38 - 1.1645
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1644 2015/06/08
12:27:32 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1645 2015/06/09
10:18:38 eva Exp $
+
+ 09 Jun 2015; Gilles Dartiguelongue e...@gentoo.org gnome2.eclass,
+ vala.eclass:
+ Add support for newer vala slot.
08 Jun 2015; Manuel Rüger mr...@gentoo.org kde5-functions.eclass:
Sync with kde overlay. Raise minimal Plasma version and minimal KDE
1.12 eclass/vala.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vala.eclass?rev=1.12view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vala.eclass?rev=1.12content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vala.eclass?r1=1.11r2=1.12
Index: vala.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vala.eclass 21 Dec 2014 12:25:49 - 1.11
+++ vala.eclass 9 Jun 2015 10:18:38 - 1.12
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.11 2014/12/21
12:25:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vala.eclass,v 1.12 2015/06/09
10:18:38 eva Exp $
# @ECLASS: vala.eclass
# @MAINTAINER:
@@ -31,8 +31,8 @@
# @ECLASS-VARIABLE: VALA_MAX_API_VERSION
# @DESCRIPTION:
-# Maximum vala API version (e.g. 0.26).
-VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.26}
+# Maximum vala API version (e.g. 0.28).
+VALA_MAX_API_VERSION=${VALA_MAX_API_VERSION:-0.28}
# @ECLASS-VARIABLE: VALA_USE_DEPEND
# @DEFAULT_UNSET
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/09 18:13:42
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Remove two seds that are no longer needed on current Qt versions.
Revision ChangesPath
1.1646 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1646content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1645r2=1.1646
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1645
retrieving revision 1.1646
diff -u -r1.1645 -r1.1646
--- ChangeLog 9 Jun 2015 10:18:38 - 1.1645
+++ ChangeLog 9 Jun 2015 18:13:42 - 1.1646
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1645 2015/06/09
10:18:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1646 2015/06/09
18:13:42 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Remove two seds that are no longer needed on current Qt versions.
09 Jun 2015; Gilles Dartiguelongue e...@gentoo.org gnome2.eclass,
vala.eclass:
1.17 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.17content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.16r2=1.17
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- qt4-build-multilib.eclass 31 May 2015 13:56:53 - 1.16
+++ qt4-build-multilib.eclass 9 Jun 2015 18:13:42 - 1.17
@@ -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/eclass/qt4-build-multilib.eclass,v 1.16
2015/05/31 13:56:53 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.17
2015/06/09 18:13:42 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -459,8 +459,15 @@
fi
fi
+ # move pkgconfig files to the correct directory
+ local pcfile
+ for pcfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
+ dodir /usr/$(get_libdir)/pkgconfig
+ mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
+ done
+ rmdir ${D}/${QT4_LIBDIR}/pkgconfig || die
+
install_qconfigs
- fix_library_files
fix_includes
}
@@ -547,7 +554,6 @@
QT4_PREFIX=${EPREFIX}/usr
QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
- QT4_PCDIR=${QT4_PREFIX}/$(get_libdir)/pkgconfig
QT4_BINDIR=${QT4_LIBDIR}/bin
QT4_PLUGINDIR=${QT4_LIBDIR}/plugins
QT4_IMPORTDIR=${QT4_LIBDIR}/imports
@@ -699,34 +705,6 @@
fi
}
-# @FUNCTION: fix_library_files
-# @INTERNAL
-# @DESCRIPTION:
-# Fixes the paths in *.prl and *.pc, as they are wrong due to sandbox, and
-# moves the *.pc files into the pkgconfig directory.
-fix_library_files() {
- local libfile
- for libfile in ${D}/${QT4_LIBDIR}/{*.prl,pkgconfig/*.pc}; do
- if [[ -e ${libfile} ]]; then
- sed -i -e s:${S}/lib:${QT4_LIBDIR}:g ${libfile} ||
die sed on ${libfile} failed
- fi
- done
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations
- for libfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
- if [[ -e ${libfile} ]]; then
- sed -i -e s:${S}/bin:${QT4_BINDIR}:g ${libfile} ||
die sed on ${libfile} failed
-
- # Move .pc files into the pkgconfig directory
- dodir ${QT4_PCDIR#${EPREFIX}}
- mv ${libfile} ${D}/${QT4_PCDIR}/ || die moving ${libfile} to
${D}/${QT4_PCDIR}/ failed
- fi
- done
-
- # Don't install an empty directory
- rmdir ${D}/${QT4_LIBDIR}/pkgconfig
-}
-
# @FUNCTION: fix_includes
# @DESCRIPTION:
# For MacOS X we need to add some symlinks when frameworks are
[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-build-multilib.eclass
pesa15/06/09 21:12:51
Modified: ChangeLog qt4-build-multilib.eclass
Log:
Rename some internal functions for consistency.
Revision ChangesPath
1.1649 eclass/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1649view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1649content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1648r2=1.1649
Index: ChangeLog
===
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1648
retrieving revision 1.1649
diff -u -r1.1648 -r1.1649
--- ChangeLog 9 Jun 2015 20:16:59 - 1.1648
+++ ChangeLog 9 Jun 2015 21:12:50 - 1.1649
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1648 2015/06/09
20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1649 2015/06/09
21:12:50 pesa Exp $
+
+ 09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass:
+ Rename some internal functions for consistency.
09 Jun 2015; Davide Pesavento p...@gentoo.org qt4-build-multilib.eclass,
qt5-build.eclass:
1.19 eclass/qt4-build-multilib.eclass
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.19view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?rev=1.19content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-build-multilib.eclass?r1=1.18r2=1.19
Index: qt4-build-multilib.eclass
===
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qt4-build-multilib.eclass 9 Jun 2015 20:16:59 - 1.18
+++ qt4-build-multilib.eclass 9 Jun 2015 21:12:50 - 1.19
@@ -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/eclass/qt4-build-multilib.eclass,v 1.18
2015/06/09 20:16:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.19
2015/06/09 21:12:50 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -108,6 +108,9 @@
# @DESCRIPTION:
# List of macros that must be defined in QtCore/qconfig.h
+
+## Phase functions ##
+
# @FUNCTION: qt4-build-multilib_src_unpack
# @DESCRIPTION:
# Unpacks the sources.
@@ -459,16 +462,18 @@
fi
fi
- # move pkgconfig files to the correct directory
+ # move pkgconfig files to the correct location
+ eshopts_push -s nullglob
local pcfile
for pcfile in ${D}/${QT4_LIBDIR}/pkgconfig/*.pc; do
dodir /usr/$(get_libdir)/pkgconfig
mv ${pcfile} ${ED}/usr/$(get_libdir)/pkgconfig || die
done
+ eshopts_pop
rmdir ${D}/${QT4_LIBDIR}/pkgconfig || die
- install_qconfigs
- fix_includes
+ qt4_install_module_qconfigs
+ qt4_symlink_framework_headers
}
qt4_multilib_src_install_all() {
@@ -510,16 +515,19 @@
# Regenerate configuration, plus throw a message about possible
# breakages and proposed solutions.
qt4-build-multilib_pkg_postinst() {
- generate_qconfigs
+ qt4_regenerate_global_qconfigs
}
# @FUNCTION: qt4-build-multilib_pkg_postrm
# @DESCRIPTION:
# Regenerate configuration when the package is completely removed.
qt4-build-multilib_pkg_postrm() {
- generate_qconfigs
+ qt4_regenerate_global_qconfigs
}
+
+## Public helpers ##
+
# @FUNCTION: qt_use
# @USAGE: flag [feature] [enableval]
# @DESCRIPTION:
@@ -622,11 +630,11 @@
|| die qmake failed (${projectdir})
}
-# @FUNCTION: install_qconfigs
+# @FUNCTION: qt4_install_module_qconfigs
# @INTERNAL
# @DESCRIPTION:
-# Install gentoo-specific mkspecs configurations.
-install_qconfigs() {
+# Creates and installs gentoo-specific ${PN}-qconfig.{h,pri} files.
+qt4_install_module_qconfigs() {
local x
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} ]]; then
for x in QCONFIG_ADD QCONFIG_REMOVE; do
@@ -645,11 +653,12 @@
fi
}
-# @FUNCTION: generate_qconfigs
+# @FUNCTION: qt4_regenerate_global_qconfigs
# @INTERNAL
# @DESCRIPTION:
-# Generates gentoo-specific qconfig.{h,pri}.
-generate_qconfigs() {
+# Generates Gentoo-specific qconfig.{h,pri} according to the build
configuration.
+# Don't call die here because dying in pkg_post{inst,rm} only makes things
worse.
+qt4_regenerate_global_qconfigs() {
if [[ -n ${QCONFIG_ADD} || -n ${QCONFIG_REMOVE} || -n ${QCONFIG_DEFINE}
|| ${PN} == qtcore
