Version bump. Add ~arm. Clean out old. Fixes bug 521910. Thanks

David Flogeras.

Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1BBFDA0

3 files changed, 30 insertions, 30 deletions

diff --git a/dev-vcs/fossil/ChangeLog b/dev-vcs/fossil/ChangeLog
index a0d493f8d3d4..e66a7bdaa893 100644
--- a/dev-vcs/fossil/ChangeLog
+++ b/dev-vcs/fossil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-vcs/fossil
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.20 2014/09/01 16:41:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/ChangeLog,v 1.21 2014/11/20 18:52:26 titanofold Exp $
+
+*fossil-20140612172556 (20 Nov 2014)
+
+  20 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org>
+  -fossil-20130216000435.ebuild, +fossil-20140612172556.ebuild:
+  Version bump. Add ~arm. Clean out old. Fixes bug 521910. Thanks
+  David Flogeras.
 
   01 Sep 2014; Michał Górny <mgorny@gentoo.org> fossil-20130911114349.ebuild:
   Remove := subslot operator from || () block since it is meaningless and
diff --git a/dev-vcs/fossil/Manifest b/dev-vcs/fossil/Manifest
index cfa83a9caaa0..10799752cf1a 100644
--- a/dev-vcs/fossil/Manifest
+++ b/dev-vcs/fossil/Manifest
@@ -1,28 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST fossil-src-20130216000435.tar.gz 3541732 SHA256 6fc0068a9174fc24ec9323cf7fddd771320248d9befc4a417746839a442c8de1 SHA512 7b80d74b3bc89e60a5fcee7ce6a4a96699260b8e204d245a264ac4ba3bfb09befcb4f764747fe8da3e68321383e31e91da80c0e90aa9b79ad4a84ccb6392f4d9 WHIRLPOOL fb25a9be64cb23e545f11c7159d727f8fafbac361b2942d5666d31ee9d5e0edd885d0afa960cd271cd885c45f1a27bc8f104932cfd2dfcc62d4c054439e0c97d
 DIST fossil-src-20130911114349.tar.gz 3682124 SHA256 4e9cf637a1ea5a4c659ef163b7b9fc1be1c169095d74f94388210cd117fa8058 SHA512 39dee3fe3b17c2ce49cde7685a80d48fc6802c1ce022f2efabb4804ffb84dc217d244166dc827d00ad1618bcb6bfbb8f5adace481d87cac8532427a8ca1734ca WHIRLPOOL 33c7f2ffc08d3697e4106f32f4a9289897d690d45bdf7084a1a898f15098aa4170cecb429ea3e47ae37986b86d7765e2885cee717ac6dd6c428ff68c27de5a7e
-EBUILD fossil-20130216000435.ebuild 993 SHA256 68ff8cb428f904781a5cfb32b4f67956169aeef8b49c0a9bf09c8e68539debdd SHA512 26736d64fd0a9f13828ad401013debc9ae3dee74fd54b60bffdd1bf30e45bc350f0a83db9a92f279a81e8ebbb5fc8af8e74ff6a3e796823bf93477792472f891 WHIRLPOOL dcd36aac723cf927a6e32c9b04885d1eaeba0e349d1935c973ac9686c4f72eb1365453f9c57f1581520d7f84d4837cbed664897e94cac75110b29408a277a83c
+DIST fossil-src-20140612172556.tar.gz 3864747 SHA256 c9882f9beb95695db7402dbd03d8fbf082e1109429175af4d57e089bcd2db387 SHA512 7dcf888d471ebac68e8bcd2b6d964d078d026ef9f536d1e10ae2fdedeb808a7b63b3935bfce2613e03eb61714ced2f060dbfa7b117965bbde3e32b7adbb42184 WHIRLPOOL f4ff8cb23d505198520d10b1aa484c49213a917e0766a70cc386e5298b85fefc06209a4f1f920ce00de94f65bec49dbaa2904b71366ca1d99a931782f613ffd1
 EBUILD fossil-20130911114349.ebuild 1220 SHA256 1e38dd08a53cc2192464fb36c31fa7795456ccbe4dacec05f7a76a4200f28251 SHA512 c7d5c7a2639d74677687f65444d268bd9a2e517d310eaeb13710c5dc3d0d81fd69568a2ca36587b50cc09fd8cb5f4b99af424257246dbb8dc53a3e20fc4830a8 WHIRLPOOL f99353f20f6899b1e1041be86bfabe319272dbc912499977e128c8c0615d3e4fcdac3da29182b549708cc7fe42a262a44e86c5e88f5455e5ea42ae4005a7f32f
-MISC ChangeLog 3788 SHA256 3e888d606b7c2ddfeca001c2e70fff2cb71ccf7627c2d22b78a0bbecf4854c4a SHA512 ad61014e3a4a9271a41344ae4006413b29956032473619b51c42fef82348f6fd1ef5a7fa50ab5e3ff926a379748e333f83557554f8a0f4a20acb11526789c6c2 WHIRLPOOL 883d15a9cc5dd1487d9754e38fb1553a82efe98b50350f35e1090742c6227c59f740ab6327e666bf75f5ea64a587c5d2c7b08a5b5dca3229b13de0ca5c89c8ff
+EBUILD fossil-20140612172556.ebuild 1231 SHA256 0fd2dc3074be354892b699cba36ddda67ec95fecb0f32fd26a02dcac7e3c50b7 SHA512 843f1344fbeb13afcb48fe8965f6de05002dd25f5014421b1430f4d501edcc17c1ec54ebf932ff6097143fe354d769d11e2239517722618db0d08b02108b11f2 WHIRLPOOL ccda561dde4d705c43092e8ddf7a3f498f78290c098fec7907e3d2817f3d9eaffd1784f8cddd61847b72790ca2d42d6a802c16d2882134f89c6ec9993d0df3eb
+MISC ChangeLog 4035 SHA256 285ca467e18c327f638f500caa387db3d5ee39c2de944d551c78e04dda73a863 SHA512 0cae4510efb0099a4bd632f1698846cbf833ae7570d7b732c8ae4bba8a2c51ce0cc26ae0c1c0129622a526debb00b1eddfca1a67a2944625ac9b69ee12ed30fd WHIRLPOOL 10cffab9ce0b20d5269625eebb1137b6bfa7b47b29a7a42428f8e35a8c7367a34afa94f6b6f35b12312d325cf3d357941427a434be76c538b5de9b4bc128808b
 MISC metadata.xml 707 SHA256 1977cf391292e02edfe96182067051c4320c636da2e2d4fb2f8fe6a7a38a3225 SHA512 e34d7b805e88725ef1acf03f3fffdcbfb45085bf411501af60d4f2d1b8e96beb8b3f0205f62590de66000390a2007514362bc491eaf1ed32e633698b94f11fd8 WHIRLPOOL 16c48b8ee8b6af2e4334eaa1594849c52c0553eb0426f55243b103027ca97f4166bf6413f63b5c55660ae7f29686caeaf0378d13a5fdb82513333002d1a3b825
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUBKHHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOlgUQANccC/GR1CHFol8n9vOlZ8cD
-SGkPf5m4Ft3RJLpjIdgRkBcKv5qhAO3oWsaVlLBOXCDo5nfiTuzEH5F7ZVAjN63O
-y3HdtRXK7FhpBw1bWr3dgIH5yZSMIf4b9TEIGLdJxrix6/nPKA5ScTj13ByLR7ai
-RLFsMJKm1q9g8hAbPfu2vueFjtRBIg89199MbuqsVBoRjFyQLFVQ3xKcb1d9uZ3F
-khCddvomdfagfREJqlXgFGgmusvWEgXVlW25comJcIIT9/CvJ89es6wurWM5Rb1k
-na7o3ck2SnVc2y5uw5SODAaxTGZRIbIJo643M1BAYzDzj42WmIeaeetQ0/ZTw6xQ
-WrULDDIsuVi9KgN+fikP0xdlRR3kgOzItm7rZtIbzgfo/jDbNUZWc+YojvlLEPBb
-vSXLyP8NbN1cxdfKGwLtRlQz7fE9gmp1gecmRCoNJZQXXx5aw4yinYqzQF86sQiU
-fm0Cqw7pVRVv9vYcipDVG8wYW57CQRVzoiLxMAEh2HIGJ0a4yqz2sfocbLyj2gA+
-GStQBT7sSjO+LIl3vljN3q2hjSxCmxtqcejdEgFpL32q2N+Koyz8NbZcd7Yx/BB2
-mZQxq3lma1ti7GyIPj4aUcCEAIsWiLq+Bl0utUopZo3gwkPmnEe2auMIWiBz52IE
-yEtOddmuKx3UIauSwtJa
-=gP+d
+iF4EAREIAAYFAlRuOGsACgkQVxOqA9G7/aAa8QD+JfG2efREiCZYBZ/aEjwzgOLd
+qK9TIn6oDVS0g6zRunUBAIk9StU0/FYOFI4LvY3QK3Wrql434Ib+sQT47QY9Hcds
+=htSK
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/fossil/fossil-20130216000435.ebuild b/dev-vcs/fossil/fossil-20140612172556.ebuild
index 52bd8e6b5dcd..f3c3a889faa8 100644
--- a/dev-vcs/fossil/fossil-20130216000435.ebuild
+++ b/dev-vcs/fossil/fossil-20140612172556.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20130216000435.ebuild,v 1.3 2013/07/04 12:16:45 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/fossil/fossil-20140612172556.ebuild,v 1.1 2014/11/20 18:52:26 titanofold Exp $
 
-EAPI="4"
+EAPI=5
+MY_P=${PN}-src-${PV}
 
-MY_P="${PN}-src-${PV}"
+inherit toolchain-funcs
 
 DESCRIPTION="Simple, high-reliability, source control management, and more"
 HOMEPAGE="http://www.fossil-scm.org/"
@@ -12,28 +13,32 @@ SRC_URI="http://www.fossil-scm.org/download/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="json -sqlite +ssl tcl"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="json +lineedit sqlite +ssl tcl"
 
 DEPEND="sys-libs/zlib
+		lineedit? ( || ( sys-libs/readline:0 dev-libs/libedit ) )
 		ssl? ( dev-libs/openssl )
 		sqlite? ( dev-db/sqlite:3 )
 		tcl? ( dev-lang/tcl )
 "
-
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_configure() {
+	# this is not an autotools situation so don't make it seem like one
 	# --with-tcl: works
 	# --without-tcl: dies
-	local myconf='--with-zlib --markdown'
+	local myconf='--with-zlib'
+
+	myconf+=" --lineedit=$(usex lineedit 1 0)"
+	myconf+=" --with-openssl=$(usex ssl auto none)"
 	use json   && myconf+=' --json'
 	use sqlite && myconf+=' --disable-internal-sqlite'
-	use ssl    && myconf+=' --with-openssl'
 	use tcl    && myconf+=' --with-tcl --with-tcl-stubs'
-	econf ${myconf}
+	tc-export CC
+	./configure ${myconf} || die
 }
 
 src_install() {