commit:     fc6b94fefb2dedc0d78bfc161f3393dd7d29680c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 19:09:30 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 19:10:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc6b94fe

app-backup/dar: Bump to versions 2.4.20 and 2.5.3 (bug #559386).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-backup/dar/Manifest                       |  2 +
 app-backup/dar/dar-2.4.20.ebuild              | 69 ++++++++++++++++++++++
 app-backup/dar/dar-2.5.3.ebuild               | 83 +++++++++++++++++++++++++++
 app-backup/dar/files/dar-2.5.3-asneeded.patch | 40 +++++++++++++
 app-backup/dar/metadata.xml                   |  1 +
 5 files changed, 195 insertions(+)

diff --git a/app-backup/dar/Manifest b/app-backup/dar/Manifest
index e35f45c..3c352ae 100644
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@@ -3,4 +3,6 @@ DIST dar-2.4.11.tar.gz 1760715 SHA256 
c15fd11cc339363c25cbf24594eaa571235e00de60
 DIST dar-2.4.12.tar.gz 1799320 SHA256 
6bc4bec5692f970d58a649905afeabc0b4a8e10c9604cd6d16e7205ef343cf55 SHA512 
3d0123ae51c275daae1a13a6a1ebc51bf4587fbd95bf99615b9563e00762c6437a438f7a76124ea2f4990386acf6231f42e52a428fa052b144b91690d6943429
 WHIRLPOOL 
221d51b4125da1f005e962b33a6d685cc929af56e379327554a8254e34f57d25acd0cd3bf49514e704000062b514756be1a516704a11560149a2856bd776431d
 DIST dar-2.4.13.tar.gz 1799774 SHA256 
f3b2c3c7ad615b76683f8cdb6d025576f4373c75b9e37a9f340536054350c97a SHA512 
28308101f5d73b7bb7ea181fc1df129ea2be888404d301b156938f8cfc47ed1ed2819be058ce910795c937c8bc267305e7e080c2b80f81a18df95ab9cfb7ad07
 WHIRLPOOL 
6a4b67d6da717e98c3f55df1589055435c92b5849e5f2b337beae96f0c2651a8b99db2c745b6bd739232c156ed04b83d3fa6e208836081a77681bd02e14bc1d6
 DIST dar-2.4.17.tar.gz 1800050 SHA256 
5d861c39698b77124680914741e1e40e7e9bedb3fcedc6df8d468e619479833c SHA512 
9f991c2801948ca52cbd78222f0a7e807e157efba8f32349ab802b40e8fef10e01e39a5ee581ce5c770e50d69562800c5bfbd0229e2d5d679823d08a5ee31afe
 WHIRLPOOL 
cb65f558d70307335b7337154a0fa840935f740bab02ebb91c6904db8b33ac30af97f68befa979bf447aeb54ee4cc53bf49d996fef05d9233f7cdda405beb884
+DIST dar-2.4.20.tar.gz 1804634 SHA256 
f0f66108692de8b27e76b1832d9013d9d1dbf45d2aaaaf5c222dde3c6f1b308d SHA512 
1ed2e43df05082c01f6a53aa8c1c7328cb27fc3d84115d3f4a07de943fc814b614155f673464cd1a455e3b8c21e30f95da03ed9f72883b58ae005e3696de8143
 WHIRLPOOL 
b3ce8c59efe2f9f988133613b73fe1ec14af39746e7c5fff0c83fa2146218fad3e912f586e9b677af809696105fa9d72dc35122ec3b3ca3ad63b2cdd75fce954
 DIST dar-2.4.9.tar.gz 1751738 SHA256 
3d11159a290886dde968e16d36f32fa8640029708457bc87cc0da6d0eac71643 SHA512 
9a9b972599747493694fd838bafaa690e70490b5c500f084f0d0225e93a54ce40d61bc495827519c88f6a94542b88a1be5d11e5a98e672abe8659364d1b4c51f
 WHIRLPOOL 
f700bf7bd393e6dc2cce11e7bc56af0f130ea3fb714de04617a940ec15d6174c06b7a1051eb9c6ffa7a0ec686b1f13c288af1b541d49b332932743d0d617b56b
+DIST dar-2.5.3.tar.gz 1847258 SHA256 
4556ac940de056ca2856407f3d1e59891d992cb39cafb5f957b08afd9c9fca57 SHA512 
d21a122c58ed50b080ec84775e9681ba38fbd33c4c102ba5098cb57b670376bcf706dcc0864c40b3c3ca2610f389291ffd50c10097d36d31f54c30c12c19e7cf
 WHIRLPOOL 
cece132c5989dd7b7a35b6faf1792f404409d96fbfced010255a2925d3ec162f8afe6d15de5a0bd8efb75f32c021ddbfcb402ab7d0bd3cb783400ca8906b2e8a

diff --git a/app-backup/dar/dar-2.4.20.ebuild b/app-backup/dar/dar-2.4.20.ebuild
new file mode 100644
index 0000000..fdb0045
--- /dev/null
+++ b/app-backup/dar/dar-2.4.20.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks 
(floppy,CDR(W),DVDR(W),zip,jazz etc.)"
+HOMEPAGE="http://dar.linux.free.fr/";
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="acl dar32 dar64 doc gcrypt lzo nls static static-libs"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+       !static? ( app-arch/bzip2:= )
+       acl? ( !static? ( sys-apps/attr:= ) )
+       gcrypt? ( dev-libs/libgcrypt:0= )
+       lzo? ( !static? ( dev-libs/lzo:= ) )
+       nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+       static? ( app-arch/bzip2[static-libs] )
+       static? ( sys-libs/zlib[static-libs] )
+       acl? ( static? ( sys-apps/attr[static-libs] ) )
+       lzo? ( static? ( dev-libs/lzo[static-libs] ) )
+       nls? ( sys-devel/gettext )
+       doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+
+src_configure() {
+       local myconf="--disable-upx"
+
+       # Bug 103741
+       filter-flags -fomit-frame-pointer
+
+       use acl || myconf="${myconf} --disable-ea-support"
+       use dar32 && myconf="${myconf} --enable-mode=32"
+       use dar64 && myconf="${myconf} --enable-mode=64"
+       use doc || myconf="${myconf} --disable-build-html"
+       # use examples && myconf="${myconf} --enable-examples"
+       use gcrypt || myconf="${myconf} --disable-libgcrypt-linking"
+       use lzo || myconf="${myconf} --disable-liblzo2-linking"
+       use nls || myconf="${myconf} --disable-nls"
+       if ! use static ; then
+               myconf="${myconf} --disable-dar-static"
+               if ! use static-libs ; then
+                       myconf="${myconf} --disable-static"
+               fi
+       fi
+
+       econf ${myconf}
+}
+
+src_install() {
+       emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html 
install
+
+       einstalldocs
+
+       if ! use static-libs ; then
+               prune_libtool_files --all
+       fi
+}

diff --git a/app-backup/dar/dar-2.5.3.ebuild b/app-backup/dar/dar-2.5.3.ebuild
new file mode 100644
index 0000000..c07f10e
--- /dev/null
+++ b/app-backup/dar/dar-2.5.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit autotools confutils flag-o-matic
+
+DESCRIPTION="A full featured backup tool, aimed for disks 
(floppy,CDR(W),DVDR(W),zip,jazz etc.)"
+HOMEPAGE="http://dar.linux.free.fr/";
+SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
+IUSE="acl dar32 dar64 doc gcrypt gpgme lzo nls static static-libs"
+
+RESTRICT="test" # need to be run as root
+
+RDEPEND=">=sys-libs/zlib-1.2.3:=
+       !static? ( app-arch/bzip2:=
+                   app-arch/xz-utils:= )
+       acl? ( !static? ( sys-apps/attr:= ) )
+       gcrypt? ( dev-libs/libgcrypt:0= )
+       gpgme? ( app-crypt/gpgme )
+       lzo? ( !static? ( dev-libs/lzo:= ) )
+       nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+       static? ( app-arch/bzip2[static-libs]
+                   app-arch/xz-utils[static-libs]
+                   sys-libs/zlib[static-libs] )
+       acl? ( static? ( sys-apps/attr[static-libs] ) )
+       lzo? ( static? ( dev-libs/lzo[static-libs] ) )
+       nls? ( sys-devel/gettext )
+       doc? ( app-doc/doxygen )"
+
+REQUIRED_USE="?? ( dar32 dar64 )
+               gpgme? ( gcrypt )"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
+
+PATCHES=( "${FILESDIR}/${PN}-2.5.3-asneeded.patch" )
+
+src_prepare() {
+       default
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf=( --disable-upx )
+
+       # Bug 103741
+       filter-flags -fomit-frame-pointer
+
+       use acl || myconf+=( --disable-ea-support )
+       use dar32 && myconf+=( --enable-mode=32 )
+       use dar64 && myconf+=( --enable-mode=64 )
+       use doc || myconf+=( --disable-build-html )
+       # use examples && myconf+=( --enable-examples )
+       use gcrypt || myconf+=( --disable-libgcrypt-linking )
+       use gpgme || myconf+=( --disable-gpgme-linking )
+       use lzo || myconf+=( --disable-liblzo2-linking )
+       use nls || myconf=( --disable-nls )
+       if ! use static ; then
+               myconf+=( --disable-dar-static )
+               if ! use static-libs ; then
+                       myconf+=( --disable-static )
+               fi
+       fi
+
+       econf ${myconf[@]}
+}
+
+src_install() {
+       emake DESTDIR="${D}" pkgdatadir="${EPREFIX}"/usr/share/doc/${PF}/html 
install
+
+       einstalldocs
+
+       if ! use static-libs ; then
+               prune_libtool_files --all
+       fi
+}

diff --git a/app-backup/dar/files/dar-2.5.3-asneeded.patch 
b/app-backup/dar/files/dar-2.5.3-asneeded.patch
new file mode 100644
index 0000000..d3ec526
--- /dev/null
+++ b/app-backup/dar/files/dar-2.5.3-asneeded.patch
@@ -0,0 +1,40 @@
+# Fix linking order so -Wl,--as-needed really works here.
+# Thanks to _AxS_ <[email protected]> for the patch.
+#
+# The first hunk is needed to make autopoint from eautoreconf happy.
+#
+# TODO: Needs to be sent to upstream.
+
+--- dar-2.5.3/configure.ac
++++ dar-2.5.3/configure.ac
+@@ -8,7 +8,7 @@
+ 
+ AM_INIT_AUTOMAKE([subdir-objects])
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION
++AM_GNU_GETTEXT_VERSION(0.19.4)
+ XGETTEXT_EXTRA_OPTIONS='--keyword=dar_gettext'
+ AM_ICONV
+ 
+@@ -1053,8 +1053,8 @@
+                               [
+                                 CPPFLAGS___cache="$CPPFLAGS"
+                                 CPPFLAGS="$GPGME_CFLAGS $CPPFLAGS"
+-                                LDFLAGS___cache="$LDFLAGS"
+-                                LDFLAGS="$GPGME_LIBS $LFDLAGS"
++                                LIBS___cache="$LIBS"
++                                LIBS="$GPGME_LIBS $LIBS"
+                                 AC_CHECK_HEADERS([gpgme.h])
+                                 AC_MSG_CHECKING([for libgpgme usability])
+                                 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+@@ -1080,8 +1080,8 @@
+                                                ])
+                                 CPPFLAGS="$CPPFLAGS___cache"
+                                 unset CPPFLAGS___cache
+-                                LDFLAGS="$LDFLAGS___cache"
+-                                unset LDFLAGS___cache
++                                LIBS="$LIBS___cache"
++                                unset LIBS___cache
+                               ],
+                               []
+                              )

diff --git a/app-backup/dar/metadata.xml b/app-backup/dar/metadata.xml
index 55427ac..03db097 100644
--- a/app-backup/dar/metadata.xml
+++ b/app-backup/dar/metadata.xml
@@ -16,6 +16,7 @@ operations, including with ssh.
                <flag name="dar64">Enables --enable-mode=64 option, which 
replace infinite
                by 64 bit integers</flag>
                <flag name="gcrypt">Enables strong encryption support</flag>
+               <flag name="gpgme">Enables usage of asymetric crypto 
algorithms</flag>
        </use>
        <upstream>
                <remote-id type="sourceforge">dar</remote-id>

Reply via email to