| 1 |
commit: d45f887da2b566d66580723fc4fb1581741f06bf |
| 2 |
Author: Tiziano Müller <tm <AT> dev-zero <DOT> ch> |
| 3 |
AuthorDate: Mon Nov 21 06:21:57 2011 +0000 |
| 4 |
Commit: Tiziano Müller <dev-zero <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 21 06:24:23 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dev-zero.git;a=commit;h=d45f887d |
| 7 |
|
| 8 |
merged changes from gentoo-x86 ebuild |
| 9 |
|
| 10 |
--- |
| 11 |
app-portage/etc-proposals/Manifest | 6 +++--- |
| 12 |
.../etc-proposals/etc-proposals-1.4.3-r2.ebuild | 11 +++++++++-- |
| 13 |
2 files changed, 12 insertions(+), 5 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-portage/etc-proposals/Manifest b/app-portage/etc-proposals/Manifest |
| 16 |
index b322656..9985984 100644 |
| 17 |
--- a/app-portage/etc-proposals/Manifest |
| 18 |
+++ b/app-portage/etc-proposals/Manifest |
| 19 |
@@ -1,5 +1,5 @@ |
| 20 |
-MISC ChangeLog 1789 RMD160 819bda00014182afa2cb3cf20b4801eb979624bb SHA1 1e02be4fbd11382548dacdc8a4ad7de96b55c6b1 SHA256 7c3f87f468da46ac5e508f3e51f397129deb909e6da59c66a3f56be0d1fd4759 |
| 21 |
-EBUILD etc-proposals-1.4.3-r2.ebuild 1352 RMD160 54472b69f90b5d4cb7f795ddbedae381b1567668 SHA1 44d470ae2d820e8a463271cd2df8de4761054bb7 SHA256 71e65eeb5862aea07b074ee6f77836244dffaa4f42193c95e37299b923f4fc96 |
| 22 |
AUX 1.4.3-paludis.patch 1050 RMD160 36c60e0fe7b6503a673092608446ae09ef3e48d6 SHA1 41bd1dc70dc2130a0047e4ee8fdb015dc8357918 SHA256 1476570f8d849f6be96db3e1d5937d3087d268590f626d04625a2a029d37a8cf |
| 23 |
-MISC metadata.xml 256 RMD160 7ba7e5dfce95b75377cf4a30745dcc4dbde95086 SHA1 f94dd3063baa0db02c98317f36dc243ffd2bbb50 SHA256 f4325cb611d6c7b7e2f87f8c89d325eb086df309605b53de578d6f8bc62b07ae |
| 24 |
DIST etc-proposals-1.4.3.tar.gz 53696 RMD160 991d77b5e63c5a61189e2f8e6add0f7c56b3915e SHA1 1137556dc28a5e03bb37f06a691ae780daed988e SHA256 42c2b117e141d0e69a8717e98e9ddc9dffd2ed27533c6296e87e810c631e71c7 |
| 25 |
+EBUILD etc-proposals-1.4.3-r2.ebuild 1470 RMD160 ff3ad9dcdce6d65768777a3a45cd122dcb6df4ea SHA1 32de2448ac690104867cd688bde278fee6f7af34 SHA256 b8de19099f397658c7aaba8034da30b94f5cd3b3d108cda0e76a562fb64590e6 |
| 26 |
+MISC ChangeLog 1789 RMD160 819bda00014182afa2cb3cf20b4801eb979624bb SHA1 1e02be4fbd11382548dacdc8a4ad7de96b55c6b1 SHA256 7c3f87f468da46ac5e508f3e51f397129deb909e6da59c66a3f56be0d1fd4759 |
| 27 |
+MISC metadata.xml 256 RMD160 7ba7e5dfce95b75377cf4a30745dcc4dbde95086 SHA1 f94dd3063baa0db02c98317f36dc243ffd2bbb50 SHA256 f4325cb611d6c7b7e2f87f8c89d325eb086df309605b53de578d6f8bc62b07ae |
| 28 |
|
| 29 |
diff --git a/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild b/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild |
| 30 |
index df558cf..50d842e 100644 |
| 31 |
--- a/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild |
| 32 |
+++ b/app-portage/etc-proposals/etc-proposals-1.4.3-r2.ebuild |
| 33 |
@@ -1,4 +1,4 @@ |
| 34 |
-# Copyright 1999-2010 Gentoo Foundation |
| 35 |
+# Copyright 1999-2011 Gentoo Foundation |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
# $Header: $ |
| 38 |
|
| 39 |
@@ -21,10 +21,16 @@ DEPEND="gtk? ( >=dev-python/pygtk-2.10 ) |
| 40 |
qt4? ( >=dev-python/PyQt4-4.1.1[X] )" |
| 41 |
RDEPEND="${DEPEND}" |
| 42 |
|
| 43 |
+PYTHON_MODNAME="etcproposals" |
| 44 |
+ |
| 45 |
src_prepare() { |
| 46 |
+ epatch "${FILESDIR}/${PV}-paludis.patch" |
| 47 |
distutils_src_prepare |
| 48 |
+} |
| 49 |
|
| 50 |
- epatch "${FILESDIR}/${PV}-paludis.patch" |
| 51 |
+pkg_setup() { |
| 52 |
+ python_set_active_version 2 |
| 53 |
+ python_pkg_setup |
| 54 |
} |
| 55 |
|
| 56 |
src_install(){ |
| 57 |
@@ -38,6 +44,7 @@ src_install(){ |
| 58 |
} |
| 59 |
|
| 60 |
pkg_postinst() { |
| 61 |
+ distutils_pkg_postinst |
| 62 |
elog "The configuration file has been installed to /etc/etc-proposals.conf" |
| 63 |
elog "If you are installing etc-proposals for the first time or updating" |
| 64 |
elog "from a version < 1.3 you should run the following command once:" |
Archives