Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

FL-790: eix update

  • Loading branch information...
commit fe1774c392ac22da615107c2dead8c4851cde382 1 parent 36aeaac
Oleg authored September 28, 2013
1  app-portage/eix/Manifest
@@ -2,3 +2,4 @@ DIST eix-0.23.10.tar.xz 438336 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0
2 2
 DIST eix-0.26.1.tar.xz 496620 SHA256 76ea8fd0a4cba29d34b20d7dc547ea171c2974e6b91885df7afa92a2cb3a69df SHA512 0e43791608a5fd7805ea35e03f9d4372fe06d3c48d8fced65f6e00282177cfda565bbe09b7e0549ea60228782a1973b448b0a60508ab06d2e1e3ba9cf0ec2ee0 WHIRLPOOL ce9efcb4623887eebf764f15696fb489f038df5652516e7fcf9cbfe6cee927493b7a300f5cb566ce9c80b61161da7e45332c14bb3133b3e94a59d0550cb7b38f
3 3
 DIST eix-0.28.1.tar.xz 529116 SHA256 e021e445ada7a678975f26b81cd621ed200f161605cbf42ea2a5ad83e47ea8c4 SHA512 21d51ff7920e5d028620027edead5b6c274f3e8adc07dfae9aa78ffa9c994db24f161e1f34e229972a350f8b02dd6d92104ae355b274eb60569ce91e28623b1b WHIRLPOOL 7702c5fcc0f11a2cff474bf1a98bbd9752a34c6f228258a9afcdedb6f60e3659c4322336b60de202730a0705ac03874104e740e4ce150c60dbaa6c4d133aafab
4 4
 DIST eix-0.28.2.tar.xz 532260 SHA256 47ad2a8acd5de082beaff5068858012c3d692c907933ac11b353be9e41945af8 SHA512 9f05ecd3f7ca40f8a0f9bab1478e6ab379e60fff1739d5459b7ab2b7e25c00169a387deb6209404119b711719d4d969594b3c38a2be91a93ec590c3220fe3997 WHIRLPOOL 17c30eae37c7d5dfaa82121a92d76260a8b2ea9d4dc1ff9957c9971db3668a088d54689bd798c0f4986cdb5c9b36101edf3c05913432c31424067427b0e0693d
  5
+DIST eix-0.29.4.tar.xz 550292 SHA256 83212f2cb4dfe0bb82dcf5e7620cd21c511bb6a2efecd9b781409adb33905234 SHA512 d40d7db1e789c1a4927dce762c9599d540a0bcfcb3b463add62e94149c34f86eef6cae3d95a0fb65819834c2958e93ec54580f20c5aaf9700b28b30d6849d3eb WHIRLPOOL e0806dbaf7804c14aef266ffc148d72cd64564910adb85f3ba7cc22884a8cae69d6acf6be072938e7ec7482b02475956dc5ac93fe1d727dabd58b1a4a56c765e
71  app-portage/eix/eix-0.29.4.ebuild
... ...
@@ -0,0 +1,71 @@
  1
+# Distributed under the terms of the GNU General Public License v2
  2
+
  3
+EAPI=5
  4
+
  5
+PLOCALES="de ru"
  6
+inherit bash-completion-r1 eutils multilib l10n
  7
+
  8
+DESCRIPTION="Search and query ebuilds, portage incl. local settings, ext. overlays, version changes, and more"
  9
+HOMEPAGE="http://eix.berlios.de"
  10
+SRC_URI="mirror://berlios/${PN}/${P}.tar.xz"
  11
+
  12
+LICENSE="GPL-2"
  13
+SLOT="0"
  14
+KEYWORDS="*"
  15
+IUSE="clang debug +dep doc nls optimization security strong-optimization strong-security sqlite swap-remote tools"
  16
+
  17
+BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )
  18
+	nls? ( virtual/libintl )"
  19
+RDEPEND="${BOTHDEPEND}
  20
+	app-shells/push"
  21
+DEPEND="${BOTHDEPEND}
  22
+	app-arch/xz-utils
  23
+	clang? ( sys-devel/clang )
  24
+	nls? ( sys-devel/gettext )"
  25
+
  26
+pkg_setup() {
  27
+	case " ${REPLACING_VERSIONS}" in
  28
+	*\ 0.[0-9].*|*\ 0.1[0-9].*|*\ 0.2[0-4].*|*\ 0.25.0*)
  29
+		local eixcache="${EROOT}/var/cache/${PN}"
  30
+		test -f "${eixcache}" && rm -f -- "${eixcache}";;
  31
+	esac
  32
+}
  33
+
  34
+src_prepare() {
  35
+	epatch_user
  36
+	epatch "${FILESDIR}/${PN}-disable-rsync.patch"
  37
+}
  38
+
  39
+src_configure() {
  40
+	econf $(use_with sqlite) $(use_with doc extra-doc) \
  41
+		$(use_enable nls) $(use_enable tools separate-tools) \
  42
+		$(use_enable security) $(use_enable optimization) \
  43
+		$(use_enable strong-security) \
  44
+		$(use_enable strong-optimization) $(use_enable debug debugging) \
  45
+		$(use_enable swap-remote) \
  46
+		$(use_with prefix always-accept-keywords) \
  47
+		$(use_with dep dep-default) \
  48
+		$(use_with clang nongnu-cxx clang++) \
  49
+		--with-zsh-completion \
  50
+		--with-ebuild-sh-default="/usr/$(get_libdir)/portage/bin/ebuild.sh" \
  51
+		--with-portage-rootpath="${ROOTPATH}" \
  52
+		--with-eprefix-default="${EPREFIX}" \
  53
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
  54
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
  55
+}
  56
+
  57
+src_install() {
  58
+	default
  59
+	dobashcomp bash/eix
  60
+	keepdir "/var/cache/${PN}"
  61
+	fowners portage:portage "/var/cache/${PN}"
  62
+	fperms 775 "/var/cache/${PN}"
  63
+}
  64
+
  65
+pkg_postinst() {
  66
+	# fowners in src_install doesn't work for owner/group portage:
  67
+	# merging changes this owner/group back to root.
  68
+	use prefix || chown portage:portage "${EROOT}var/cache/${PN}"
  69
+	local obs="${EROOT}var/cache/eix.previous"
  70
+	! test -f "${obs}" || ewarn "Found obsolete ${obs}, please remove it"
  71
+}
119  app-portage/eix/files/eix-disable-rsync.patch
... ...
@@ -0,0 +1,119 @@
  1
+diff -Nuar work/eix-0.29.4/src/eix-sync.in /tmp/work/eix-0.29.4/src/eix-sync.in
  2
+--- work/eix-0.29.4/src/eix-sync.in	2013-07-10 08:44:58.000000000 +0000
  3
++++ /tmp/work/eix-0.29.4/src/eix-sync.in	2013-09-28 03:30:33.582192315 +0000
  4
+@@ -42,13 +42,7 @@
  5
+ -i   Ignore all previous options (useful to ignore ${eixsyncconf} options).
  6
+ -a   Always assume that some tree/overlay changes
  7
+      (set have_changed=: in a !-hook to force this)
  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. This implies -a
  12
+--2 [USER@]CLIENT[:DIR] Sync via rsync *to* CLIENT after successful 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@As ""
  18
+@@ -67,8 +61,6 @@
  19
+ -t   Use temporary file to save the current database (excluding eix-diff later)
  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
+@@ -270,9 +262,7 @@
  28
+ do	case ${opt} in
  29
+ 	i)	DefaultOpts;;
  30
+ 	a)	have_changed=:;;
  31
+-	s)	server=${OPTARG};;
  32
+ 	0)	skip_sync=:;;
  33
+-	2)	client=${OPTARG};;
  34
+ 	U)	doupdate=false;;
  35
+ 	u)	nolayman=:
  36
+ 		nohooks=:
  37
+@@ -290,8 +280,6 @@
  38
+ 	T)	measure_time=false;;
  39
+ 	q)	quiet=:;;
  40
+ 	L)	Push layman_opt "${OPTARG}";;
  41
+-	w)	Push -c emergecmd 'emerge-webrsync';;
  42
+-	W)	Push -c emergecmd 'emerge-delta-webrsync';;
  43
+ 	c)	Push -c emergecmd "${OPTARG}";;
  44
+ 	C)	Push emergecmd "${OPTARG}";;
  45
+ 	o)	Push updatecmd "${OPTARG}";;
  46
+@@ -430,39 +418,6 @@
  47
+ 	trap ExitAll EXIT HUP INT TERM
  48
+ }
  49
+ 
  50
+-preprsync=false
  51
+-PrepRsync() {
  52
+-	GetPortdir
  53
+-	hostdir=${1#*:}
  54
+-	if [ -n "${hostdir:++}" ] && [ "${hostdir}" != "${1}" ]
  55
+-	then	hostdir=${1}
  56
+-	else	hostdir="${1%%:*}:${local_portdir}"
  57
+-	fi
  58
+-	hostdir="${hostdir%/}/"
  59
+-	${preprsync} || [ -n "${rsync_opts:++}" ] && return
  60
+-	ReadVar portage_rsync_opts PORTAGE_RSYNC_OPTS || \
  61
+-		portage_rsync_opts='--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages'
  62
+-	ReadVar portage_rsync_extra_opts PORTAGE_RSYNC_EXTRA_OPTS
  63
+-	case ${-} in
  64
+-	*f*)
  65
+-		eval "set -- ${before_rsync}";;
  66
+-	*)
  67
+-		set -f
  68
+-		eval "set -- ${before_rsync}"
  69
+-		set +f;;
  70
+-	esac
  71
+-	[ ${#} -eq 0 ] || StatusInfo "`gettext 'Running ~-hooks'`"
  72
+-	for curr_cmd
  73
+-	do	if c=`eval "${curr_cmd}"`
  74
+-		then	eval "${c}" || WarnOrDie "`eval_gettext \
  75
+-				'${c} (output of ${curr_cmd}) failed'`"
  76
+-		else	WarnOrDie "`eval_gettext '${curr_cmd} failed'`"
  77
+-		fi
  78
+-	done
  79
+-	rsync_opts="${portage_rsync_opts} ${portage_rsync_extra_opts} --exclude=/.unionfs"
  80
+-	preprsync=:
  81
+-}
  82
+-
  83
+ ClearCache() {
  84
+ 	${clearcache} || return 0
  85
+ 	# Cleaning old cache
  86
+@@ -482,25 +437,10 @@
  87
+ }
  88
+ 
  89
+ CallEmergeSync() {
  90
+-	if [ -n "${server:++}" ]
  91
+-	then	PrepRsync "${server}"
  92
+-		MyRunCommand "rsyncing from ${hostdir}" -t sync \
  93
+-		rsync ${rsync_opts} -- "${hostdir}" "${local_portdir}" || \
  94
+-			die "`eval_gettext 'Could not rsync from ${hostdir}'`"
  95
+-		return
  96
+-	fi
  97
+ 	${skip_sync} && return
  98
+ 	MyVarCommand "${emergecmd}" -t sync
  99
+ }
  100
+ 
  101
+-CallSyncClient() {
  102
+-	[ -z "${client:++}" ] && return
  103
+-	PrepRsync "${client}"
  104
+-	MyRunCommand "`eval_gettext 'rsyncing to ${hostdir}'`" -t client \
  105
+-		rsync ${rsync_opts} -- "${local_portdir}" "${hostdir}" || \
  106
+-			die "`eval_gettext 'Could not rsync to ${hostdir}'`"
  107
+-}
  108
+-
  109
+ CallEmergeMetadata() {
  110
+ 	${doupdate} && ${metadata} || return 0
  111
+ 	MyVarCommand 'emerge --metadata' -t metadata
  112
+@@ -608,7 +548,6 @@
  113
+ 	[ "${previous_timestamp}" != "${current_timestamp}" ] && have_changed=:
  114
+ 	${have_changed} || NotChanged
  115
+ 	${synchooks} && DoHook "${after_sync}" "`gettext 'Running @-hooks'`"
  116
+-	CallSyncClient
  117
+ 	CallEmergeMetadata
  118
+ 	CopyPrevious
  119
+ 	UpdateDiff

0 notes on commit fe1774c

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