FL-336: eix version bump

app-portage/eix/Manifest

@@ -1,4 +1,3 @@
 DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0bf5b980afda65ea207b356
-DIST eix-0.23.9.tar.xz 437468 SHA256 194bcaf7315a96b21990d2b51f13651e11c20a7e9814134bcfa31a88a7f087f5
-DIST eix-0.25.3.tar.xz 432360 SHA256 b0fcbdf4e1184ca9996f8cfd057e27b159cca3cece17b4158dcd3b0068b28353
 DIST eix-0.26.1.tar.xz 496620 SHA256 76ea8fd0a4cba29d34b20d7dc547ea171c2974e6b91885df7afa92a2cb3a69df SHA512 0e43791608a5fd7805ea35e03f9d4372fe06d3c48d8fced65f6e00282177cfda565bbe09b7e0549ea60228782a1973b448b0a60508ab06d2e1e3ba9cf0ec2ee0 WHIRLPOOL ce9efcb4623887eebf764f15696fb489f038df5652516e7fcf9cbfe6cee927493b7a300f5cb566ce9c80b61161da7e45332c14bb3133b3e94a59d0550cb7b38f
+DIST eix-0.28.1.tar.xz 529116 SHA256 e021e445ada7a678975f26b81cd621ed200f161605cbf42ea2a5ad83e47ea8c4 SHA512 21d51ff7920e5d028620027edead5b6c274f3e8adc07dfae9aa78ffa9c994db24f161e1f34e229972a350f8b02dd6d92104ae355b274eb60569ce91e28623b1b WHIRLPOOL 7702c5fcc0f11a2cff474bf1a98bbd9752a34c6f228258a9afcdedb6f60e3659c4322336b60de202730a0705ac03874104e740e4ce150c60dbaa6c4d133aafab

app-portage/eix/eix-0.25.3.ebuild → app-portage/eix/eix-0.28.1.ebuild

@@ -1,8 +1,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=5
 
-inherit eutils multilib bash-completion-r1
+PLOCALES="de ru"
+inherit bash-completion-r1 eutils multilib l10n
 
 DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
 HOMEPAGE="http://eix.berlios.de"
@@ -11,27 +12,29 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~*"
-IUSE="debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
+IUSE="clang debug +dep doc nls optimization security strong-optimization sqlite tools zsh-completion"
 
-RDEPEND="sqlite? ( >=dev-db/sqlite-3 )
-	nls? ( virtual/libintl )
-	zsh-completion? ( !!<app-shells/zsh-completion-20091203-r1 )"
+RDEPEND="app-shells/push
+	sqlite? ( >=dev-db/sqlite-3 )
+	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
+	clang? ( sys-devel/clang )
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-	if has_version "<${CATEGORY}/${PN}-0.25.3"; then
-	    local eixcache="${EROOT}"/var/cache/${PN}
-	    [[ -f ${eixcache} ]] && rm -f "${eixcache}"
-	fi
+	case " ${REPLACING_VERSIONS}" in
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
+		local eixcache="${EROOT}/var/cache/${PN}"
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
+	esac
 }
 
 src_prepare() {
+	epatch_user
 	epatch "${FILESDIR}/${P}-disable-rsync.patch"
 }
 
-
 src_configure() {
 	econf $(use_with sqlite) $(use_with doc extra-doc) \
 		$(use_with zsh-completion) \
@@ -40,6 +43,7 @@ src_configure() {
 		$(use_enable strong-optimization) $(use_enable debug debugging) \
 		$(use_with prefix always-accept-keywords) \
 		$(use_with dep dep-default) \
+		$(use_with clang nongnu-cxx clang++) \
 		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
 		--with-portage-rootpath="${ROOTPATH}" \
 		--with-eprefix-default="${EPREFIX}" \

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 @@
-diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
---- eix-0.25.3/src/eix-sync.in	2012-03-12 20:21:33.000000000 +0200
-+++ eix-0.25.3-fixed/src/eix-sync.in	2012-03-17 09:06:51.000000000 +0200
+diff -Nuar eix-0.26.1/src/eix-sync.in eix-0.26.1-fixed/src/eix-sync.in
+--- eix-0.26.1/src/eix-sync.in	2012-05-17 15:39:18.000000000 +0300
++++ eix-0.26.1-fixed/src/eix-sync.in	2012-08-17 21:31:13.000000000 +0300
 @@ -40,13 +40,7 @@
  The following options are available:
 
@@ -9,7 +9,7 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
 -     USER defaults to current user and DIR defaults to PORTDIR.
 -     An empty SERVER cancels this option. This option implies -0
  -0   No eix --sync
---2 [USER@]CLIENT[:DIR] Sync via rsync *to* CLIENT after successfull syncing;
+--2 [USER@]CLIENT[:DIR] Sync via rsync *to* CLIENT after successful syncing;
 -     you should later call eix-sync -u locally on CLIENT.
 -     If you already have synced you might want to combine this option with -uU.
  -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
  	measure_time=:
  	metadata=false
  	skip_sync=false
--	server=''
--	client=''
+-	server=
+-	client=
  	doupdate=:
  	synchooks=:
- 	FATAL_HOOKS=''
+ 	FATAL_HOOKS=
 @@ -220,14 +210,10 @@
  while getopts 'is:02:UuFl@SMNtTqwWL:c:C:o:rRHh?' opt
  do	case ${opt} in
@@ -43,35 +43,26 @@ diff -Nuar eix-0.25.3/src/eix-sync.in eix-0.25.3-fixed/src/eix-sync.in
  	U)	doupdate=false;;
  	u)	nolayman=:
 -		nohooks=:
-+		nohooks=:;;
 -		skip_sync=:
--		server='';;
+-		server=;;
++		nohooks=:;;
  	F)	FATAL_HOOKS=':';;
  	l)	nolayman=:;;
  	'@')	nohooks=:;;
-@@ -251,8 +237,6 @@
- 	esac
- done
- opt=''
--[ -z "${server}" ] || skip_sync=:
--
- ${measure_time} || time_begin=''
- measure_time=false
-
-@@ -367,38 +351,6 @@
+@@ -367,38 +353,6 @@
  	trap ExitAll EXIT HUP INT TERM
  }
 
 -preprsync=false
 -PrepRsync() {
 -	GetPortdir
 -	hostdir=${1#*:}
--	if [ -n "${hostdir}" ] && [ "${hostdir}" != "${1}" ]
+-	if [ -n "${hostdir:++}" ] && [ "${hostdir}" != "${1}" ]
 -	then	hostdir=${1}
 -	else	hostdir="${1%%:*}:${local_portdir}"
 -	fi
 -	hostdir="${hostdir%/}/"
--	${preprsync} || [ -n "${rsync_opts}" ] && return
+-	${preprsync} || [ -n "${rsync_opts:++}" ] && return
 -	ReadVar portage_rsync_opts PORTAGE_RSYNC_OPTS || \
 -		portage_rsync_opts='--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages'
 -	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
  ClearCache() {
  	${clearcache} || return 0
  	# Cleaning old cache
-@@ -418,25 +370,10 @@
+@@ -418,25 +372,10 @@
  }
 
  CallEmergeSync() {
--	if [ -n "${server}" ]
+-	if [ -n "${server:++}" ]
 -	then	PrepRsync "${server}"
 -		MyRunCommand "rsyncing from ${hostdir}" -t sync \
 -		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
  }
 
 -CallSyncClient() {
--	[ -z "${client}" ] && return
+-	[ -z "${client:++}" ] && return
 -	PrepRsync "${client}"
 -	MyRunCommand "`eval_gettext 'rsyncing to ${hostdir}'`" -t client \
 -		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
  CallEmergeMetadata() {
  	${doupdate} && ${metadata} || return 0
  	MyVarCommand 'emerge --metadata' -t metadata
-@@ -502,7 +439,6 @@
+@@ -502,7 +441,6 @@
  	ExecuteConfig 'sync'
  	CallEmergeSync
  	${synchooks} && DoHook "${after_sync}"