app-portage/layman: Integrate fix for bug #306143
authorSebastian Pipping <sping@gentoo.org>
Sun, 21 Feb 2010 16:10:00 +0000 (16:10 +0000)
committerSebastian Pipping <sping@gentoo.org>
Sun, 21 Feb 2010 16:10:00 +0000 (16:10 +0000)
Package-Manager: portage-2.2_rc61/cvs/Linux i686

app-portage/layman/ChangeLog
app-portage/layman/Manifest
app-portage/layman/files/layman-1.3.2-missing-import.patch [new file with mode: 0644]
app-portage/layman/layman-1.3.2-r1.ebuild [moved from app-portage/layman/layman-1.3.2.ebuild with 95% similarity]

index 1919aa0911ac6dda7f2bf77ccc1384cf03ff0fb1..9fbbd0c70e271d74975875cd582d9ef14c77bb43 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.101 2010/02/20 21:11:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.102 2010/02/21 16:09:59 sping Exp $
+
+*layman-1.3.2-r1 (21 Feb 2010)
+
+  21 Feb 2010; Sebastian Pipping <sping@gentoo.org> -layman-1.3.2.ebuild,
+  +layman-1.3.2-r1.ebuild, +files/layman-1.3.2-missing-import.patch:
+  Integrate fix for bug #306143
 
 *layman-1.3.2 (20 Feb 2010)
 
index 6b9a9a4070ab86040ec5a51966f2e1ad478c0453..5a013581392b886e4628af74b3762f0cfb2847d7 100644 (file)
@@ -4,6 +4,7 @@ AUX layman-1.3.0-cvs-fix.patch 2022 RMD160 7efb359ae59751eeb8aba33bd7a0d98be1e09
 AUX layman-1.3.0_rc1-fix-sync-warnings.patch 1833 RMD160 d88916feb525e9c1f186cf827ab430f09b2b8625 SHA1 62d0651ef8527542456ab64b2bf123e7bfb1ab86 SHA256 2641db7fe7400fe1120ecbb98ec5d3359fb3e4e794069b5b3925d33550c48996
 AUX layman-1.3.0_rc1-refactoring-fix.patch 1943 RMD160 5ab158a8a1c188202648d761e06deb8ddac4d4ae SHA1 bca50413f863268f5f7baa48aaedf831c47b1eaf SHA256 7c4ce26bd645f941a903b2bf7c6117e7d2f2e3bcab02bddd0a6907e6d0543762
 AUX layman-1.3.0_rc1-sync-fix.patch 4079 RMD160 ba27046d36ccf2114e329d709ef7a1b141f28f54 SHA1 422776213e131146c8a05595b5ae1d1250d1b724 SHA256 15ecf0cac3101e3ea6c22ce916c437d121b42cc8359b9d06c969b6790a1dc997
+AUX layman-1.3.2-missing-import.patch 1407 RMD160 5d7ca594a3ec418b63fba4a135ca7c6a3eeddbd2 SHA1 169edfb71229fbe0148f4cce225ba4d7663bbeeb SHA256 98ea403f6c71de94c4d0d0ec18a165e59da9a4a622582dd0b2139b4c53ddb30a
 DIST layman-1.1.1.tar.gz 46122 RMD160 ef0277455acef5963780dc83c9dd7a24a828d2dd SHA1 c0f7108463fedd0b2d7b350fb4cebbcff4c505ff SHA256 725cf36a5b728dfde707dad3d9d2045b282586021de53518daeb2a6a67b61f2b
 DIST layman-1.2.3.tar.gz 46673 RMD160 f05e1b2cfdf4a3f47bff59116b947cde53af4a0b SHA1 3e80ddba7af177ca5e4b57fd77af1c4540f15458 SHA256 c00ff923b6d097f335c020bc9ee51bf80b41ab7f95450a7cf57614fa8176622a
 DIST layman-1.2.4.tar.gz 47713 RMD160 00e7ede7036207bbe40578b1b080297c6562e2dc SHA1 7b55dd04e148e449421e379285f827bd04e2cea4 SHA256 74a5e94dd39e6a45265b402f1ec9ccb0ab61d54a58ab67e8ad6564506cc1eb3f
@@ -22,7 +23,7 @@ EBUILD layman-1.3.0-r1.ebuild 2700 RMD160 99f90d031364b68cc883a7c40b444e9760a2a5
 EBUILD layman-1.3.0.ebuild 2499 RMD160 2547fe45eb5156be79e63c660c28e330a720e4b6 SHA1 b457f0822830e7c784e320c1f22d7efd789ee828 SHA256 22d776672b2261737af75049228890d8c1cde9fee16591abe9ad344deedcccad
 EBUILD layman-1.3.0_rc1-r3.ebuild 2678 RMD160 f5cd9446ade62611c67910a4d8784105b98672ec SHA1 383eb6be392609b9dc1a71fb84c72af24521f5e9 SHA256 6b7ca2cbb5e71916713fc6f9fb322491130033f004ca5150cb998b2b1eb3ccb5
 EBUILD layman-1.3.1.ebuild 2637 RMD160 01d994efdf393c1dfbb7ec12339a302d1ab0f080 SHA1 37b5dbee7d832a47c359109a00f1df523f097eea SHA256 9d7ad3da1cdac0fbc47d64d6a702d57ac8b51d34bf40b2db1fcd16c2116088a6
-EBUILD layman-1.3.2.ebuild 2637 RMD160 62aac1367a681a6b52d6ef1ae0269ea8b7b817e1 SHA1 feed433daf6f53de0e3bea8d30e2f0fe3ddacdb6 SHA256 b75858bfd676e9691cf23bfa764b3f5d8eee330126a23176127a1927234822ff
+EBUILD layman-1.3.2-r1.ebuild 2707 RMD160 3b685c7eda74f653cf229ba6119dd8b8a3f27edc SHA1 721c5f5a67b71ea89273edd58d9e5d0d2f99083b SHA256 e523d45073446c7ff1ef1800292cee72122595f335dafb247a49502a3ebf9fa0
 EBUILD layman-9999.ebuild 2713 RMD160 15d19bcb3c2806c46904cc913ba488d462f0401d SHA1 9ba2bef239fef1812c4dc5202a24a24ebde53ecf SHA256 4ddb97e9158705394ed32c8202d7c1b6b96cfeb74932cc112cca99ae86309037
-MISC ChangeLog 13917 RMD160 7447ef1f6fc1d8212da751ac7bef5cd4fc683115 SHA1 a9b04fe48c9d3d8b2257d2ffc35407549c547d42 SHA256 bfbcdc283d01a3f668d6835b5593ddbfc89b08f7fa25d2a2fd4c517f56be1f5a
+MISC ChangeLog 14125 RMD160 ec88dfb60d6dd7def453f196956c2c001156d0a5 SHA1 d2d09c888a6aecc499893c7676beb10754b86df0 SHA256 02cce23ec54d83bc52b84e1b9b0b97d018759fb56a89f10353782fafef304de7
 MISC metadata.xml 626 RMD160 f9348e182d74037b57c2ab91afbbcf26427966f2 SHA1 eea7ec248890e8a7c9e40bedf47638b01d17dd55 SHA256 380d1e68b2dbae6f3efdd93e02c38f10b332728a127bd01ce1584be21ca6422b
diff --git a/app-portage/layman/files/layman-1.3.2-missing-import.patch b/app-portage/layman/files/layman-1.3.2-missing-import.patch
new file mode 100644 (file)
index 0000000..f192dfd
--- /dev/null
@@ -0,0 +1,53 @@
+From 806b99591eaab8f398988dfc4f2a2452738dd622 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 21 Feb 2010 17:02:24 +0100
+Subject: [PATCH] Fix missing import
+
+---
+ doc/layman.8.xml   |    2 +-
+ layman/makeconf.py |    2 ++
+ layman/version.py  |    2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/doc/layman.8.xml b/doc/layman.8.xml
+index 246c83d..dc9cc38 100644
+--- a/doc/layman.8.xml
++++ b/doc/layman.8.xml
+@@ -197,7 +197,7 @@
+       <title>layman</title>
+       <date>January 2010</date>
+       <productname>layman</productname>
+-      <productnumber>1.3.2</productnumber>
++      <productnumber>1.3.2_p1</productnumber>
+       <copyright>
+         <year>2005-2009</year>
+         <holder>Gunnar Wrobel</holder>
+diff --git a/layman/makeconf.py b/layman/makeconf.py
+index 4bb70b5..fdd10c4 100644
+--- a/layman/makeconf.py
++++ b/layman/makeconf.py
+@@ -19,6 +19,8 @@ import os
+ import codecs
+ import re
+ 
++from layman.utils import path
++
+ #===============================================================================
+ #
+ # Helper class MakeConf
+diff --git a/layman/version.py b/layman/version.py
+index 631ffcc..c42c7f9 100644
+--- a/layman/version.py
++++ b/layman/version.py
+@@ -20,7 +20,7 @@
+ __version__ = "$Id: layman-1.3.2-missing-import.patch,v 1.1 2010/02/21 16:10:00 sping Exp $"
+ 
+ 
+-VERSION = '1.3.2'
++VERSION = '1.3.2_p1'
+ 
+ if __name__ == '__main__':
+     print VERSION
+-- 
+1.6.6
+
similarity index 95%
rename from app-portage/layman/layman-1.3.2.ebuild
rename to app-portage/layman/layman-1.3.2-r1.ebuild
index d42fe00ab25b689514feb9ca620ace31cbcc3636..f852b90a65e0bf3ed7bf21304dc0168cf827f715 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.2.ebuild,v 1.1 2010/02/20 21:11:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/layman-1.3.2-r1.ebuild,v 1.1 2010/02/21 16:09:59 sping Exp $
 
 EAPI="2"
 NEED_PYTHON=2.5
@@ -34,6 +34,10 @@ RDEPEND="${COMMON_DEPS}
        )"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-missing-import.patch
+}
+
 pkg_setup() {
        if ! has_version dev-util/subversion; then
                ewarn "You do not have dev-util/subversion installed!"