batch importHEADmaster

4 files changed, 125 insertions, 65 deletions

diff --git a/sci-mathematics/bedwyr/ChangeLog b/sci-mathematics/bedwyr/ChangeLog
index dfb8722..f08cd3e 100644
--- a/sci-mathematics/bedwyr/ChangeLog
+++ b/sci-mathematics/bedwyr/ChangeLog
@@ -1,48 +1,13 @@
 # ChangeLog for sci-mathematics/bedwyr
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*bedwyr-1.4_alpha9 (15 Aug 2013)
+*bedwyr-1.4_beta9 (20 Jun 2015)
 
-  15 Aug 2013; Quentin Heath <dawan@melix.net> -bedwyr-1.4_alpha1.ebuild,
-  +bedwyr-1.4_alpha9.ebuild:
-  - version bump
-  - fix man symlinks
-
-*bedwyr-1.4_alpha1 (13 Jul 2012)
-
-  13 Jul 2012; Quentin Heath <dawan@melix.net> -bedwyr-1.3_rc2.ebuild,
-  +bedwyr-1.4_alpha1.ebuild:
-  - version bump
-  - no more parallel build (because of ocamlbuild)
-  - sci-mathematics/ndcore and sci-mathematics/bedwyr merged
-  - better package layout but empty documentation
-
-*bedwyr-1.3_rc2 (29 Feb 2012)
-
-  29 Feb 2012; Quentin Heath <dawan@melix.net> +bedwyr-1.3_rc2.ebuild:
+  20 Jun 2015; Quentin Heath <dawan@melix.net> -bedwyr-1.3_beta6.ebuild,
+  -bedwyr-1.3_beta8-r2.ebuild, -bedwyr-1.3_beta10.ebuild,
+  -bedwyr-1.4_alpha1.ebuild, -bedwyr-1.4_alpha9.ebuild,
+  +bedwyr-1.4_beta9.ebuild, -files/bedwyr-1.3-beta8-src-Makefile.in.patch,
+  -files/bedwyr-1.4-alpha9-handle-empty-wildcard-lists.patch:
   version bump
 
-*bedwyr-1.3_beta10 (24 Feb 2012)
-
-  24 Feb 2012; Quentin Heath <dawan@melix.net> -bedwyr-1.3_beta8-r2.ebuild,
-  +bedwyr-1.3_beta10.ebuild:
-  version bump
-
-*bedwyr-1.3_beta8-r2 (15 Feb 2012)
-
-  15 Feb 2012; Quentin Heath <dawan@melix.net> -bedwyr-1.3_beta6.ebuild,
-  -bedwyr-1.3_beta8.ebuild, +bedwyr-1.3_beta8-r2.ebuild,
-  +files/bedwyr-1.3-beta8-src-Makefile.in.patch:
-  - version bump
-  - parallel make allowed
-  - doc built during compilation
-  - patch for broken makefile dependencies
-
-*bedwyr-1.3_beta8 (14 Feb 2012)
-*bedwyr-1.3_beta6 (14 Feb 2012)
-
-  14 Feb 2012; Quentin Heath <dawan@melix.net> +bedwyr-1.3_beta6.ebuild,
-  +bedwyr-1.3_beta8.ebuild, +metadata.xml:
-  initial ebuild
-
diff --git a/sci-mathematics/bedwyr/Manifest b/sci-mathematics/bedwyr/Manifest
index 0b9b3db..2f9bdc2 100644
--- a/sci-mathematics/bedwyr/Manifest
+++ b/sci-mathematics/bedwyr/Manifest
@@ -1,4 +1,6 @@
-DIST bedwyr-1.4-alpha9.tbz 205169 SHA256 416603c231a3cfe0f7b79135425845ce6a7824c4d1a414d411c870f03139fb8e SHA512 ba8d14df1c05826ce97018546bf93fc2972d52a3cde17b2177d1f06351d214d38dac74a4235eb984beb8d69b591e393b2fc53f7816e009b01023448b523d38cd WHIRLPOOL 4463412874550e73bd7e086b361c71ac44f15766954cb5c3c7b3eaad881b28d268ac768cf91d628a80cb08d694e4e94f5626690a29462f847b9ad51e52ece8ec
-EBUILD bedwyr-1.4_alpha9.ebuild 1953 SHA256 859aa0b6fff6e4fa72f4bc38a577c62651003b3f615199d2f617eb62c9a0ee55 SHA512 4ce8418c19d01e2ef7c2acf1d16b2e9ef9b87dea3f403851a7c318e517f577d9198d58ba3d8a33448fcefc94e1cc1c7afc23222a57d214fbd65de1ccd5898c10 WHIRLPOOL ac8a327fe20778b04a2ca53c60cc183586e5817ae5fd55dc3d568317f23973b7afc869e0efeca6be1d125eca7a858d2f47841eb2c4df5a50041ff5151d584645
-MISC ChangeLog 1420 SHA256 4d4d29cc68ef961e74578fe160b764fc813f03c51018377764b4aa2751d575a5 SHA512 d9ce3156294a0ed6506fb0d5cc9d4373f112e8c01397c8ae045a404c4d2f6234cfa78a4c965e5bf7547be076040f44fcaea0b58682bbb31ad92c4e713229bfd1 WHIRLPOOL f842f21709a9c9268fbb3b1e6aa638a09122908e0fe1ce930d8c84ca70c7bd40f60727da6830c18c85c222e260bb1daab5892e713a0669c5902f93d06b9d3f86
+DIST bedwyr-1.3-rc2.tar.bz2 117380 SHA256 4fd136e4836a936aa018e0cc1e853041009d2f0a69c0c2bbb1b762f2a02d7744 SHA512 e0b31ca105de2f712274c9f17ffedd1e6733a2a11c61ead29cb5d0e8f85f77b06e2bc2749303340e2a9893515294432d2a8649103b42f430a36bd392ffd3f16a WHIRLPOOL 454e7149efda8001352e1d0233dcacdf6aa75d4751bc4e76ea9df18a081302cd0bb3f38ba80a22b51e3c74458181f35b85b6f952552863b7e649605d5c14c432
+DIST bedwyr_1.4~beta9.orig.tar.gz 241044 SHA256 d4695afb7ae30e184617d25d5014dd6b4248df0d9a8d87b7764b0390a59b23d3 SHA512 b30ddd8eef657dfcf4326dc3a56d2ead98c6e705bb55f033c3eb2ccc670f0fe002fad964a3f949fb801edb5f9986d197c8d85a0c6d6eb9417525c48ec6b2f871 WHIRLPOOL 550f25bab115c84e12acf76801ebbb664f216b35dad952382a529fbcf349b8250d149c692e047215542f857b7666e51ceaaea711394fefb044f9185010fdd6d6
+EBUILD bedwyr-1.3_rc2.ebuild 2076 SHA256 e8b5cca3ce1ad7db024bcd29df4d66b1a93078cd8c54737727696030b79b1406 SHA512 9a86e0b820981818e49271f0ce0e4fe5b41c589f7722d13424713dd2d987119b72d0d37c5c6c525784a80ed8588d098c730486f6495a3ae3a64c3d3814aa54b6 WHIRLPOOL ea1d15b78b523bef782ca21355fab9b7193ffff03ba1b168c95e1a7dc2fd8724862ebb61cc08350f42362cc53e82f3ad5c74cbde89df9cc1e8fc7b4eef31ef8f
+EBUILD bedwyr-1.4_beta9.ebuild 1808 SHA256 5a9f86f8b3c61010928696645f76fa014fa10252759b510773a436b0e51341c5 SHA512 f85790bfcd3eb620971776425a093366a6fa330b66024a8f6b7c2f55e1890531424debd9ea9aaa2e2a6e3e02961abdecb9bb84886d249c6346ee6e97e34516e1 WHIRLPOOL c1e22e88dadfbb7fc322bddbeab8d02a6aedff44f7b66a3134fc5c83a9d51cc4b430fe777391022732d0bd52c739ffdb409ef8f453e323cefaa1d7cefd05c628
+MISC ChangeLog 496 SHA256 d579cf28aa1d913eaab8952d07d9e057b468b455a869b1f90a80d3b24586f5fc SHA512 b3b09c2a306db43cf60fb6ec54de476ffc8733e1904b09a3cb28036d3f0b48aaaa111c8961062ffad16ce3606f2959a4bdc514288df495d141e4aaed5bcfe09e WHIRLPOOL a99460ca4760a6197c669dc5dbb592dd975e2383c24216746a45b9836fc26558ddbf13e5531578e954e884336e1e597d47c2c8db19f8b931717435ac71077a11
 MISC metadata.xml 1386 SHA256 68531530ddae77f43095e13ddeede6a3eb3b1a0b95e7d112758a7dca9e2f4889 SHA512 8ff18ef060d150c744bfc563d84da266c8b6ee92f1d798ced9303d2b5830fa8cb08028776e40f2f3cbc912a9fdaa569fea194ad2f5e83f3e5e9b5f9fe4c2b33a WHIRLPOOL a65aa613ae738bd0611311444fa2b1df8cf1f19435f949fa335c9dd7bd581d7493c0d2b3aad56faf3824518b5b0cf17f70743b45f8eb925f3a577f94b24bdcc5
diff --git a/sci-mathematics/bedwyr/bedwyr-1.3_rc2.ebuild b/sci-mathematics/bedwyr/bedwyr-1.3_rc2.ebuild
new file mode 100644
index 0000000..3ba776e
--- /dev/null
+++ b/sci-mathematics/bedwyr/bedwyr-1.3_rc2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils autotools
+
+MY_PV="${PV/_/-}"
+TARBALL_NAME="bedwyr-${MY_PV}"
+
+DESCRIPTION="Bedwyr, the not-so-sound logician"
+HOMEPAGE="http://slimmer.gforge.inria.fr/bedwyr/"
+SRC_URI="https://gforge.inria.fr/frs/download.php/30289/${TARBALL_NAME}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt vim-syntax emacs -tac -spec +rlwrap ledit debug doc"
+
+DEPEND=">=dev-lang/ocaml-3.10.0[ocamlopt?]
+doc? ( virtual/latex-base dev-texlive/texlive-latexextra dev-tex/hevea )
+sys-devel/autoconf
+~sci-mathematics/ndcore-${PV}[ocamlopt?]"
+RDEPEND="${DEPEND}
+rlwrap? ( app-misc/rlwrap )
+ledit? ( app-misc/ledit )
+vim-syntax? ( >=app-editors/vim-7 )
+emacs? ( virtual/emacs )
+tac? ( sci-mathematics/tac )
+spec? ( sci-mathematics/spec )"
+
+S="${WORKDIR}/${TARBALL_NAME}"
+
+
+#pkg_setup()
+
+#src_unpack () {
+#	unpack ${A}
+#	rpm_src_unpack ${A}
+#}
+
+src_prepare() {
+	eautoconf
+}
+
+src_configure() {
+#	local myconf="--prefix=${EPREFIX}/media/devel/chroot"
+	local myconf=""
+
+	econf $myconf \
+		$(use_enable ocamlopt nativecode) \
+		$(use_enable debug) \
+		$(use_enable doc)
+#	./configure \
+#		--prefix=/usr/local \
+#		--infodir=/usr/share/info \
+#		--mandir=/usr/share/man || die
+}
+
+src_compile() {
+	emake TARGET="${PN}"
+	emake TARGET="${PN}" doc
+}
+
+src_test() {
+	emake TARGET="${PN}" test
+}
+
+src_install() {
+	emake TARGET="${PN}" DESTDIR="${D}" install
+	#emake \
+	#	prefix="${D}"/usr/local \
+	#	mandir="${D}"/usr/share/man \
+	#	infodir="${D}"/usr/share/info \
+	#	libdir="${D}"/usr/$(get_libdir) \
+	#	install || die
+	#einstall || die "install failed"
+}
+
+#pkg_preinst()
+
+pkg_postinst() {
+	einfo "Please read the doc. And don't hesitate to comment."
+
+	use rlwrap && einfo "Add \"alias bedwyr='rlwrap bedwyr'\" to ~/.alias" \
+		&& einfo "to ease use (readline version)."
+	use ledit && einfo "Add \"alias bedwyr='ledit -h ~/.bedwyr_history bedwyr'\"" \
+		&& einfo "to ~/.alias to ease use (ledit version)."
+}
+
+#pkg_prerm()
+
+#pkg_postrm()
+
+#pkg_config()
diff --git a/sci-mathematics/bedwyr/bedwyr-1.4_alpha9.ebuild b/sci-mathematics/bedwyr/bedwyr-1.4_beta9.ebuild
index 93628db..74c0798 100644
--- a/sci-mathematics/bedwyr/bedwyr-1.4_alpha9.ebuild
+++ b/sci-mathematics/bedwyr/bedwyr-1.4_beta9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Quentin Heath
+# Copyright 2012-2015 Quentin Heath
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -7,21 +7,24 @@ EAPI=4
 inherit eutils autotools
 
 SLOT="1"
-MY_PV="${PV/_/-}"
-TARBALL_NAME="${PN}-${MY_PV}"
+MY_PV1="${PV/_alpha/~alpha}"
+MY_PV2="${MY_PV1/_beta/~beta}"
+MY_PV3="${MY_PV2/_/-}"
+TARBALL_NAME="${PN}-${MY_PV3}"
 
 DESCRIPTION="Bedwyr, the not-so-sound logician"
 HOMEPAGE="http://slimmer.gforge.inria.fr/bedwyr/"
-SRC_URI="https://gforge.inria.fr/frs/download.php/32337/${TARBALL_NAME}.tbz"
+SRC_URI="http://slimmer.gforge.inria.fr/releases/debian/pool/main/b/bedwyr/bedwyr_1.4~beta9.orig.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="+ocamlopt vim-syntax +rlwrap ledit debug doc"
+IUSE="+ocamlopt vim-syntax +rlwrap ledit debug doc test"
 
 DEPEND=">=dev-lang/ocaml-3.11.0[ocamlopt?]
-doc? ( app-text/texlive[extra] dev-tex/hevea dev-tex/mathpartir )
->=sys-devel/autoconf-2.60
-!sci-mathematics/ndcore"
+doc? ( app-text/texlive[extra] dev-tex/hevea dev-tex/mathpartir app-text/ghostscript-gpl )
+test? ( dev-ml/ounit )
+dev-ml/xmlm
+>=sys-devel/autoconf-2.60"
 RDEPEND="${DEPEND}
 rlwrap? ( app-misc/rlwrap )
 ledit? ( app-misc/ledit )
@@ -35,7 +38,7 @@ S="${WORKDIR}/${TARBALL_NAME}"
 #src_unpack()
 
 src_prepare() {
-	epatch "${FILESDIR}/${TARBALL_NAME}-handle-empty-wildcard-lists.patch"
+	#epatch "${FILESDIR}/..."
 	eautoconf
 }
 
@@ -61,11 +64,11 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" install
 
-	# fix manpage renaming
-	rm "${D}/usr/share/man/man1/bedwyr.byte.1.gz"
-	ln -s "${D}/usr/share/man/man1/bedwyr.1.bz2" bedwyr.byte.1.bz2
-	rm "${D}/usr/share/man/man1/bedwyr.native.1.gz"
-	ln -s "${D}/usr/share/man/man1/bedwyr.1.bz2" bedwyr.native1.bz2
+	## fix manpage renaming
+	#rm "${D}/usr/share/man/man1/bedwyr.byte.1.gz"
+	#ln -s "${D}/usr/share/man/man1/bedwyr.1.bz2" bedwyr.byte.1.bz2
+	#rm "${D}/usr/share/man/man1/bedwyr.native.1.gz"
+	#ln -s "${D}/usr/share/man/man1/bedwyr.1.bz2" bedwyr.native1.bz2
 }
 
 #pkg_preinst()
@@ -73,12 +76,6 @@ src_install() {
 pkg_postinst() {
 	einfo "Refer to quickstart.html and refman/index.html."
 	einfo "Any feedack is welcome."
-
-	use rlwrap && einfo \
-		"Add \"alias bedwyr='rlwrap -c -Cbedwyr -D2 -g'\\''^(n|y)$'\\'' -m \
--pgreen -q'\\''\\\"'\\'' bedwyr'\" to ~/.alias."
-	use ledit && einfo \
-		"Add \"alias bedwyr='ledit -h ~/.bedwyr_history bedwyr'\" to ~/.alias."
 }
 
 #pkg_prerm()