Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 624682 | Differences between
and this patch

Collapse All | Expand All

(-)dev-python/pyside/pyside-9999.ebuild (-26 / +34 lines)
Lines 13-20 Link Here
13
	"git://code.qt.io/pyside/pyside-setup.git"
13
	"git://code.qt.io/pyside/pyside-setup.git"
14
	"https://code.qt.io/git/pyside/pyside-setup.git"
14
	"https://code.qt.io/git/pyside/pyside-setup.git"
15
)
15
)
16
#FIXME: Switch to the clang-enabled "dev" branch once stable.
17
EGIT_BRANCH="5.6"
18
16
19
LICENSE="|| ( GPL-2+ LGPL-3 )"
17
LICENSE="|| ( GPL-2+ LGPL-3 )"
20
SLOT="2"
18
SLOT="2"
Lines 47-84 Link Here
47
45
48
# Minimum version of Qt required, derived from the CMakeLists.txt line:
46
# Minimum version of Qt required, derived from the CMakeLists.txt line:
49
#   find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core)
47
#   find_package(Qt5 ${QT_PV} REQUIRED COMPONENTS Core)
50
QT_PV="5.6*:5"
48
QT_PV="5.6.0:5"
51
49
52
DEPEND="
50
DEPEND="
53
	${PYTHON_DEPS}
51
	${PYTHON_DEPS}
54
	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
52
	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
55
	=dev-qt/qtcore-${QT_PV}
53
	>=dev-qt/qtcore-${QT_PV}
56
	=dev-qt/qtxml-${QT_PV}
54
	>=dev-qt/qtxml-${QT_PV}
57
	concurrent? ( =dev-qt/qtconcurrent-${QT_PV} )
55
	concurrent? ( >=dev-qt/qtconcurrent-${QT_PV} )
58
	declarative? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
56
	declarative? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
59
	designer? ( =dev-qt/designer-${QT_PV} )
57
	designer? ( >=dev-qt/designer-${QT_PV} )
60
	gui? ( =dev-qt/qtgui-${QT_PV} )
58
	gui? ( >=dev-qt/qtgui-${QT_PV} )
61
	help? ( =dev-qt/qthelp-${QT_PV} )
59
	help? ( >=dev-qt/qthelp-${QT_PV} )
62
	multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[widgets?] )
60
	multimedia? ( >=dev-qt/qtmultimedia-${QT_PV}[widgets?] )
63
	network? ( =dev-qt/qtnetwork-${QT_PV} )
61
	network? ( >=dev-qt/qtnetwork-${QT_PV} )
64
	opengl? ( =dev-qt/qtopengl-${QT_PV} )
62
	opengl? ( >=dev-qt/qtopengl-${QT_PV} )
65
	printsupport? ( =dev-qt/qtprintsupport-${QT_PV} )
63
	printsupport? ( >=dev-qt/qtprintsupport-${QT_PV} )
66
	script? ( =dev-qt/qtscript-${QT_PV} )
64
	script? ( >=dev-qt/qtscript-${QT_PV} )
67
	sql? ( =dev-qt/qtsql-${QT_PV} )
65
	sql? ( >=dev-qt/qtsql-${QT_PV} )
68
	svg? ( =dev-qt/qtsvg-${QT_PV} )
66
	svg? ( >=dev-qt/qtsvg-${QT_PV} )
69
	testlib? ( =dev-qt/qttest-${QT_PV} )
67
	testlib? ( >=dev-qt/qttest-${QT_PV} )
70
	webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
68
	webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
71
	webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets] )
69
	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
72
	webkit? ( =dev-qt/qtwebkit-${QT_PV}[printsupport] )
70
	webkit? ( >=dev-qt/qtwebkit-${QT_PV}[printsupport] )
73
	websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
71
	websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
74
	widgets? ( =dev-qt/qtwidgets-${QT_PV} )
72
	widgets? ( >=dev-qt/qtwidgets-${QT_PV} )
75
	x11extras? ( =dev-qt/qtx11extras-${QT_PV} )
73
	x11extras? ( >=dev-qt/qtx11extras-${QT_PV} )
76
	xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV} )
74
	xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} )
77
"
75
"
78
RDEPEND="${DEPEND}"
76
RDEPEND="
77
	${DEPEND}
78
	dev-qt/qtcore:=
79
	"
79
80
80
S=${WORKDIR}/${P}/sources/pyside2
81
S=${WORKDIR}/${P}/sources/pyside2
81
82
83
src_unpack() { 
84
	#FIXME: Switch to the clang-enabled "dev" branch once stable.
85
	has_version ">=dev-qt/qtcore-5.7.0" && EGIT_BRANCH="5.9" || EGIT_BRANCH="5.6" ;
86
	
87
	git-r3_src_unpack 
88
}
89
82
src_prepare() {
90
src_prepare() {
83
	if use prefix; then
91
	if use prefix; then
84
		cp "${FILESDIR}"/rpath.cmake . || die
92
		cp "${FILESDIR}"/rpath.cmake . || die
(-)dev-python/pyside-tools/pyside-tools-9999.ebuild (-2 / +8 lines)
Lines 23-30 Link Here
23
	"git://code.qt.io/pyside/${PN}.git"
23
	"git://code.qt.io/pyside/${PN}.git"
24
	"https://code.qt.io/git/pyside/${PN}.git"
24
	"https://code.qt.io/git/pyside/${PN}.git"
25
)
25
)
26
#FIXME: Switch to the clang-enabled "dev" branch once stable.
27
EGIT_BRANCH="5.6"
28
26
29
LICENSE="BSD GPL-2"
27
LICENSE="BSD GPL-2"
30
SLOT="2"
28
SLOT="2"
Lines 39-49 Link Here
39
	>=dev-python/pyside-${PV}:${SLOT}[gui,widgets,${PYTHON_USEDEP}]
37
	>=dev-python/pyside-${PV}:${SLOT}[gui,widgets,${PYTHON_USEDEP}]
40
	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
38
	>=dev-python/shiboken-${PV}:${SLOT}[${PYTHON_USEDEP}]
41
	dev-qt/qtcore:5
39
	dev-qt/qtcore:5
40
	dev-qt/qtcore:=
42
"
41
"
43
DEPEND="${RDEPEND}
42
DEPEND="${RDEPEND}
44
	test? ( virtual/pkgconfig )
43
	test? ( virtual/pkgconfig )
45
"
44
"
46
45
46
src_unpack() {
47
	#FIXME: Switch to the clang-enabled "dev" branch once stable.
48
	has_version ">=dev-qt/qtcore-5.7.0" && EGIT_BRANCH="5.9" || EGIT_BRANCH="5.6" ;
49
	
50
	git-r3_src_unpack 
51
}
52
47
src_prepare() {
53
src_prepare() {
48
	cmake-utils_src_prepare
54
	cmake-utils_src_prepare
49
55
(-)dev-python/shiboken/shiboken-9999.ebuild (-7 / +15 lines)
Lines 13-20 Link Here
13
	"git://code.qt.io/pyside/pyside-setup.git"
13
	"git://code.qt.io/pyside/pyside-setup.git"
14
	"https://code.qt.io/git/pyside/pyside-setup.git"
14
	"https://code.qt.io/git/pyside/pyside-setup.git"
15
)
15
)
16
#FIXME: Switch to the clang-enabled "dev" branch once stable.
17
EGIT_BRANCH="5.6"
18
16
19
LICENSE="|| ( GPL-2+ LGPL-3 ) GPL-3"
17
LICENSE="|| ( GPL-2+ LGPL-3 ) GPL-3"
20
SLOT="2"
18
SLOT="2"
Lines 23-45 Link Here
23
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
21
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
24
22
25
# Minimum version of Qt required.
23
# Minimum version of Qt required.
26
QT_PV="5.6*:5"
24
QT_PV="5.6.0:5"
27
25
28
#FIXME: Add "sys-devel/clang:*" after switching to the "dev" branch.
26
#FIXME: Add "sys-devel/clang:*" after switching to the "dev" branch.
29
DEPEND="
27
DEPEND="
30
	${PYTHON_DEPS}
28
	${PYTHON_DEPS}
31
	dev-libs/libxml2
29
	dev-libs/libxml2
32
	dev-libs/libxslt
30
	dev-libs/libxslt
33
	=dev-qt/qtcore-${QT_PV}
31
	>=dev-qt/qtcore-${QT_PV}
34
	=dev-qt/qtxml-${QT_PV}
32
	>=dev-qt/qtxml-${QT_PV}
35
	=dev-qt/qtxmlpatterns-${QT_PV}
33
	>=dev-qt/qtxmlpatterns-${QT_PV}
36
"
34
"
37
RDEPEND="${DEPEND}"
35
RDEPEND="
36
	${DEPEND}
37
	dev-qt/qtcore:=
38
	"
38
39
39
S=${WORKDIR}/${P}/sources/shiboken2
40
S=${WORKDIR}/${P}/sources/shiboken2
40
41
41
DOCS=( AUTHORS )
42
DOCS=( AUTHORS )
42
43
44
src_unpack() { 
45
	#FIXME: Switch to the clang-enabled "dev" branch once stable.
46
	has_version ">=dev-qt/qtcore-5.7.0" && EGIT_BRANCH="5.9" || EGIT_BRANCH="5.6" ;
47
	
48
	git-r3_src_unpack 
49
}
50
43
src_prepare() {
51
src_prepare() {
44
	#FIXME: Uncomment after switching to the "dev" branch.
52
	#FIXME: Uncomment after switching to the "dev" branch.
45
	# sed -i -e "/^find_library(CLANG_LIBRARY/ s~/lib)$~/$(get_libdir))~" CMakeLists.txt || die
53
	# sed -i -e "/^find_library(CLANG_LIBRARY/ s~/lib)$~/$(get_libdir))~" CMakeLists.txt || die

Return to bug 624682