Drop old EAPI=1 version

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x0B08240A96F66571

3 files changed, 22 insertions, 112 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 7def86f395a3..ae942910f0f1 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/unison
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.73 2015/03/31 20:08:12 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.74 2015/04/07 21:08:33 dilfridge Exp $
+
+  07 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  -unison-2.13.16-r1.ebuild:
+  Drop old EAPI=1 version
 
   31 Mar 2015; Ulrich Müller <ulm@gentoo.org> unison-2.13.16-r1.ebuild,
   unison-2.27.157.ebuild, unison-2.32.52.ebuild, unison-2.40.102.ebuild,
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index e805a2a0892e..8e3a8338d691 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -3,9 +3,6 @@ Hash: SHA256
 
 AUX unison-2.27.57-as-needed.patch 432 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d SHA512 e980c7fe99fe2ff5a802ae63c240491a9d15bc44a52b00e54b33201e2f5f1215ecec06dfb4848d0ea33405c0169507b083e7b65fbe83e6d4973ea3edf9bbef26 WHIRLPOOL 263fcaaa27d4fa468d56476ebbd60344a8899e654bea55cdeb1f4dcf773ec57f51a598dd73bd3b927d842551fe71908e05ca2cf452a4895ca78d629c92669777
 AUX unison-mymap.patch 466 SHA256 1b73b9b4cf308b2f538fddfe95ee2ae42f5090015fbce132d2ae5789ea25a480 SHA512 7d12dd54b6f287d84d45909fe67ecfe855d506b11b3fe6458787efa6040593a45b4fa79835f968c26b70b9c2c571705e794807ba4f2945194c508756022eedac WHIRLPOOL 911d0786b935719edf283454a46d80422be77b751df80f74bfadc3ad54c517a5fa3912fa7679b73ac7e3b8d4baa20399e916838ef6655a57f325a5e8107efec7
-DIST unison-2.13.16-manual.html 196162 SHA256 52fbb03925c44c46837d919a3baebceefc723c09458ec7e95d3993f2a98f0e20
-DIST unison-2.13.16-manual.pdf 436229 SHA256 8f0851b5b34e2d85a6a02f5a374a7d743e5067a419fca689d14d278c951597df
-DIST unison-2.13.16.tar.gz 393266 SHA256 808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656
 DIST unison-2.27.157-manual.html 235599 SHA256 58f514c4c0818ebed6b2afa8e3dbf84871e240ddb6819d91e1b7c93be36c3f50 SHA512 6e00b597a62b7874f3459bbe150ee948125c0b06faf1ec4e90ddb3ac52e3684f6c4ce57dd599904d6cf53919904a08b30cbae84daf28eb6f2079c7c6bda48892 WHIRLPOOL 8d3f99038ff33c52980637299d782bde192ce3863d01a4dea91e12c36e70ddc5e8ea235d0c108b4b86113e2ed9d326c45fa675cc0da932089f6c37c95b7a0801
 DIST unison-2.27.157-manual.pdf 453255 SHA256 6af0f5242a08056d7dbcfce171083a577ed9748d13d1f9bc5d7050f224ec0162 SHA512 c5a9a7a0a30219fdcdd9c5bbef5245c718bad4f4e2e844d75b5a44b986b6e7c0fe37acfe95676f8e72530bc8a58e62f469f16eef5f0f0d45bed239e37eb634c2 WHIRLPOOL c54f0273a7c9993adeed001d93e2491772b796b2a02f75b4b56d42dfa7eaaea811b1ea2d07ead9245b7d7504e0944257c7d9f6b945834728418378674a83aba8
 DIST unison-2.27.157.tar.gz 674332 SHA256 ec04069e95249a5b4e212ab48ec03820b1e1f707fb4c607e7f98851e98735adc SHA512 5be96462d1e23164c173b1ad6088832d5a0dfeb8a2d3f6f4b197f8fdef5216d1fdb0b43fdf2d95dfe58c4a857089e1bd3ca3fbf7406019ba3a7837326bb2c554 WHIRLPOOL f05d39b16e3da9ac6c8511e0201b1c170bd98a66ffa21483eff3bc22af226bed4104423f9b08bdb72fb2d83c027586b374239bf5f0bf4930ed2e37b08897370c
@@ -21,25 +18,29 @@ DIST unison-2.45.4.tar.gz 2716641 SHA256 f60a3327137129381b2028be43f84d79709ca57
 DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
 DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
 DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
-EBUILD unison-2.13.16-r1.ebuild 2724 SHA256 e29fa8a9de295ec454ea91f35c1ad20653fa9775c48fdc0e3e9ad067e0acc0fe SHA512 692f6ca41feaa8e38a5a659115bf81f9db6ced89d158547150ceb61e0c37fc5e9a450f66f60355ca6334ebd7142a03e19168fc2adf3f8e2a2099668cd9ea5b39 WHIRLPOOL 42939a94173856baedeb84d2fe06c4d496479f8e9346e0b29aa76820498967ea0ca4d2ac274588273625bff9ff98f7de144620fc05ef3b843b162f0738e86a14
 EBUILD unison-2.27.157.ebuild 2379 SHA256 2ec650d2f60d4bf84b776105ff2638bd220cda5937c4d341a35f7ad2843176cb SHA512 a837e7f637ae34dd1d7baaecc93ab6121f6113256bfcb2aa0fcba4e8f119c43d785ea514f613ecb7f6cf81d577fcecb9ec55297775d6ba121b23a161ef1d8934 WHIRLPOOL c7a2434f70954003237368540477e3246991fa6ab90370378203a46c75563ccb73ae3ae9e279091bb1f70b035a4e56430b65e2782bab2bdde01e949638bde83f
 EBUILD unison-2.32.52.ebuild 2494 SHA256 6babd31c4585370be6f3e308df089047ba05b13fd128495e63379368a2b41011 SHA512 b40ea5f9d3ecb3d4bcc3db4929b777640f818b7fc3a3ce9835987f2904db91c902b2a8d00a9ac00c33d3eb89671e0415a82038a263c417cd67ddaa4f3e7ceb3a WHIRLPOOL 60ba15f871227ef91832039b22199bebba85efc5405908749126e36215f4ee7d0f9801d6d890e573bd7fbb9778b2f37fa482c2fece5596c7d431620b2237ee86
 EBUILD unison-2.40.102.ebuild 2306 SHA256 750258c10794f579a35217b32f90692640ddd3ac3a092a13456b878c1036773e SHA512 859ff3c81e93a9215bfe25339e8354866b040aa469c4abc583ce2f57ae8037e13e66cf026046260576843fba9493793cd4eab51c1dcdd10417f74be10d5e3405 WHIRLPOOL 48b60ef5d56e59520bccec3b92de5fd0f39ed63fdf8bc14bc0be04e53e563847e055e4c2deec985941f909ef38f0762ad2e6c064ac26f36481290c264a30c4d1
 EBUILD unison-2.45.4.ebuild 2304 SHA256 8392d943806b75c8d7bb91c72d9946a57864f5ada2779319b811cefdd1d25164 SHA512 50fb8b0cfa2029f50427a88ec34aeb16523bf72d4106abea4e78d75b754ae2eb0e68f8648b1f98942904101e493403d1b86a77adf4ec972787f9ba6285b2ea00 WHIRLPOOL 50f59c8361e79297caa226e933d9f8dcd5c2106ecdf11885315bd07a16d4e5c44ecd7c430b7b29ba23960c698e7e64a15627e137ac77b7aa5f3b5c579d7ab571
 EBUILD unison-2.48.3.ebuild 2304 SHA256 1dcf2acccb90d42f57e243009fa721ca3ef9c6e3d3816cd43fa753b1f9a7681b SHA512 14d4cabe6a34af56df2785aba6e4a13b783ba96ba3f68dfe25af1be184dd60aa4cadcca1b58df46e131288f8bdb8a7721c75302148768900d7c66c94c43d2900 WHIRLPOOL 865ca26ffe535415c235a04afd3a33c6d95b10b13445bac9f934e9ecec7d0ee57e77a478c8c5cfe2a65c028211679810fb8a626f47a04e2c87b133118c55652b
-MISC ChangeLog 11149 SHA256 e04aa36a9702639f6c3e0dee20050184801f30bf6f2417aa11c6ed7bdbe7ed2f SHA512 7829fd1dd2672a4e10547033ca2edc8c25f4aa5b968844f0b9da9f7ae61008290baa26447bc0e6330172b8ed6451a662ff2cfd93be8944d3b1645f19973c528b WHIRLPOOL 7c2c51ddb4d134979dc2782a9689d5b8cda226b30217d0da7d083df60aa9120336e762a1ddccfb836c16d49621cfa970828fa1fa454a2f73aa55e44afd2623ba
+MISC ChangeLog 11268 SHA256 d7c0324a2251676c6453a0713a9e00536bc2be8ea0ef0f99cbf392cb03e96de6 SHA512 58044c03a0d728fb0a85b87c2e2b2794151e00699c52d51661b967b52b0b47ad281fcef717af19ade76fd63c80ffc642d3bb54a24665fbbcc72153c46dfe5d16 WHIRLPOOL 069d779860f2d062bf1ec186a9eee52fa77daa17145a7e0715baf6433663d6828c46919d50ad93ad42613a8783173d6fc854459d3b46e7d089182b9dd72d1c2f
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJVGv6wAAoJEJQzkH1pP7W4j5oMAJMxXcfsc0WzUrsfdL59/Y6X
-nQHy7ywTWQSPOg/EDr21iPpkGpeQPh1fRslJ0CIb0oy73YwOVk8yhjkA6LASjtoa
-/ThCWFr5FZudnK+dwpJCUkclo7Jw9oSS/PWDEPMo+jMGuGquIKqEliU9bJovE8gD
-I5v0Rifq4w3Arnm5C/6UzKRDouBf9BmkhPCNwTVTRn/mx7/iZ1JOLxDzN7zuHtJm
-dgp+3xEUg0nwZKswCErydGEJlHnh15MybGU6TlIVpOmi7ZFkMxA7GYuLSATmM+i5
-44sWPJwCv2dPTuyf2Ep4+z5S03SyeM+otlfhSaGvl7koxk+Db8M3jQZplmxY1GEm
-qdd3n3Hr9pL3awhDcWxZw9oqf8SnlzPjgJdilFpK96HlxZPmhm3Efv1ENQdhIErQ
-J0Q7x2wgwdktZEW1eDSfPsDqK5v4kBziFNN/TZcVcV+pBE/tZNKUkfqHf1We7x4r
-RrStPXIaucei65OtdCd2rHVZlRkv+yx/Fc/lrIyflQ==
-=DbLk
+iQJ8BAEBCABmBQJVJEdSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkJDMzI0NjNBOTIwMDY5MTQ2NkMzNDBF
+MTM4NkZEN0VGNEI1Nzc5AAoJEOE4b9fvS1d53MQP/irPEZ6/NSbJznkH5IBamk1/
+j8WVwEJ580Bw5b8PUss0U0vf3prylsw8oGkDJc/695M73RMl8aut9Td2l1J3Tgo4
+auEbtN/eJ54h1fwE7CWkOErXUV8IQN7OhC0FrHcM+PTmDrXwix07IFxPorIZiUKa
+/IJSJNNkD9WB6NDqzEhztfmeZVD7+weI84oiXVaeloLhMeTV89VOlLkbFTOBNvax
+YmYEzPsu8tVz2mzZ2A5VPMOIBc1wa9HjosR+KguabVp6zHC0vAG7PUZQwvU2kuh2
+aBriZ46a+xNG2/q3HuECa7wgCiW1WiaoWQhC/3DO7MNM/acy8cGF9rW2Q5pm8DPJ
+0YrmRGzJs4TF7eB1a+v942RuC9vu6Vpop6vzyNSjaSvsXa9grlwhVb9jDkuZWTgJ
+D7pFenT+N+QttaSPbNt+i9/hF28FTclxCKyFRuvEIwpMaP+R83KkYOqXhX3UjiBK
+SCOee4iZZz+Dh7oBAbqXhiJMVIFp59OsS1KGGR+i6hvzrPO4ydtl0Tx6yKBqN8TX
+9bWwYt6j6yxc69pL7v+QxTfzGItVctD6o7MOuwGcajebYFWTu+e6QkuAmlL1pjg+
+ZysRiKvPQ9HU/p+lj8zAcdHFetf1HYuSP5meeXly75cJz3JlBn/LIX/Vz8yvuFIn
+dbbNWDimn3mFnzfiznaQ
+=LLAd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/unison/unison-2.13.16-r1.ebuild b/net-misc/unison/unison-2.13.16-r1.ebuild
deleted file mode 100644
index c53e0af1062f..000000000000
--- a/net-misc/unison/unison-2.13.16-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild,v 1.6 2015/03/31 20:08:12 ulm Exp $
-
-EAPI=1
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND=">=dev-lang/ocaml-3.04
-	gtk? ( >=dev-ml/lablgtk-2.2 )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
-	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-	!net-misc/unison:0
-	app-eselect/eselect-unison"
-
-PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
-
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
-doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
-	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
-
-pkg_setup() {
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	# Fix for coreutils change of tail syntax
-	cd "${S}"
-	sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml
-	epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-mymap.patch"
-}
-
-src_compile() {
-	local myconf
-
-	if use threads; then
-		myconf="$myconf THREADS=true"
-	fi
-
-	if use static; then
-		myconf="$myconf STATIC=true"
-	fi
-
-	if use debug; then
-		myconf="$myconf DEBUGGING=true"
-	fi
-
-	if use gtk; then
-		myconf="$myconf UISTYLE=gtk2"
-	else
-		myconf="$myconf UISTYLE=text"
-	fi
-
-	use ocamlopt || myconf="$myconf NATIVE=false"
-
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake -j1 $myconf CFLAGS="" || die "error making unsion"
-}
-
-src_install () {
-	# install manually, since it's just too much
-	# work to force the Makefile to do the right thing.
-	newbin unison unison-${SLOT} || die
-	dodoc BUGS.txt CONTRIB INSTALL NEWS \
-		  README ROADMAP.txt TODO.txt || die
-
-	if use doc; then
-		dohtml "${DISTDIR}/${P}-manual.html" || die
-		dodoc "${DISTDIR}/${P}-manual.pdf" || die
-	fi
-	use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-pkg_postinst() {
-	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
-	elog "in your profile files to access exactly this version over ssh."
-	elog "Or you can use 'eselect unison' to set the version."
-}