Fix bug 286297

Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: portage-2.2.15/cvs/Linux i686
Manifest-Sign-Key: 0x565953B95372756C

4 files changed, 90 insertions, 3 deletions

diff --git a/app-cdr/xbiso/ChangeLog b/app-cdr/xbiso/ChangeLog
index 6b91f22c0ddb..4b4c42ae3e09 100644
--- a/app-cdr/xbiso/ChangeLog
+++ b/app-cdr/xbiso/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-cdr/xbiso
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xbiso/ChangeLog,v 1.18 2011/12/22 18:30:40 ssuominen Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xbiso/ChangeLog,v 1.19 2015/01/10 06:01:22 bircoph Exp $
+
+*xbiso-0.6.1-r2 (10 Jan 2015)
+
+  10 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> +xbiso-0.6.1-r2.ebuild,
+  +files/xbiso-0.6.1-libs.patch:
+  Fix bug 286297: unbundle ftplib, set proper dependency.
 
 *xbiso-0.6.1-r1 (22 Dec 2011)
 
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
index a4e23bdb7d71..2a1dfd0e9c01 100644
--- a/app-cdr/xbiso/Manifest
+++ b/app-cdr/xbiso/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xbiso-0.6.1-libs.patch 831 SHA256 48f07dab9bb285f417369140c90cc710b44717ef973ffa9b0fd6e88cb516d9a1 SHA512 abbbd8cbb8ff0a2e3c13a6cac2598b42cc213a087e19c46d0665d95a3b394a513009609118cb661bbc207bb6121e335f2d6e755f3fdcba0cf03864bcd048b51f WHIRLPOOL e44c4a692edf1d0ab541e333c21d9d1b669bf45e378a6f3b981e7c4ba8d0819cf7d29052eec92ed6092eb95e7f95b584f33b625a81cf89c98a4bef915cb25051
 DIST xbiso-0.6.1.tar.gz 49698 SHA256 5d7a051e2dc3d7ff07ac75ce6e6625e7aaaed4ca439401275ce54e96dc531c92 SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc WHIRLPOOL f2cb7e644b087710b4ceb5c21c940396ce117be36861eb7e76943e3f9a02827f85072a04ad225514b931f75467cf910f0c957726ac996f09f7ca56748055fe80
 EBUILD xbiso-0.6.1-r1.ebuild 853 SHA256 147dd284611cce177eb48538f00f5998de7884cb6a31e9a3bddb142edf22a7b1 SHA512 aa6c34148d1b8b9e88bacf71d211c045c33ee8632caba3f9c6bc5e3864d4f93ecc536a7b52fd2c8924e9f611c299eb34dedc6bb65586b6207303f0db550ae9be WHIRLPOOL ed1652f55c3079ca28721c6468f6bbe6a0485649f0c09818b656a5a54859a1cada9a1b611f7ad23bf49f82d0c4db4349019d2ae56ef196c9e83b48e6c2d673d8
+EBUILD xbiso-0.6.1-r2.ebuild 999 SHA256 e4f5f26eed8f6268db209412fdc6d66d1cbff37d86fc7b29dfee1c49da565405 SHA512 086cea439f5a2db4d52be51f50e9755670625bca092faf49d5e9570b4cbfb012310ebf65420737f82cd1dfea9ad729648837b5720e37da71e64b951e1f8eb3e5 WHIRLPOOL cc482eb9c105e10d7c58597f053fbc468ad7c22f4cfe7e81e48d57bcd998322711ea729807180285ce782b9c95d5c2794870757d2f6e7db7a2389cb7ac7dd6c4
 EBUILD xbiso-0.6.1.ebuild 744 SHA256 b6f02fff57652d0a50a0f306df13275943c8b6622b4f8a4198ae0211880e4643 SHA512 07e989865e54d4cb9878e6c71bacc9e00893c6269b9d672a06b30653606d45376609dba9f472e81cde367a8ed16ff658c394ff79768f11b5fea39277e36e983a WHIRLPOOL 907aed3a8c1c438e9988bf8ee6207a4b7659b66dc7640378bbf26e9abe7c16e58fc38e7e6217731912bae84f0cd6e7da7114d0c9943a84099ffe7299918ae16c
-MISC ChangeLog 1943 SHA256 f04f1cf0c0b7bf563bb9550c1cabf8d61157e293193836ca4ec20825636da35b SHA512 7a5f086f5145a4cd5ec1a5da1e52070b2be6a3dbc4f3c92f65c46f4530c3fa0a4442ec2efb2ebb44bd02696870000ee46dce85bcd8472ac0ee1b2015bd55702a WHIRLPOOL 06ff9bedba688be4b57e1d805994800a7903e25cbb3306987dd838c22087d1433072f7ca9e03942d859a04e157c2656751cdae684ea3178cf68f6030cb884c5d
+MISC ChangeLog 2141 SHA256 4f7d4a981e2fb5650010690b6e212a6d5b3277921669d8a7d40813930ac97b82 SHA512 3b540fd313b32f2214f2f35d2a9747554ad0f1a33d2084dcebd36b3acdb26a7ddb437a36998fd3af286d92d3f3a7f7109fed2d9c5f6455b34ee517495d24fb60 WHIRLPOOL d1895e0d6edf8c93a8fda0ae1225d3f86c5c4bd4862e7f5b5d633f1966344b444c984bc5d55d119c9f6474ff2b48140f1d50ebefbec01e66048ddcaaaca2b430
 MISC metadata.xml 244 SHA256 94bb7659917e9f43c4d84ed8dd529bb13e32c6baa255d1de5d849154b55eaa85 SHA512 0b0400aa79d61b1f6ae9eae80a120294ae5522576803760e2d985465f7467ef79c6600369f22dffd4b10ba5dc042b87d94188b134da01c7f8d1653ee47f92605 WHIRLPOOL 66904ed75a89fc8ce4d4689614c8efc05f4e1fac9d91190d59312555cf18747e1c7e7d1778390201bbb4cefd05e8da2dcc7400a5b5538493e4f6bd38a2e0be1a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUsMAzAAoJEFZZU7lTcnVs7ssQALPgwzyUm2ky6nG2tXJUtkmm
+1P+CsoEJIVCC1NwPWhA39mqwm5zAa0IbkyQUoEPTximMFjipUmOMPWdnFB2Rw6Zs
+xZeOp7Pfsyrd/j3aVUkipcNBtClcyn0qFEZvEQdL0owY6Or5Bgh4uyM1ZyOGcRe2
+VX315RkD+LX/OAQh7A/hKlkzlc2zcYpO01bDb43tLwm88Zzta9SJ1u6cGEzMQjrh
+HssEUWhOGouqFAb96jJK1a4u9DAg9pD7rc/ncEFHUTWYProTFvCU29tIhpOvI/mj
+MscCU8m9vOgbLTplbR2fkvpL2luJSu5txDY46H7Qdtj9kLZkh//K+SoW6Ihe2xcW
+mctzaDwLtSfeWZh0IHdhBj8e2GaRcl4qrXIZ/GtMdLLN0Y/1YmRtjB/zCjxh+BJP
+6C8qgoNNA0euPDwpxS+6DlxuseNfrrzNHPjgexgkXGFP7M3LE0ygGY6aVaNUNgME
+5RBT7EuWCShnpmlvqEgcsOMQNnnGVAjrehjmhS6LbWhP7tXOUVZTzISYCE7Og3pQ
+dOo+rQw0FRJ596EzLPC2lWfnyc7yQtnOS0dYQ/CiphzU5Atk922r/Micm7xSEs5y
+197Rlodx19Q0HEJQl/QJRcAtmHZIQevFy9mXYy+KFGADzqdsrzQdgoEe88BE/451
+FUthpr/jx6DKO17G5oR7
+=7E+v
+-----END PGP SIGNATURE-----
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
new file mode 100644
index 000000000000..5b48ba674230
--- /dev/null
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@@ -0,0 +1,21 @@
+--- configure.in.orig	2014-12-02 18:56:23.000000000 +0300
++++ configure.in	2014-12-02 19:09:46.724190436 +0300
+@@ -6,13 +6,13 @@
+ 
+ dnl Checks for libraries.
+ dnl Replace `main' with a function in -lftp:
+-AC_CHECK_LIB(ftp, main,[LIBS="-DUSE_FTP -lftp"],AC_MSG_WARN([Warning libftp not found ftp features disabled]))
+ AC_CHECK_LIB(m, ceil,[LIBS="$LIBS -lm"],AC_MSG_ERROR([Error mlib is required]))
+-AC_ARG_ENABLE(ftp,
+-[
++AC_ARG_ENABLE([ftp],
++    AS_HELP_STRING([--disable-ftp],[Disables all ftp features and libftp dependencies]))
+ 
+-  --disable-ftp			Disables all ftp features and libftp dependencies
+-],[LIBS=""])
++AS_IF([test "x$enable_ftp" != "xno"], [
++    AC_SEARCH_LIBS([FtpInit],[ftp],[CPPFLAGS+="-DUSE_FTP"],AC_MSG_ERROR([libftp not found]))
++])
+ 
+ dnl Checks for header files.
+ AC_CONFIG_HEADERS([config.h:config.h.in])
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
new file mode 100644
index 000000000000..8cca0f593471
--- /dev/null
+++ b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild,v 1.1 2015/01/10 06:01:22 bircoph Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Xbox xdvdfs ISO extraction utility"
+HOMEPAGE="http://sourceforge.net/projects/xbiso/"
+SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ftp"
+
+RDEPEND="ftp? ( <net-libs/ftplib-4 )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
+	epatch "${FILESDIR}/${P}-libs.patch"
+	mv configure.in configure.ac || die #426262
+	eautoreconf
+}
+
+src_configure() {
+	# for this package, interix behaves the same as BSD
+	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
+
+	econf \
+		$(use_enable ftp)
+}
+
+src_install() {
+	dobin xbiso
+	dodoc CHANGELOG README
+}