Upgrade be-9999.ebuild for new Git-versioned BE repository.

diff --git a/ChangeLog b/ChangeLog
index c77137c2271be282c331ebd97f72b0382a2bf11c..ca2737a019a1ccd10aedd218085747cdf325c692 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+*be-9999 (24 Aug 2010)
+  24 Aug 2010; W. Trevor King <wking@drexel.edu> ChangeLog, be-9999.ebuild, be-9999-docbook2man.patch, be-9999-version.patch :
+  Updated to new Git-versioned BE repository.
+  http://gitorious.org/be/
+  be-9999-version.patch removed.
+
+  03 May 2010; W. Trevor King <wking@drexel.edu> be-9999.ebuild :
+  Ebuild submitted by Enrico Tagliavini <enrico.tagliavini@gmail.com> be-9999.ebuild.
+  http://bugs.gentoo.org/show_bug.cgi?id=303867#c9
+
+  07 Feb 2010; W. Trevor King <wking@drexel.edu> be-9999-version.patch :
+  Don't try to build libbe/_version.py in the BE Makefile.
+  http://bugs.gentoo.org/show_bug.cgi?id=303867#c4
+
 *be-9999 (07 Feb 2010)
   07 Feb 2009; W. Trevor King <wking@drexel.edu> ChangeLog, metadata.xml, be-9999.ebuild, be-9999-docbook2man.patch, be-9999-install-dir.patch :
   - Created ebuild suite for bugs-everywhere (BE) revision

diff --git a/Manifest b/Manifest
index f79fcd8dd0a257bf95180b3fe804239117daf5df..a94213031dac7bc160b2e25527ca78adb058e9e7 100644 (file)
--- a/Manifest
+++ b/Manifest
@@ -1,6 +1,5 @@
-AUX be-9999-docbook2man.patch 291 RMD160 044883ad3d77a4ee68d67b0c89818eab990e5f88 SHA1 ce53e9cfc7ae926276e2f01e603e077174f734de SHA256 7f4691a80a9cc57c3f0453ed43ab59969c44cb011dc79900143273bfc3897b73
+AUX be-9999-docbook2man.patch 309 RMD160 7bc2f5823577369bfadb381319a35b50e829ed8a SHA1 afb9b68f5779e51ab2b76d128c9366c5ea81907b SHA256 d4c1ac8510dec09bd3d2b1e7477801d387b038b1bf46018713ba7b79ec453ef6
 AUX be-9999-install-dir.patch 296 RMD160 f49a07bcbbf96201d3fd021c2d919b5eb61328f4 SHA1 5db1037ca1aaf884f8b2858d897ca72e1afee0d2 SHA256 ff27a7c5b9371571baa43f6a9b0b3ad68504c3cea5b49cf947ee27fb3aa12022
-AUX be-9999-version.patch 306 RMD160 4a83f99118439478527e4a0f0a38db5ffa5b8420 SHA1 621ea01d6c46ba25981a7c687c2d69cafb11b5b0 SHA256 00fb7a2476937393cf976c507d3ff0e7636c31d5bbbef1995f04186a60715a31
-EBUILD be-9999.ebuild 1259 RMD160 45329f91393b9870d889cf22d8c64f42fad1f0e4 SHA1 d3c971deee72605e261bc023ecc235df7e883c99 SHA256 2719a4e1f1ad5e7a72b7610a11f7dec4f91c879106644b6bb4f5006bdecfe299
-MISC ChangeLog 813 RMD160 ca00542d7f60caee7aecb3ad802ad5ba1b01223d SHA1 6154a1d462b694b79a55ad5e0ebaa617c04aef22 SHA256 cde00d8429da7df900e64de038aed61e3ecc91b1c1f6ca4b619da3abdb185d53
+EBUILD be-9999.ebuild 1374 RMD160 73bb8a5a59c64e645fb8b5cd63175a65f6332198 SHA1 5f1a657a9db58e3f2568362d2beec8df0cefafc0 SHA256 f8c1f3a956abf29d84293962be1ad50e9db1c2d6bc09bda0a141b63d6bee2a84
+MISC ChangeLog 1458 RMD160 5011ec4c5f177229859fbced10a3d7fe51852ed3 SHA1 b5b2f70e5053945939eb5c107412f74a5ee5b8c6 SHA256 ea07544bd49b636b660a6fbf821a6d4f8558a8cf08d0b9a31586e4fe20fc3152
 MISC metadata.xml 321 RMD160 f1c228ca9454d018e84c7fa458cd8a1ddb4a22a0 SHA1 a21e5950c45f5bb268ab86c06f2d52c7a95d15fa SHA256 217043d3419af1b60adbd5e4028a57f1b1de1eebbe44afa9befe33faac60db37

diff --git a/be-9999.ebuild b/be-9999.ebuild
index d96806670531650859c0dc9c923fa4ac8b2907c8..58de1936d2ca50bd2c17651721622b7c5426d4c7 100644 (file)
--- a/be-9999.ebuild
+++ b/be-9999.ebuild
@@ -3,14 +3,15 @@
 # $Header: $
 
 EAPI="2"
-NEED_PYTHON=2.6
+PYTHON_DEPEND="*:2.6"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils distutils
 
 if [[ ${PV} == "9999" ]] ; then
-       EBZR_REPO_URI="http://bzr.bugseverywhere.org/${PN}"
-       inherit bzr
+       inherit git
+       EGIT_BRANCH="master"
+       EGIT_REPO_URI="git://gitorious.org/be/be.git"
        SRC_URI=""
 else
        SRC_URI="http://bugseverywhere.org/${PN}/${P}.tar.gz"
@@ -32,7 +33,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
-               bzr_src_unpack
+               git_src_unpack
        else
                unpack ${A}
        fi
@@ -41,22 +42,14 @@ src_unpack() {
 
 src_prepare() {
        epatch "${FILESDIR}/${P}"-install-dir.patch
-       epatch "${FILESDIR}/${P}"-version.patch
        epatch "${FILESDIR}/${P}"-docbook2man.patch
-       if [[ ${PV} == "9999" ]] ; then
-               bzr_src_prepare || die
-               EBZR_BRANCH_DIR="${EBZR_STORE_DIR}/${EBZR_CACHE_DIR}"
-               bzr version-info --format python "${EBZR_BRANCH_DIR}" > \
-                       "${S}/libbe/_version.py" \
-                       || die "Unable to make _verison.py from ${EBZR_BRANCH_DIR}"
-       fi
        distutils_src_prepare
 }
 
 src_compile() {
+       make libbe/_version.py || die "_version.py generation failed"
+       make doc/man/be.1 || die "be.1 generation failed"
        distutils_src_compile
-       docbook2man -o doc doc/be.1.sgml || die "docbook2man failed"
-       mv doc/BE.1 doc/be.1 || die "mv failed"
 }
 
 src_install() {

diff --git a/files/be-9999-docbook2man.patch b/files/be-9999-docbook2man.patch
index 0dff6d269e2e442e2bde3185b567c7cf6f5aea47..3c22d340fa3971d3abc5f4a0cb81960fecfe1263 100644 (file)
--- a/files/be-9999-docbook2man.patch
+++ b/files/be-9999-docbook2man.patch
@@ -1,10 +1,13 @@
 diff -u be/doc/module.mk be-patched/doc/module.mk
---- be/doc/module.mk       2009-11-30 23:11:33.000000000 -0500
-+++ be-patched/doc/module.mk  2009-11-30 21:53:41.000000000 -0500
-@@ -40,4 +40,5 @@
- man: ${manpage_files}
-
+--- be/Makefile       2010-08-26 10:10:00.000000000 -0400
++++ be-patched/Makefile  2010-08-26 10:13:41.000000000 -0400
+@@ -75,7 +75,8 @@
+ man: ${MANPAGE_FILES}
+ 
  %.1: %.1.sgml
 -      docbook-to-man $< > $@
 +      docbook2man $<
 +      mv BE.1 $@
+ 
+ .PHONY: sphinx
+ sphinx:

diff --git a/files/be-9999-version.patch b/files/be-9999-version.patch
deleted file mode 100644 (file)
index 0df3769..0000000
--- a/files/be-9999-version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -u be/Makefile be-patched/Makefile
---- be/Makefile     2009-11-30 20:32:38.000000000 -0500
-+++ be-patched/Makefile     2010-02-07 09:09:17.000000000 -0500
-@@ -64,6 +64,5 @@
- clean:
-       $(RM) -rf ${GENERATED_FILES}
- 
--.PHONY: libbe/_version.py
- libbe/_version.py:
-       bzr version-info --format python > $@