Gentoo Overlay for Bazaar

Merge lp:~gagern/bzr-gentoo-overlay/vimdiff into lp:bzr-gentoo-overlay

  1. vimdiff
  2. Merge into overlay-main
Proposed by Martin von Gagern
Status: Merged
Approved by: Christian Faulhammer
Approved revision: 380
Merged at revision: 375
Proposed branch: lp:~gagern/bzr-gentoo-overlay/vimdiff
Merge into: lp:bzr-gentoo-overlay
Diff against target: 33 lines (+14/-4)
2 files modified
dev-vcs/bzr-vimdiff/Manifest (+1/-1)
dev-vcs/bzr-vimdiff/bzr-vimdiff-9999.ebuild (+13/-3)
To merge this branch: bzr merge lp:~gagern/bzr-gentoo-overlay/vimdiff
Reviewer Review Type Date Requested Status
Christian Faulhammer Approve
Review via email: mp+70673@code.launchpad.net

Description of the change

Let's fix bug #783669, it has been open way too long!

To post a comment you must log in.
Revision history for this message
Christian Faulhammer (fauli) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dev-vcs/bzr-vimdiff/Manifest'
2--- dev-vcs/bzr-vimdiff/Manifest 2010-11-27 11:11:12 +0000
3+++ dev-vcs/bzr-vimdiff/Manifest 2011-08-07 15:47:29 +0000
4@@ -1,2 +1,2 @@
5-EBUILD bzr-vimdiff-9999.ebuild 699 RMD160 2ff718fb23d0aafc97b7869c36e5a5c942ef1bd6 SHA1 1002b36846eb46dadc0d0e3fa69a4a31a1c5c839 SHA256 3aac6d0f55efbbe51b161326d0e3b68c0c028318227af5b46ba3905adbcefc33
6+EBUILD bzr-vimdiff-9999.ebuild 876 RMD160 5eb66292105308a558fe315ea0fb3c5beeaac0f1 SHA1 42963b2330ba98eadd6b0d43aaeb82bcf147ffc7 SHA256 81332b7805a72afbbf7a9ebafbe60be9588ee6a2afc11c36bbee9986cf202f59
7 MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4
8
9=== modified file 'dev-vcs/bzr-vimdiff/bzr-vimdiff-9999.ebuild'
10--- dev-vcs/bzr-vimdiff/bzr-vimdiff-9999.ebuild 2010-11-27 11:11:12 +0000
11+++ dev-vcs/bzr-vimdiff/bzr-vimdiff-9999.ebuild 2011-08-07 15:47:29 +0000
12@@ -28,8 +28,18 @@
13 S="${WORKDIR}"/${P}
14
15 src_install() {
16- python_version
17- insinto /usr/lib/python${PYVER}/site-packages/bzrlib/plugins/vimdiff
18- doins __init__.py || die
19+ bzr-vimdiff_install() {
20+ insinto "$(python_get_sitedir)"/bzrlib/plugins/vimdiff || die
21+ doins __init__.py || die
22+ }
23+ python_execute_function bzr-vimdiff_install
24 dodoc README || die
25 }
26+
27+pkg_postinst() {
28+ python_mod_optimize bzrlib/plugins/vimdiff
29+}
30+
31+pkg_postrm() {
32+ python_mod_cleanup bzrlib/plugins/vimdiff
33+}

Subscribers

People subscribed via source and target branches