diff options
author | 2011-07-10 15:57:32 +0200 | |
---|---|---|
committer | 2011-07-10 15:57:32 +0200 | |
commit | 59a78dd55a1dbaaf254f70c458b0fc9ba49fc4c7 (patch) | |
tree | 8132073d58c2ccf4f1b38b8e3878d8f740e9f758 | |
parent | app-editors/texworks: Remove, I don't use it (diff) | |
parent | app-backup/bup-9999: Move to git-2 eclass, use epatch_user (diff) | |
download | kork-59a78dd55a1dbaaf254f70c458b0fc9ba49fc4c7.tar.gz kork-59a78dd55a1dbaaf254f70c458b0fc9ba49fc4c7.tar.bz2 kork-59a78dd55a1dbaaf254f70c458b0fc9ba49fc4c7.zip |
Merge branch 'v0.25'
-rw-r--r-- | app-backup/bup/Manifest | 10 | ||||
-rw-r--r-- | app-backup/bup/bup-0.24b.ebuild | 11 | ||||
-rw-r--r-- | app-backup/bup/bup-0.25_rc1.ebuild (renamed from app-backup/bup/bup-0.22a.ebuild) | 26 | ||||
-rw-r--r-- | app-backup/bup/bup-9999.ebuild | 34 |
4 files changed, 58 insertions, 23 deletions
diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest index 6f62684..dfb23ae 100644 --- a/app-backup/bup/Manifest +++ b/app-backup/bup/Manifest @@ -1,5 +1,5 @@ -DIST bup-0.22a.tar.gz 317660 RMD160 6c0e5c68758bb47b43bd0c9565c97651680ad11f SHA1 4a6032377b0ada54dd594da1ba8c8fdcf33cf4d2 SHA256 b8a25e57ccec3be4659a4caa66f85bbf39ea4832ac609d921222a70164080cff -DIST bup-0.24b.tar.gz 330633 RMD160 0293bae6fe6bf1ff002a6965adbffc1a9123c976 SHA1 317561c1bcd2fe59ee8674d528fa2886f89d86ee SHA256 ecac6d050416dd6cb5f4960b0c6d68766a5ccc656bc49b605ff519647f3e0fc6 -EBUILD bup-0.22a.ebuild 937 RMD160 17768fc4714853359a255df4d518cb969a70918b SHA1 c50ad176279bdbef6ca8bd28f1de8184e0501aaf SHA256 0cb5fa01a9945e314f4639aa3c1ba71c05ae777d4fde56f9ac3987e9a1ae896e -EBUILD bup-0.24b.ebuild 977 RMD160 14ea28fb7e2180c93ed6ec386408b5ef70c377cd SHA1 c8a019ee13ac80624edff0f7d5935a5748e7b1b1 SHA256 e96b9cbabbe8412d86fafade5a636d9fa62b3b95079eb9b9f9b25ee5f6ed9c9e -EBUILD bup-9999.ebuild 851 RMD160 506c1337a76757acd17893db0395e912f792e830 SHA1 499ebcf153559860b7d7bb9ad90e272620daeafd SHA256 980181ad752fac7f4f76dec40237fc02941b51bdafa62cc3d664df15f98a393b +DIST bup-0.24b.tar.gz 330630 RMD160 f2c3474c9f5467ad95153725947cc6c3a016f0f0 SHA1 478aa11b9f1ecc72d6d1ca07fb543042d152b81e SHA256 10674d25ec3a6a63525e4c5e7ba36cf08cee5a2d1d6bfc9306d2a560dbade429 +DIST bup-0.25_rc1.tar.gz 360010 RMD160 52addf38b0a2e1ed6f3ce496b43512619a9f64ff SHA1 04815a9f1c1d4d796b9f7f09401c49240b21b84a SHA256 b04186b48d2f6fc5a679c343c93e785ea2716d267c5c9621086a9d313fd2bea1 +EBUILD bup-0.24b.ebuild 903 RMD160 c77423cad8e4d7500bc0efbb4fc50dbfb49788b0 SHA1 afdb8ee091a4823a564edca06756175a51e15adb SHA256 dde24118b3f251744097d646c460b2086b1de89aea7613ea14a88b6c9203d4a0 +EBUILD bup-0.25_rc1.ebuild 1171 RMD160 a14f705c52d35885c32d7c2daa014d041842caf1 SHA1 0196510beb7189e48d8e20d49bde4e8bdf3c8320 SHA256 e4f211105646c43e45eaf9a881ac40051be6cafb355c2c6590e360c47ec33600 +EBUILD bup-9999.ebuild 1164 RMD160 b2854b4ce8b818b1fe7af18361f840680527d455 SHA1 e1de59c6b3643b8b428428292c4e2bbf2cdfc2c0 SHA256 856f65e1e563f94e2bd8620368578a9dbc5797ea41170336cd3c3096ec57e8b3 diff --git a/app-backup/bup/bup-0.24b.ebuild b/app-backup/bup/bup-0.24b.ebuild index b73be0d..0107e7d 100644 --- a/app-backup/bup/bup-0.24b.ebuild +++ b/app-backup/bup/bup-0.24b.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI=4 inherit eutils DESCRIPTION="It backs things up based on the git packfile format" @@ -32,17 +32,18 @@ src_unpack() { } src_compile() { - emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed" + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" + emake install DESTDIR="${D}" - dodoc "${D}/usr/share/doc/${PN}"/* && rm -r "${D}/usr/share/doc/${PN}/" + dodoc "${D}/usr/share/doc/${PN}"/* + rm -r "${D}/usr/share/doc/${PN}/" || die dodoc README DESIGN } src_test() { - emake test || die "emake test failed" + emake test } diff --git a/app-backup/bup/bup-0.22a.ebuild b/app-backup/bup/bup-0.25_rc1.ebuild index 0952e81..eaeb0b9 100644 --- a/app-backup/bup/bup-0.22a.ebuild +++ b/app-backup/bup/bup-0.25_rc1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 -inherit eutils +EAPI=4 +inherit eutils multilib DESCRIPTION="It backs things up based on the git packfile format" HOMEPAGE="http://github.com/apenwarr/bup" @@ -31,18 +31,32 @@ src_unpack() { mv -v * "${S}" || die } +src_configure() { + # bup doesn't accept --build= option + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --datadir=/usr/share \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --libdir=/usr/"$(get_libdir)" + +} + src_compile() { - emake || die "emake failed" + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" + emake install DESTDIR="${D}" - dodoc "${D}/usr/share/doc/${PN}"/* && rm -r "${D}/usr/share/doc/${PN}/" + dodoc "${D}/usr/share/doc/${PN}"/* + rm -r "${D}/usr/share/doc/${PN}/" || die dodoc README DESIGN } src_test() { - emake test || die "emake test failed" + emake test } diff --git a/app-backup/bup/bup-9999.ebuild b/app-backup/bup/bup-9999.ebuild index 7c4e92b..28b8786 100644 --- a/app-backup/bup/bup-9999.ebuild +++ b/app-backup/bup/bup-9999.ebuild @@ -2,12 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 -inherit git eutils +EAPI=4 + +EGIT_REPO_URI="git://github.com/apenwarr/${PN}.git + http://github.com/apenwarr/${PN}.git" +inherit git-2 eutils multilib DESCRIPTION="It backs things up based on the git packfile format" HOMEPAGE="http://github.com/apenwarr/bup" -EGIT_REPO_URI="git://github.com/apenwarr/bup" LICENSE="LGPL-2" SLOT="0" @@ -26,18 +28,36 @@ DEPEND="|| ( doc? ( app-text/pandoc )" RDEPEND="${DEPEND}" +src_prepare() { + epatch_user +} + +src_configure() { + # bup doesn't accept --build= option + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --datadir=/usr/share \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --libdir=/usr/"$(get_libdir)" + +} + src_compile() { - emake || die "emake failed" + emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" + emake install DESTDIR="${D}" - dodoc "${D}/usr/share/doc/${PN}"/* && rm -r "${D}/usr/share/doc/${PN}/" + dodoc "${D}/usr/share/doc/${PN}"/* + rm -r "${D}/usr/share/doc/${PN}/" || die dodoc README DESIGN } src_test() { - emake test || die "emake test failed" + emake test } |