Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

FL-336: eix version bump

  • Loading branch information...
commit 92a87c73c73a24f0ef1582cc7ebfdaace8b4f277 1 parent 08d646b
Jean-Francis Roy authored January 21, 2013
3  app-portage/eix/Manifest
... ...
@@ -1,4 +1,3 @@
1 1
 DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0bf5b980afda65ea207b356
2  
-DIST eix-0.23.9.tar.xz 437468 SHA256 194bcaf7315a96b21990d2b51f13651e11c20a7e9814134bcfa31a88a7f087f5
3  
-DIST eix-0.25.3.tar.xz 432360 SHA256 b0fcbdf4e1184ca9996f8cfd057e27b159cca3cece17b4158dcd3b0068b28353
4 2
 DIST eix-0.26.1.tar.xz 496620 SHA256 76ea8fd0a4cba29d34b20d7dc547ea171c2974e6b91885df7afa92a2cb3a69df SHA512 0e43791608a5fd7805ea35e03f9d4372fe06d3c48d8fced65f6e00282177cfda565bbe09b7e0549ea60228782a1973b448b0a60508ab06d2e1e3ba9cf0ec2ee0 WHIRLPOOL ce9efcb4623887eebf764f15696fb489f038df5652516e7fcf9cbfe6cee927493b7a300f5cb566ce9c80b61161da7e45332c14bb3133b3e94a59d0550cb7b38f
  3
+DIST eix-0.28.1.tar.xz 529116 SHA256 e021e445ada7a678975f26b81cd621ed200f161605cbf42ea2a5ad83e47ea8c4 SHA512 21d51ff7920e5d028620027edead5b6c274f3e8adc07dfae9aa78ffa9c994db24f161e1f34e229972a350f8b02dd6d92104ae355b274eb60569ce91e28623b1b WHIRLPOOL 7702c5fcc0f11a2cff474bf1a98bbd9752a34c6f228258a9afcdedb6f60e3659c4322336b60de202730a0705ac03874104e740e4ce150c60dbaa6c4d133aafab
45  app-portage/eix/eix-0.23.9.ebuild
... ...
@@ -1,45 +0,0 @@
1  
-# Distributed under the terms of the GNU General Public License v2
2  
-
3  
-EAPI=4
4  
-
5  
-inherit eutils multilib bash-completion-r1
6  
-
7  
-DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
8  
-HOMEPAGE="http://eix.berlios.de"
9  
-SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
10  
-
11  
-LICENSE="GPL-2"
12  
-SLOT="0"
13  
-KEYWORDS="*"
14  
-IUSE="debug doc nls optimization security strong-optimization sqlite tools zsh-completion"
15  
-
16  
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
17  
-	nls? ( virtual/libintl )
18  
-	zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
19  
-DEPEND="${RDEPEND}
20  
-	app-arch/xz-utils
21  
-	nls? ( sys-devel/gettext )"
22  
-
23  
-src_prepare() {
24  
-	epatch "${FILESDIR}/${P}-disable-rsync.patch"
25  
-}
26  
-
27  
-src_configure() {
28  
-	econf $(use_with sqlite) $(use_with doc extra-doc) \
29  
-		$(use_with zsh-completion) \
30  
-		$(use_enable nls) $(use_enable tools separate-tools) \
31  
-		$(use_enable security) $(use_enable optimization) \
32  
-		$(use_enable strong-optimization) $(use_enable debug debugging) \
33  
-		$(use_with prefix always-accept-keywords) \
34  
-		--without-bzip2 \
35  
-		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
36  
-		--with-portage-rootpath="${ROOTPATH}" \
37  
-		--with-eprefix-default="${EPREFIX}" \
38  
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
39  
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
40  
-}
41  
-
42  
-src_install() {
43  
-	default
44  
-	dobashcomp bash/eix
45  
-}
26  app-portage/eix/eix-0.25.3.ebuild → app-portage/eix/eix-0.28.1.ebuild
... ...
@@ -1,8 +1,9 @@
1 1
 # Distributed under the terms of the GNU General Public License v2
2 2
 
3  
-EAPI=4
  3
+EAPI=5
4 4
 
5  
-inherit eutils multilib bash-completion-r1
  5
+PLOCALES="de ru"
  6
+inherit bash-completion-r1 eutils multilib l10n
6 7
 
7 8
 DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
8 9
 HOMEPAGE="http://eix.berlios.de"
@@ -11,27 +12,29 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
11 12
 LICENSE="GPL-2"
12 13
 SLOT="0"
13 14
 KEYWORDS="~*"
14  
-IUSE="debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
  15
+IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
15 16
 
16  
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
17  
-	nls? ( virtual/libintl )
18  
-	zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
  17
+RDEPEND="app-shells/push
  18
+	sqlite? ( >=dev-db/sqlite-3 )
  19
+	nls? ( virtual/libintl )"
19 20
 DEPEND="${RDEPEND}
20 21
 	app-arch/xz-utils
  22
+	clang? ( sys-devel/clang )
21 23
 	nls? ( sys-devel/gettext )"
22 24
 
23 25
 pkg_setup() {
24  
-	if has_version "<${CATEGORY}/${PN}-0.25.3"; then
25  
-	    local eixcache="${EROOT}"/var/cache/${PN}
26  
-	    [[ -f ${eixcache} ]] && rm -f "${eixcache}"
27  
-	fi
  26
+	case " ${REPLACING_VERSIONS}" in
  27
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
  28
+		local eixcache="${EROOT}/var/cache/${PN}"
  29
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
  30
+	esac
28 31
 }
29 32
 
30 33
 src_prepare() {
  34
+	epatch_user
31 35
 	epatch "${FILESDIR}/${P}-disable-rsync.patch"
32 36
 }
33 37
 
34  
-
35 38
 src_configure() {
36 39
 	econf $(use_with sqlite) $(use_with doc extra-doc) \
37 40
 		$(use_with zsh-completion) \
@@ -40,6 +43,7 @@ src_configure() {
40 43
 		$(use_enable strong-optimization) $(use_enable debug debugging) \
41 44
 		$(use_with prefix always-accept-keywords) \
42 45
 		$(use_with dep dep-default) \
  46
+		$(use_with clang nongnu-cxx clang++) \
43 47
 		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
44 48
 		--with-portage-rootpath="${ROOTPATH}" \
45 49
 		--with-eprefix-default="${EPREFIX}" \
138  app-portage/eix/files/eix-0.23.9-disable-rsync.patch
... ...
@@ -1,138 +0,0 @@
1  
-diff -ru eix-0.23.6/src/eix-sync.in eix-0.23.6-norsync/src/eix-sync.in
2  
---- eix-0.23.6/src/eix-sync.in	2012-01-14 07:16:22.000000000 -0500
3  
-+++ eix-0.23.6-norsync/src/eix-sync.in	2012-01-16 11:00:56.478032246 -0500
4  
-@@ -43,13 +43,7 @@
5  
- -d   Only show differences to the previously saved database and exit.
6  
-      Except for executing the !! lines in ${eixsyncconf}
7  
-      this is the same as eix-diff ${eixprevious}.
8  
---s [USER@]SERVER[:DIR] Sync via rsync from SERVER.
9  
--     USER defaults to current user and DIR defaults to PORTDIR.
10  
--     An empty SERVER cancels this option. This option implies -0
11  
- -0   No eix --sync
12  
---2 [USER@]CLIENT[:DIR] Sync via rsync *to* CLIENT after successfull syncing;
13  
--     you should later call eix-sync -u locally on CLIENT.
14  
--     If you already have synced you might want to combine this option with -uU.
15  
- -U   Do not touch the database and omit the hooks after eix-update (@ entries)
16  
-      and do not show differences. This option implies -R
17  
- -u   Update database only and show differences. This is equivalent to -0l@s ""
18  
-@@ -65,8 +59,6 @@
19  
- -t   Use temporary file to save the current database (-d will not be possible).
20  
- -T   Do not measure time
21  
- -q   Be quiet (close stdout)
22  
---w   Run emerge-webrsync instead of emerge --sync.
23  
---W   Run emerge-delta-webrsync instead of emerge --sync.
24  
- -c CMD Run CMD instead of emerge --sync.
25  
- -C OPT Add OPT to the emerge --sync command (or whatever is used instead).
26  
-        This option can be used accumulatively.
27  
-@@ -181,8 +173,6 @@
28  
- 	measure_time=:
29  
- 	metadata=false
30  
- 	skip_sync=false
31  
--	server=''
32  
--	client=''
33  
- 	doupdate=:
34  
- 	synchooks=:
35  
- 	test_for_root=:
36  
-@@ -201,11 +191,9 @@
37  
- do	case "${opt}" in
38  
- 	i) DefaultOpts;;
39  
- 	d) diffonly=:;;
40  
--	s) server="${OPTARG}";;
41  
- 	0) skip_sync=:;;
42  
--	2) client="${OPTARG}";;
43  
- 	U) doupdate=false;;
44  
--	u) nolayman=:; nohooks=:; skip_sync=:; server='';;
45  
-+	u) nolayman=:; nohooks=:; skip_sync=:;;
46  
- 	l) nolayman=:;;
47  
- 	@) nohooks=:;;
48  
- 	S) synchooks=false;;
49  
-@@ -215,8 +203,6 @@
50  
- 	T) measure_time=false;;
51  
- 	q) quiet=:;;
52  
- 	L) Push layman_opt "${OPTARG}";;
53  
--	w) Push -c emergecmd 'emerge-webrsync';;
54  
--	W) Push -c emergecmd 'emerge-delta-webrsync';;
55  
- 	c) Push -c emergecmd "${OPTARG}";;
56  
- 	C) Push emergecmd "${OPTARG}";;
57  
- 	o) Push updatecmd "${OPTARG}";;
58  
-@@ -230,8 +216,6 @@
59  
- done
60  
- opt=''
61  
- ${diffonly} && DiffOnly
62  
--[ -z "${server}" ] || skip_sync=:
63  
--
64  
- ${measure_time} || time_begin=''
65  
- measure_time=false
66  
- case "${time_begin}" in
67  
-@@ -351,34 +335,6 @@
68  
- 	trap ExitAll EXIT HUP INT TERM
69  
- }
70  
- 
71  
--preprsync=false
72  
--PrepRsync() {
73  
--	GetPortdir
74  
--	hostdir="${1#*:}"
75  
--	if [ -n "${hostdir}" ] && [ "${hostdir}" != "${1}" ]
76  
--	then	hostdir="${1}"
77  
--	else	hostdir="${1%%:*}:${local_portdir}"
78  
--	fi
79  
--	hostdir="${hostdir%/}/"
80  
--	${preprsync} || [ -n "${rsync_opts}" ] && return
81  
--	ReadVar portage_rsync_opts PORTAGE_RSYNC_OPTS || \
82  
--		portage_rsync_opts="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
83  
--	ReadVar portage_rsync_extra_opts PORTAGE_RSYNC_EXTRA_OPTS
84  
--	case "${-}" in
85  
--	*f*)	eval "set -- ${before_rsync}";;
86  
--	*)	set -f
87  
--		eval "set -- ${before_rsync}"
88  
--		set +f;;
89  
--	esac
90  
--	for curr_cmd
91  
--	do	c=`eval "${curr_cmd}"` || \
92  
--			die "`eval_gettext '${curr_cmd} failed'`"
93  
--		eval "${c}"
94  
--	done
95  
--	rsync_opts="${portage_rsync_opts} ${portage_rsync_extra_opts} --exclude=/.unionfs"
96  
--	preprsync=:
97  
--}
98  
--
99  
- ClearCache() {
100  
- 	${clearcache} || return 0
101  
- 	# Cleaning old cache
102  
-@@ -397,28 +353,11 @@
103  
- }
104  
- 
105  
- CallEmergeSync() {
106  
--	if [ -n "${server}" ]
107  
--	then	${emulatemode} && return
108  
--		PrepRsync "${server}"
109  
--		MyRunCommand "rsyncing from ${hostdir}" -t sync \
110  
--		rsync ${rsync_opts} -- "${hostdir}" "${local_portdir}" || \
111  
--			die "`eval_gettext 'Could not rsync from ${hostdir}'`"
112  
--		return
113  
--	fi
114  
- 	${skip_sync} && return
115  
- 	RootTest
116  
- 	MyVarCommand "${emergecmd}" -t sync
117  
- }
118  
- 
119  
--CallSyncClient() {
120  
--	${emulatemode} && return
121  
--	[ -z "${client}" ] && return
122  
--	PrepRsync "${client}"
123  
--	MyRunCommand "`eval_gettext 'rsyncing to ${hostdir}'`" -t client \
124  
--		rsync ${rsync_opts} -- "${local_portdir}" "${hostdir}" || \
125  
--			die "`eval_gettext 'Could not rsync to ${hostdir}'`"
126  
--}
127  
--
128  
- CallEmergeMetadata() {
129  
- 	${doupdate} && ${metadata} || return 0
130  
- 	RootTest
131  
-@@ -491,7 +430,6 @@
132  
- 	ExecuteConfig 'sync'
133  
- 	CallEmergeSync
134  
- 	${synchooks} && DoHook "${after_sync}"
135  
--	CallSyncClient
136  
- 	CallEmergeMetadata
137  
- 	UpdateDiff
138  
- }
41  app-portage/eix/files/eix-0.25.3-disable-rsync.patch → app-portage/eix/files/eix-0.28.1-disable-rsync.patch
... ...
@@ -1,6 +1,6 @@
1  
-diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
2  
---- eix-0.25.3/src/eix-sync.in	2012-03-12 20:21:33.000000000 +0200
3  
-+++ eix-0.25.3-fixed/src/eix-sync.in	2012-03-17 09:06:51.000000000 +0200
  1
+diff -Nuar eix-0.26.1/src/eix-sync.in eix-0.26.1-fixed/src/eix-sync.in
  2
+--- eix-0.26.1/src/eix-sync.in	2012-05-17 15:39:18.000000000 +0300
  3
++++ eix-0.26.1-fixed/src/eix-sync.in	2012-08-17 21:31:13.000000000 +0300
4 4
 @@ -40,13 +40,7 @@
5 5
  The following options are available:
6 6
  
@@ -9,7 +9,7 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
9 9
 -     USER defaults to current user and DIR defaults to PORTDIR.
10 10
 -     An empty SERVER cancels this option. This option implies -0
11 11
  -0   No eix --sync
12  
---2 [USER@]CLIENT[:DIR] Sync via rsync *to* CLIENT after successfull syncing;
  12
+--2 [USER@]CLIENT[:DIR] Sync via rsync *to* CLIENT after successful syncing;
13 13
 -     you should later call eix-sync -u locally on CLIENT.
14 14
 -     If you already have synced you might want to combine this option with -uU.
15 15
  -U   Do not touch the database and omit the hooks after eix-update (@ entries)
@@ -28,11 +28,11 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
28 28
  	measure_time=:
29 29
  	metadata=false
30 30
  	skip_sync=false
31  
--	server=''
32  
--	client=''
  31
+-	server=
  32
+-	client=
33 33
  	doupdate=:
34 34
  	synchooks=:
35  
- 	FATAL_HOOKS=''
  35
+ 	FATAL_HOOKS=
36 36
 @@ -220,14 +210,10 @@
37 37
  while getopts 'is:02:UuFl@SMNtTqwWL:c:C:o:rRHh?' opt
38 38
  do	case ${opt} in
@@ -43,22 +43,13 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
43 43
  	U)	doupdate=false;;
44 44
  	u)	nolayman=:
45 45
 -		nohooks=:
46  
-+		nohooks=:;;
47 46
 -		skip_sync=:
48  
--		server='';;
  47
+-		server=;;
  48
++		nohooks=:;;
49 49
  	F)	FATAL_HOOKS=':';;
50 50
  	l)	nolayman=:;;
51 51
  	'@')	nohooks=:;;
52  
-@@ -251,8 +237,6 @@
53  
- 	esac
54  
- done
55  
- opt=''
56  
--[ -z "${server}" ] || skip_sync=:
57  
--
58  
- ${measure_time} || time_begin=''
59  
- measure_time=false
60  
- 
61  
-@@ -367,38 +351,6 @@
  52
+@@ -367,38 +353,6 @@
62 53
  	trap ExitAll EXIT HUP INT TERM
63 54
  }
64 55
  
@@ -66,12 +57,12 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
66 57
 -PrepRsync() {
67 58
 -	GetPortdir
68 59
 -	hostdir=${1#*:}
69  
--	if [ -n "${hostdir}" ] && [ "${hostdir}" != "${1}" ]
  60
+-	if [ -n "${hostdir:++}" ] && [ "${hostdir}" != "${1}" ]
70 61
 -	then	hostdir=${1}
71 62
 -	else	hostdir="${1%%:*}:${local_portdir}"
72 63
 -	fi
73 64
 -	hostdir="${hostdir%/}/"
74  
--	${preprsync} || [ -n "${rsync_opts}" ] && return
  65
+-	${preprsync} || [ -n "${rsync_opts:++}" ] && return
75 66
 -	ReadVar portage_rsync_opts PORTAGE_RSYNC_OPTS || \
76 67
 -		portage_rsync_opts='--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages'
77 68
 -	ReadVar portage_rsync_extra_opts PORTAGE_RSYNC_EXTRA_OPTS
@@ -97,11 +88,11 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
97 88
  ClearCache() {
98 89
  	${clearcache} || return 0
99 90
  	# Cleaning old cache
100  
-@@ -418,25 +370,10 @@
  91
+@@ -418,25 +372,10 @@
101 92
  }
102 93
  
103 94
  CallEmergeSync() {
104  
--	if [ -n "${server}" ]
  95
+-	if [ -n "${server:++}" ]
105 96
 -	then	PrepRsync "${server}"
106 97
 -		MyRunCommand "rsyncing from ${hostdir}" -t sync \
107 98
 -		rsync ${rsync_opts} -- "${hostdir}" "${local_portdir}" || \
@@ -113,7 +104,7 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
113 104
  }
114 105
  
115 106
 -CallSyncClient() {
116  
--	[ -z "${client}" ] && return
  107
+-	[ -z "${client:++}" ] && return
117 108
 -	PrepRsync "${client}"
118 109
 -	MyRunCommand "`eval_gettext 'rsyncing to ${hostdir}'`" -t client \
119 110
 -		rsync ${rsync_opts} -- "${local_portdir}" "${hostdir}" || \
@@ -123,7 +114,7 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
123 114
  CallEmergeMetadata() {
124 115
  	${doupdate} && ${metadata} || return 0
125 116
  	MyVarCommand 'emerge --metadata' -t metadata
126  
-@@ -502,7 +439,6 @@
  117
+@@ -502,7 +441,6 @@
127 118
  	ExecuteConfig 'sync'
128 119
  	CallEmergeSync
129 120
  	${synchooks} && DoHook "${after_sync}"

0 notes on commit 92a87c7

Please sign in to comment.
Something went wrong with that request. Please try again.