[gentoo-commits] repo/gentoo:master commit in: app-admin/github-backup-utils/, app-admin/github-backup-utils/files/

[Austin English]

commit:     1239b5aa9b7fe770adc9c2a7f3b73991cfe2fb2a
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 23:23:07 2017 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 21:29:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1239b5aa

app-admin/github-backup-utils: fix test failures

Gentoo-Bug: https://bugs.gentoo.org/629628
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-admin/github-backup-utils/Manifest             | 24 ++++-----
 .../files/github-backup-utils-python27.patch       | 13 +++++
 .../files/github-backup-utils-tarball-fix.patch    | 39 ++++++++++++++
 .../github-backup-utils-2.10.0-r1.ebuild           | 59 ++++++++++++++++++++++
 .../github-backup-utils-2.11.0-r1.ebuild           | 59 ++++++++++++++++++++++
 .../github-backup-utils-2.11.1-r1.ebuild           | 59 ++++++++++++++++++++++
 .../github-backup-utils-2.11.2-r1.ebuild           | 59 ++++++++++++++++++++++
 .../github-backup-utils-2.9.0-r1.ebuild            | 58 +++++++++++++++++++++
 8 files changed, 358 insertions(+), 12 deletions(-)

diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index f03bbc4ac79..57154e7c7d8 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,12 +1,12 @@
-DIST github-backup-utils-2.10.0.tar.gz 73061 SHA256 08c2f24adcbc1554fc6079a46f7b59e1cb2f21950546956f9c4367c25dc716a5 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776 WHIRLPOOL c33ccbff94e5c56f2017ff344170538822637261e7c87037db1e5c9abcae28276424aab0d7ed6b3c489148430a05cd488dca4871b302e69acf821f089a73c479
-DIST github-backup-utils-2.11.0.tar.gz 75105 SHA256 ae28ab08b933a8288e9eb9a92df221b0762cd1e7e399b5c116405a0d5fc3175b SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec WHIRLPOOL 05be640c5f95025cb694d4f8e1f1fda4a1d349889333f9ada1f15b48b3bb01d89b9bd4fb984549916f63815548efb272621d016cebdfddb803ec5fdd41b62377
-DIST github-backup-utils-2.11.1.tar.gz 79378 SHA256 187703c451d85b4c70fd9565de2cf4c4c11e1ff6087237bc5f617b4db06cfe5c SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda WHIRLPOOL d3e507d4eb678a04baa7ad78eca7b76a457e3f09914fe631548f76b56158ae826db3c911de551ad19b3272a662193d95bbea773dad2e8b813ef465b8c0bc8efb
-DIST github-backup-utils-2.11.2.tar.gz 79492 SHA256 28a55b803ae27a450e92edcac391e7f33607ec7f4d6cf73cbaf149dfa79c59b2 SHA512 64a622b090c8fe02ffba3c50b213ca177cc87e6aa41991cc3ee5031fc07b707e5f108f32d9346d2cd727939d76779d1f46dc6733e399c70e58ff8cb54087ddb8 WHIRLPOOL ba63353ac15d8775c78d83c9f6d33793893c775d5e6de103620f7c621b60acddacdd0d3dfb22ca57c7ed1cdfcb921fc4f4f43fd4b882c556ffa02aca451b17c7
-DIST github-backup-utils-2.5.0.tar.gz 40850 SHA256 9cc7cd40f41e6071c36527ec7983b877e461452cd08d04439efd5fa9352900a0 SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d WHIRLPOOL 15be1d603c9b61a4cff47e319ee1a66b64684dfd19f06c696bffb41b77dc756a895e25074d5a6dd19aeebaa3106fe12842cb22a639ed4abd3a6c2922e8cdbc1f
-DIST github-backup-utils-2.6.0.tar.gz 45970 SHA256 7273cebcb23bc597432a2b66ab7e9367a4fb09a750cf2438f8957dc83dcf27c3 SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e WHIRLPOOL fd1aeec46946190657e61e611a089b4a7cef53beb7b3f9a500b7117fcdbd89c5ef09681aff98ed5d559cc243f76180eb6eec0cc6f2fcfeed0789c159f5a09afe
-DIST github-backup-utils-2.6.3.tar.gz 50884 SHA256 3a5e48ff250b64a9bcec69a269b0e93efda078b8b77afc992c12aa40ee7bb3d9 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290 WHIRLPOOL aa19640ee5583d5e64aaab7b5a9d5572c47a09dd11fd0bed30ffc6aad0a10ddfc4e258f4680180547f8327fbedc5866bde4b20bd5e962dfa8162cd8ecf5e6db3
-DIST github-backup-utils-2.6.4.tar.gz 51270 SHA256 caf34b54a3961562d545ad2fb68ec18a319e6fcc1a1e65e5daa00e04e7f7fb32 SHA512 be2ef9811e20fd9be03d1b57e75151089817bbdd87fa487462a8fe6186195581ad6b1c62b1b930bd64689e89dcf33c2228df7d77a12790404f09b679b1ecf377 WHIRLPOOL a313f94eea953648a3dfbacba5eb3b90e68ca12df034c723133d3d80e60e4be38ef30046b8bbc1bdb827095d75cb239a4152a77dedfed52f188d80b57143fcb0
-DIST github-backup-utils-2.7.0.tar.gz 51409 SHA256 9556dbd438ea3525692705844c20b5bedc9a942c5415dd3c0fd9e383323dc11f SHA512 16112e8d05001146a182e225c1bb5bdfbe210ddb3993d989a9fe88b88bbf222196a66f1f48b262b198675af8e4b3e3a10120e7dafa7b244137bf29cd879efaaf WHIRLPOOL 9600d45f69f16cb95b0bb0b3cc5620d7bb6c2e65c2ac6b6942287c85487e83bb2b74d0869b411d0b4829cc9dd2da20972a7635780f00facadc28ca9787028a3b
-DIST github-backup-utils-2.7.1.tar.gz 68793 SHA256 e1e9ee69a005252ab4899693d43fee1aaebac3783d97c343e16566d0c12cdc17 SHA512 950c24b3fef8775c2a90789c469a81256323c1ede67b3f6691920e78c1489533adf5616f2ac09f9b844382778b5b2b5106f8c467be7d65b47ee06bf732591880 WHIRLPOOL 87cabe2138c58cf41a803cc43c23748a2f3ed578f3488bfb38861db64b81cb31f4d3aa41e6a240788c3bc9a32d9f523dd28cdb099e1b21cc2472d2cde72f7916
-DIST github-backup-utils-2.8.2.tar.gz 71392 SHA256 7aaa435d007b2697c3540ce6e2d3e5ba999fa33339ed21f43db6e9bb42c7d78d SHA512 d3801d37f18b41594bfee83b891ce1eb9f1a15972839bd9dfb6469d311484ef94f635da4319b0b9f2d6778d87b935ca5c0bd42ddbf009f292e05b6a654464bf4 WHIRLPOOL f7c730ee6248b2bc7b8017ece697584717337a9a5f42e38544ed57db498863aa8e1fd3a029b00dcfd26a44f9d32448fba3b092fcccfa3277423ab48ebeb295b1
-DIST github-backup-utils-2.9.0.tar.gz 72512 SHA256 c019467eb218e25de0905f56af03bde59f09d06fee1ec2fc8ef21ddddfc8c711 SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b WHIRLPOOL 9134ba916386f6590b4372992133b358f8284ebb4787bf8ae00c199a78df9fe34cbb6de45de3fcee0d3dffeae58e645d46d17ff8489fe443c682b3b685a5d8ae
+DIST github-backup-utils-2.10.0.tar.gz 73061 BLAKE2B 072a3cf8b3a775b368e4f5c89f7b9b29f7fec26bf4fd9abec58a6f1d4f02a981881a547bbdede8f8b64d0ed01dfba334193132a5d1363de3f4cd8f11d9047602 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776
+DIST github-backup-utils-2.11.0.tar.gz 75105 BLAKE2B f14f30db263cc304aac0d2a9a6d82883067b80bd69292018876fa1b01b1e47d9f8dd44bdafed0eb1198fdabe2b25ec8e6f20117ae905a2ae17bb9a17174642ea SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec
+DIST github-backup-utils-2.11.1.tar.gz 79378 BLAKE2B d887cf6d3e41c1537816edc6073a85c66dcaae0db5882187f5c9202ecaef0c7ad6c3593145a6619cc27e106cacd5343f4b26615569890e112db4ec67f98293f6 SHA512 7bdd34386d8604bfddb07d958d6cc435ec3e00705a83e53730f44a82a02eb98be311b73bba299db80513169a0680641927d9e2e9583b936c4fffa86de2ce2cda
+DIST github-backup-utils-2.11.2.tar.gz 79492 BLAKE2B 0eeba783fda89c862d1b6ecb56bc51dcb5130cc3ae8b35f38bba2b6fd850ee086d0b808f5cebb74617a1dea2f4ea3843c60a6162ac97e3139211b3796cc052d9 SHA512 64a622b090c8fe02ffba3c50b213ca177cc87e6aa41991cc3ee5031fc07b707e5f108f32d9346d2cd727939d76779d1f46dc6733e399c70e58ff8cb54087ddb8
+DIST github-backup-utils-2.5.0.tar.gz 40850 BLAKE2B 34f16e290619a21edef11410a583357a15b57c9a6a0d20b188863f5c41a7a30bcc168a2337ff7203de6f5659c611178bed0e0cff3d802c1ec923d7c4d8e1ee3a SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d
+DIST github-backup-utils-2.6.0.tar.gz 45970 BLAKE2B 855c7e93aa4db136629db8ba109328d51b9e9ca82aef1190a9703be2cc456ac006cd6bacaf1d3ffe9ccd8d43fb83c15c30c9b514abd37fb2104e62b2e1ed51fa SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e
+DIST github-backup-utils-2.6.3.tar.gz 50884 BLAKE2B 43e8c398da11f891230a7910fc29d9fc702f5985c8bda5388f8415446e12a3408383ee5a76a26f2519625be3bf442600e4281a4e10e24b5a1143ac4ca1934442 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290
+DIST github-backup-utils-2.6.4.tar.gz 51270 BLAKE2B 84d880d71b92d1b92f52dc3b749cb984a6f2e2e98eee1ecb4efc48dabf54fbb48a8a936d0422f7391adf3ea27265f6ea266045cf4ed509fd675ba2ac908abda7 SHA512 be2ef9811e20fd9be03d1b57e75151089817bbdd87fa487462a8fe6186195581ad6b1c62b1b930bd64689e89dcf33c2228df7d77a12790404f09b679b1ecf377
+DIST github-backup-utils-2.7.0.tar.gz 51409 BLAKE2B 5e1c5d55376af6f053b634ffbef4b97bd8f5a5126e6180bc95e21d372e311f863f653b630f4ecf2cf0c589b3b059e0a60e63ebeaa79d55c6333f7d34632adb35 SHA512 16112e8d05001146a182e225c1bb5bdfbe210ddb3993d989a9fe88b88bbf222196a66f1f48b262b198675af8e4b3e3a10120e7dafa7b244137bf29cd879efaaf
+DIST github-backup-utils-2.7.1.tar.gz 68793 BLAKE2B e65ac6c4e0018947be34d27bcf428d81ebdd138137fdbd1d15b6d77a7f2bc4b95a5ef00e0db1462b61b3015e2d2a54e1cd4e610857b7a156cbac9f5f912ad2ed SHA512 950c24b3fef8775c2a90789c469a81256323c1ede67b3f6691920e78c1489533adf5616f2ac09f9b844382778b5b2b5106f8c467be7d65b47ee06bf732591880
+DIST github-backup-utils-2.8.2.tar.gz 71392 BLAKE2B b45939693f2b545562b77abc897b54c4d980638c7e2b605d84deb4b251f8d702543829fe7138222aa25f740a033a73d52fbde6f735e3d510ca61c00be99ec82d SHA512 d3801d37f18b41594bfee83b891ce1eb9f1a15972839bd9dfb6469d311484ef94f635da4319b0b9f2d6778d87b935ca5c0bd42ddbf009f292e05b6a654464bf4
+DIST github-backup-utils-2.9.0.tar.gz 72512 BLAKE2B 3bb97609284dca1b3682d17e1c60e24a2169574691eb8463141951e2d5f93558ffbda3c7bec7f22c7a63dabe6bdf410c347f7512a09303653e5f939197d4faef SHA512 81af0842c021c49be8acca775d1ab375e98c2b725893f45d65b670e671892d779408677dfe6ed415101bf88fe549d117957bffef0aa372a74bcd7c6f87c1d12b

diff --git a/app-admin/github-backup-utils/files/github-backup-utils-python27.patch b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
new file mode 100644
index 00000000000..c305b688cec
--- /dev/null
+++ b/app-admin/github-backup-utils/files/github-backup-utils-python27.patch
@@ -0,0 +1,13 @@
+diff --git a/test/bin/python b/test/bin/python
+index c79b0a4..a9c2991 100755
+--- a/test/bin/python
++++ b/test/bin/python
+@@ -18,7 +18,7 @@ cat >/dev/null
+ # verify the python compiles at least. if this fails then the python code passed
+ # to -c failed basic syntax checks.
+ echo "$2" |
+-/usr/bin/python -c "import sys; __import__('compiler').parse(sys.stdin.read())"
++/usr/bin/python2.7 -c "import sys; __import__('compiler').parse(sys.stdin.read())"
+ 
+ # pretend we found zero processes.
+ echo 0

diff --git a/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
new file mode 100644
index 00000000000..b0f0b8de314
--- /dev/null
+++ b/app-admin/github-backup-utils/files/github-backup-utils-tarball-fix.patch
@@ -0,0 +1,39 @@
+commit ef6709b5e3510a7d0bcf0db91dbf5af5bc27b001
+Author: Austin English <austinenglish@×××××.com>
+Date:   Tue Nov 28 16:36:39 2017 -0600
+
+    test/test-ghe-backup.sh: skip test if not in a git checkout
+
+diff --git a/test/test-ghe-backup.sh b/test/test-ghe-backup.sh
+index 296429e..08bced2 100755
+--- a/test/test-ghe-backup.sh
++++ b/test/test-ghe-backup.sh
+@@ -475,14 +475,20 @@ begin_test "ghe-backup stores version when not run from a clone"
+   # Make sure this doesn't exist
+   rm -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version"
+ 
+-  tmpdir=$(mktemp -d $TRASHDIR/foo.XXXXXX)
+-  git clone $ROOTDIR $tmpdir/backup-utils
+-  cd $tmpdir/backup-utils
+-  rm -rf .git
+-  ./bin/ghe-backup
+-
+-  # verify that ghe-backup wrote its version information to the host
+-  [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
++  tmpdir=$(mktemp -d "$TRASHDIR/foo.XXXXXX")
++
++  # If user is running the tests extracted from a release tarball, git clone will fail.
++  if GIT_DIR="$ROOTDIR/.git" git rev-parse --is-inside-work-tree > /dev/null 2>&1; then
++      git clone "$ROOTDIR" "$tmpdir/backup-utils"
++      cd "$tmpdir/backup-utils"
++      rm -rf .git
++      ./bin/ghe-backup
++
++      # Verify that ghe-backup wrote its version information to the host
++      [ -f "$GHE_REMOTE_DATA_USER_DIR/common/backup-utils-version" ]
++  else
++      echo ".git directory not found, skipping ghe-backup not from a clone test"
++  fi
+ )
+ end_test
+ 

diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
new file mode 100644
index 00000000000..ffe55dede38
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}

diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
new file mode 100644
index 00000000000..ffe55dede38
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}

diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
new file mode 100644
index 00000000000..ffe55dede38
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}

diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
new file mode 100644
index 00000000000..ffe55dede38
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	sys-apps/moreutils
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}

diff --git a/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild
new file mode 100644
index 00000000000..4cf72e6606e
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.9.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	# skip a test that depends on a git checkout: https://bugs.gentoo.org/629628
+	eapply "${FILESDIR}/github-backup-utils-tarball-fix.patch"
+
+	# Fix for python3 systems
+	eapply "${FILESDIR}/github-backup-utils-python27.patch"
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}