Gentoo Archives: gentoo-commits

From: "Manuel Rüger" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sun, 31 May 2015 15:30:05
Message-Id: 1433086185.ebc61ef574b27ef630c21d69e02868ef53d9249b.mrueg@gentoo
1 commit: ebc61ef574b27ef630c21d69e02868ef53d9249b
2 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 15:29:45 2015 +0000
4 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 15:29:45 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ebc61ef5
7
8 [eclass] Drop fetch restriction for unpublished packages, as it did not work out as expected.
9
10 eclass/kde5.eclass | 73 ++----------------------------------------------------
11 1 file changed, 2 insertions(+), 71 deletions(-)
12
13 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
14 index 51821a0..a462280 100644
15 --- a/eclass/kde5.eclass
16 +++ b/eclass/kde5.eclass
17 @@ -28,7 +28,7 @@ if [[ ${KDE_BUILD_TYPE} = live ]]; then
18 esac
19 fi
20
21 -EXPORT_FUNCTIONS pkg_pretend pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
22 +EXPORT_FUNCTIONS pkg_pretend pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_preinst pkg_postinst pkg_postrm
23
24 # @ECLASS-VARIABLE: QT_MINIMAL
25 # @DESCRIPTION:
26 @@ -101,14 +101,6 @@ fi
27 # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND.
28 : ${KDE_SELINUX_MODULE:=none}
29
30 -# @ECLASS-VARIABLE: KDE_RELEASE_DATE
31 -# @DESCRIPTION:
32 -# Used to display a fetch restriction for packages that have not been published yet.
33 -# If set to "none", use internal schedule.
34 -# Otherwise set it to a date formatted as YYMMDD.
35 -# Internal schedule is adjusted in _get_release_date().
36 -: ${KDE_RELEASE_DATE:=none}
37 -
38 if [[ ${KDEBASE} = kdevelop ]]; then
39 HOMEPAGE="http://www.kdevelop.org/"
40 else
41 @@ -322,59 +314,9 @@ _calculate_live_repo() {
42 esac
43 }
44
45 -
46 -_get_release_date() {
47 - debug-print-function ${FUNCNAME} "$@"
48 - case ${CATEGORY} in
49 - kde-frameworks)
50 - case ${PV} in
51 - 5.10.0) echo "20150507" ;;
52 - 5.11.0) echo "20150611" ;;
53 - 5.12.0) echo "20150709" ;;
54 - 5.13.0) echo "20150806" ;;
55 - *) echo "none" ;;
56 - esac
57 - ;;
58 - kde-plasma)
59 - case ${PV} in
60 - 5.3.0) echo "20150428" ;;
61 - 5.3.1) echo "20150526" ;;
62 - 5.3.2) echo "20150630" ;;
63 - 5.3.95) echo "20150811" ;;
64 - 5.4.0) echo "20150825" ;;
65 - *) echo "none" ;;
66 - esac
67 - ;;
68 - kde-apps)
69 - case ${PV} in
70 - 15.04.1) echo "20150512" ;;
71 - 15.04.2) echo "20150602" ;;
72 - 15.04.3) echo "20150630" ;;
73 - 15.07.90) echo "20150805" ;;
74 - 15.08.0) echo "20150819" ;;
75 - *) echo "none" ;;
76 - esac
77 - ;;
78 - *) echo "none" ;;
79 - esac
80 -}
81 -
82 -_check_fetch_restriction() {
83 - debug-print-function ${FUNCNAME} "$@"
84 - if [[ ${KDE_RELEASE_DATE} == "none" ]]; then
85 - KDE_RELEASE_DATE=$(_get_release_date)
86 - fi
87 - if [[ ${KDE_RELEASE_DATE} != "none" ]]; then
88 - if [[ $(date -u +"%Y%m%d") < ${KDE_RELEASE_DATE} ]]; then
89 - RESTRICT+=" fetch"
90 - fi
91 - fi
92 -}
93 -
94 case ${KDE_BUILD_TYPE} in
95 live) _calculate_live_repo ;;
96 - *) _calculate_src_uri
97 - _check_fetch_restriction ;;
98 + *) _calculate_src_uri ;;
99 esac
100
101 debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
102 @@ -395,17 +337,6 @@ kde5_pkg_setup() {
103 _check_gcc_version
104 }
105
106 -# @FUNCTION: kde5_pkg_nofetch
107 -# @DESCRIPTION:
108 -# Display package publication status
109 -kde5_pkg_nofetch() {
110 - einfo "${CATEGORY}/${P} has not been released to the public yet"
111 - einfo "and is only available to packagers right now."
112 - einfo ""
113 - einfo "Further information:"
114 - einfo "https://techbase.kde.org/Schedules"
115 -}
116 -
117 # @FUNCTION: kde5_src_unpack
118 # @DESCRIPTION:
119 # Function for unpacking KDE 5.