From 7b5734b95e87864f1a1ec9bf5f31b4def1bda09f Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan.goodliffe@octal.co.uk>
Date: Mon, 28 Sep 2020 09:58:24 +0100
Subject: Bump ocaml

---
 virtual/miller-dev/Manifest                        |   2 +-
 virtual/miller-dev/miller-dev-10.2.1.ebuild        | 115 ---------------------
 virtual/miller-dev/miller-dev-10.2.2.ebuild        | 115 +++++++++++++++++++++
 virtual/miller-workstation/Manifest                |   2 +-
 .../miller-workstation-12.2.1.ebuild               |  59 +++++++++++
 .../miller-workstation-12.2.ebuild                 |  59 -----------
 virtual/random-server/Manifest                     |   4 +-
 .../random-server/random-server-0.1.10.1.ebuild    |   2 +-
 virtual/random-server/random-server-0.1.10.ebuild  |  64 ++++++++++++
 virtual/random-server/random-server-0.1.9.ebuild   |  64 ------------
 10 files changed, 243 insertions(+), 243 deletions(-)
 delete mode 100644 virtual/miller-dev/miller-dev-10.2.1.ebuild
 create mode 100644 virtual/miller-dev/miller-dev-10.2.2.ebuild
 create mode 100644 virtual/miller-workstation/miller-workstation-12.2.1.ebuild
 delete mode 100644 virtual/miller-workstation/miller-workstation-12.2.ebuild
 create mode 100644 virtual/random-server/random-server-0.1.10.ebuild
 delete mode 100644 virtual/random-server/random-server-0.1.9.ebuild

(limited to 'virtual')

diff --git a/virtual/miller-dev/Manifest b/virtual/miller-dev/Manifest
index f7c42a8..be3fc8f 100644
--- a/virtual/miller-dev/Manifest
+++ b/virtual/miller-dev/Manifest
@@ -1 +1 @@
-EBUILD miller-dev-10.2.1.ebuild 2327 BLAKE2B 8bb1ed0b8f6a69705603321a69c6e8107e654242f31372d9add8e608977c061552914a12f4d2156494197aeec34c1e72eb14a1a99683f0c2f42670adee801cde SHA512 e2fa9c4f5c6b132b92647130f3b469a9855f32ee29c8b527f306bb8c6d37dbb0876a8e09ac78097d3a33b021340cdd1fa43ee236011cdcdfc259c75c36aa5862
+EBUILD miller-dev-10.2.2.ebuild 2327 BLAKE2B 913331c8e706d6330cff1f0608a330440796b53c4ace5568760f7a649140168be030f79141f6cf2cbc60d47807974e772b1fc71943d87fcf35b1634e7b2c6bd8 SHA512 941808f62b701bacb3a2ef4a740838f73d29e236b97e9bfa8d1c31a057200bfedd209134ae7089612de822c39a3884297260ff3bd7cd6d5e4d36352d2f8908f1
diff --git a/virtual/miller-dev/miller-dev-10.2.1.ebuild b/virtual/miller-dev/miller-dev-10.2.1.ebuild
deleted file mode 100644
index 27c5ac9..0000000
--- a/virtual/miller-dev/miller-dev-10.2.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-EAPI="7"
-DESCRIPTION="Virtual for Miller development workstations"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="X dotnet odbc mysql postgres cxx"
-
-RDEPEND="
-	=net-misc/unison-2.48*
-	=dev-lang/ocaml-4.04*
-	virtual/miller-base
-	app-text/cutemarked
-	app-vim/nerdtree
-	app-vim/json
-	app-vim/vim-javascript
-	app-vim/vim-spell-en
-	app-vim/nerdcommenter
-	app-vim/youcompleteme
-	app-vim/syntastic
-	app-vim/gitgutter
-	app-vim/alternate
-	app-vim/xsl-syntax
-	www-client/lynx
-	app-admin/webapp-config
-	postgres? (
-			dev-db/apgdiff
-			dev-db/postgresql_autodoc )
-	dev-util/uncrustify
-	dev-util/cproto
-	dev-util/ctags
-	net-nds/shelldap
-	sys-devel/gdb
-	dev-util/valgrind
-	dev-util/lcov
-	app-text/tidy-html5
-	app-doc/doxygen
-	app-benchmarks/wrk
-	sys-fs/inotify-tools
-	net-misc/shmux
-	app-misc/jq
-	cxx? (
-			dev-util/ccache
-			dev-util/cppcheck
-			sys-devel/clang[static-analyzer]
-			dev-util/splint
-		 )
-	media-fonts/freefont
-	media-fonts/hack
-	app-vim/vcscommand
-	dev-vcs/git
-	dev-vcs/git-extras
-	sys-devel/distcc
-	dev-util/patchutils
-	|| (
-		net-misc/iputils[arping]
-		net-analyzer/arping
-	)
-	dev-libs/libadhocutil
-	dev-libs/libdbpp-postgresql
-	dev-libs/libdbpp-mysql
-	dev-libs/icetray[ut]
-	dev-libs/fcgi
-	dev-libs/Ice
-	dev-libs/slice-parser
-	dev-cpp/glibmm
-	dev-cpp/libxmlpp:3.0
-	net-libs/libesmtp
-	www-apache/mod_fcgid
-	www-apache/apache-mod-markdown
-	media-gfx/imagemagick
-	app-shells/gentoo-bashcomp
-	app-arch/rar
-	net-ftp/ftp
-	media-video/ffmpeg
-	odbc? (
-			mysql? ( dev-db/mariadb-connector-odbc )
-			postgres? ( dev-db/psqlodbc )
-		  )
-	net-misc/youtube-dl
-	www-servers/apache
-	X? (
-			|| ( www-client/google-chrome ( www-client/chromium www-plugins/chrome-binary-plugins ) )
-			|| ( www-client/firefox www-client/firefox-bin )
-			|| (
-				net-misc/tigervnc
-				net-misc/vnc
-			   )
-			net-misc/rdesktop
-			media-gfx/gimp
-			kde-apps/kruler
-			net-analyzer/wireshark
-			x11-apps/xhost
-			dev-db/squirrel-sql
-			app-editors/okteta
-			kde-apps/dolphin-plugins-git
-			net-analyzer/nmap
-			dotnet? (
-				dev-util/monodevelop
-				|| (
-					>=dev-util/monodevelop-4
-					(
-					 dev-util/monodevelop-database
-					 dev-util/monodevelop-debugger-gdb
-					)
-				   )
-				)
-	postgres? (
-			|| (
-				dev-db/pgadmin4
-				dev-db/pgadmin3
-			   ) )
-	kde-apps/kcachegrind
-	app-editors/gvim
-	)"
-
diff --git a/virtual/miller-dev/miller-dev-10.2.2.ebuild b/virtual/miller-dev/miller-dev-10.2.2.ebuild
new file mode 100644
index 0000000..cbfe987
--- /dev/null
+++ b/virtual/miller-dev/miller-dev-10.2.2.ebuild
@@ -0,0 +1,115 @@
+EAPI="7"
+DESCRIPTION="Virtual for Miller development workstations"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="X dotnet odbc mysql postgres cxx"
+
+RDEPEND="
+	=net-misc/unison-2.48*
+	=dev-lang/ocaml-4.09*
+	virtual/miller-base
+	app-text/cutemarked
+	app-vim/nerdtree
+	app-vim/json
+	app-vim/vim-javascript
+	app-vim/vim-spell-en
+	app-vim/nerdcommenter
+	app-vim/youcompleteme
+	app-vim/syntastic
+	app-vim/gitgutter
+	app-vim/alternate
+	app-vim/xsl-syntax
+	www-client/lynx
+	app-admin/webapp-config
+	postgres? (
+			dev-db/apgdiff
+			dev-db/postgresql_autodoc )
+	dev-util/uncrustify
+	dev-util/cproto
+	dev-util/ctags
+	net-nds/shelldap
+	sys-devel/gdb
+	dev-util/valgrind
+	dev-util/lcov
+	app-text/tidy-html5
+	app-doc/doxygen
+	app-benchmarks/wrk
+	sys-fs/inotify-tools
+	net-misc/shmux
+	app-misc/jq
+	cxx? (
+			dev-util/ccache
+			dev-util/cppcheck
+			sys-devel/clang[static-analyzer]
+			dev-util/splint
+		 )
+	media-fonts/freefont
+	media-fonts/hack
+	app-vim/vcscommand
+	dev-vcs/git
+	dev-vcs/git-extras
+	sys-devel/distcc
+	dev-util/patchutils
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
+	dev-libs/libadhocutil
+	dev-libs/libdbpp-postgresql
+	dev-libs/libdbpp-mysql
+	dev-libs/icetray[ut]
+	dev-libs/fcgi
+	dev-libs/Ice
+	dev-libs/slice-parser
+	dev-cpp/glibmm
+	dev-cpp/libxmlpp:3.0
+	net-libs/libesmtp
+	www-apache/mod_fcgid
+	www-apache/apache-mod-markdown
+	media-gfx/imagemagick
+	app-shells/gentoo-bashcomp
+	app-arch/rar
+	net-ftp/ftp
+	media-video/ffmpeg
+	odbc? (
+			mysql? ( dev-db/mariadb-connector-odbc )
+			postgres? ( dev-db/psqlodbc )
+		  )
+	net-misc/youtube-dl
+	www-servers/apache
+	X? (
+			|| ( www-client/google-chrome ( www-client/chromium www-plugins/chrome-binary-plugins ) )
+			|| ( www-client/firefox www-client/firefox-bin )
+			|| (
+				net-misc/tigervnc
+				net-misc/vnc
+			   )
+			net-misc/rdesktop
+			media-gfx/gimp
+			kde-apps/kruler
+			net-analyzer/wireshark
+			x11-apps/xhost
+			dev-db/squirrel-sql
+			app-editors/okteta
+			kde-apps/dolphin-plugins-git
+			net-analyzer/nmap
+			dotnet? (
+				dev-util/monodevelop
+				|| (
+					>=dev-util/monodevelop-4
+					(
+					 dev-util/monodevelop-database
+					 dev-util/monodevelop-debugger-gdb
+					)
+				   )
+				)
+	postgres? (
+			|| (
+				dev-db/pgadmin4
+				dev-db/pgadmin3
+			   ) )
+	kde-apps/kcachegrind
+	app-editors/gvim
+	)"
+
diff --git a/virtual/miller-workstation/Manifest b/virtual/miller-workstation/Manifest
index a2aa214..749f853 100644
--- a/virtual/miller-workstation/Manifest
+++ b/virtual/miller-workstation/Manifest
@@ -1 +1 @@
-EBUILD miller-workstation-12.2.ebuild 1253 BLAKE2B 8ce4c1d64884014795d5db07486a72157aca114d94eb5732ca0116ea331b7811482b1d4415d214e25dd9b694304ec7401881cce354d7faaba29515d94a1a7350 SHA512 f4102c4690a4618928e1cdb734563804883ddcba5462e41b090d8d2f41929ee1160072d58dc6f63de091e90a2c893d67817023ec4512f190d70fbedc73b9ef56
+EBUILD miller-workstation-12.2.1.ebuild 1253 BLAKE2B 8be852f5e70b01d3daefd0ec736c45e8d5d92f2be19f32b4f58d382f39d44625f62b881b6ebb43a822dcdf7c7c9d0f9cca29a8472129d5e6d605525c0917ab9a SHA512 ed9b83ad2dd0139f7b0fbb920d37650fec66d708937d3cbba619a936144a1a1bac1a0256a7fd6eaa7e88625246b23798cfbc6f1629dedfdd22865e3bd7be465f
diff --git a/virtual/miller-workstation/miller-workstation-12.2.1.ebuild b/virtual/miller-workstation/miller-workstation-12.2.1.ebuild
new file mode 100644
index 0000000..8b8f15c
--- /dev/null
+++ b/virtual/miller-workstation/miller-workstation-12.2.1.ebuild
@@ -0,0 +1,59 @@
+EAPI="7"
+DESCRIPTION="Virtual for Miller workstations"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="rdp vnc xscreensaver vlc"
+
+RDEPEND="
+	=net-misc/unison-2.48*
+	=dev-lang/ocaml-4.09*
+	app-admin/systemdgenie
+	virtual/miller-base
+	kde-apps/kcalc
+	vlc? ( media-video/vlc )
+	net-im/pidgin
+	x11-plugins/pidgin-mbpurple
+	x11-plugins/purple-facebook
+	x11-plugins/pidgin-skypeweb
+	xscreensaver? ( x11-misc/xscreensaver )
+	media-fonts/corefonts
+	media-fonts/noto
+	media-fonts/noto-emoji
+	kde-misc/basket
+	virtual/jre
+	rdp? ( kde-apps/krdc[rdp] )
+	vnc? ( kde-apps/krdc[vnc] )
+	|| (
+			www-client/firefox
+			( www-client/chromium www-plugins/chrome-binary-plugins )
+			www-client/firefox-bin
+			www-client/google-chrome
+			www-client/opera
+	   )
+	kde-apps/filelight
+	|| (
+			mail-client/thunderbird-bin
+			mail-client/thunderbird
+	   )
+	games-misc/fortune-mod
+	|| (
+			app-office/libreoffice-bin
+			app-office/libreoffice
+	   )
+	media-gfx/gimp
+	www-plugins/adobe-flash
+	media-sound/clementine
+	kde-apps/spectacle
+	kde-apps/kwalletmanager
+	x11-misc/kdocker
+	kde-apps/okular
+	kde-apps/gwenview
+	kde-apps/dolphin
+	kde-apps/konsole
+	kde-plasma/plasma-meta
+	media-gfx/geeqie
+	kde-apps/ark
+	x11-themes/oxygen-gtk
+	"
+
diff --git a/virtual/miller-workstation/miller-workstation-12.2.ebuild b/virtual/miller-workstation/miller-workstation-12.2.ebuild
deleted file mode 100644
index ac96e4f..0000000
--- a/virtual/miller-workstation/miller-workstation-12.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-EAPI="7"
-DESCRIPTION="Virtual for Miller workstations"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="rdp vnc xscreensaver vlc"
-
-RDEPEND="
-	=net-misc/unison-2.48*
-	=dev-lang/ocaml-4.04*
-	app-admin/systemdgenie
-	virtual/miller-base
-	kde-apps/kcalc
-	vlc? ( media-video/vlc )
-	net-im/pidgin
-	x11-plugins/pidgin-mbpurple
-	x11-plugins/purple-facebook
-	x11-plugins/pidgin-skypeweb
-	xscreensaver? ( x11-misc/xscreensaver )
-	media-fonts/corefonts
-	media-fonts/noto
-	media-fonts/noto-emoji
-	kde-misc/basket
-	virtual/jre
-	rdp? ( kde-apps/krdc[rdp] )
-	vnc? ( kde-apps/krdc[vnc] )
-	|| (
-			www-client/firefox
-			( www-client/chromium www-plugins/chrome-binary-plugins )
-			www-client/firefox-bin
-			www-client/google-chrome
-			www-client/opera
-	   )
-	kde-apps/filelight
-	|| (
-			mail-client/thunderbird-bin
-			mail-client/thunderbird
-	   )
-	games-misc/fortune-mod
-	|| (
-			app-office/libreoffice-bin
-			app-office/libreoffice
-	   )
-	media-gfx/gimp
-	www-plugins/adobe-flash
-	media-sound/clementine
-	kde-apps/spectacle
-	kde-apps/kwalletmanager
-	x11-misc/kdocker
-	kde-apps/okular
-	kde-apps/gwenview
-	kde-apps/dolphin
-	kde-apps/konsole
-	kde-plasma/plasma-meta
-	media-gfx/geeqie
-	kde-apps/ark
-	x11-themes/oxygen-gtk
-	"
-
diff --git a/virtual/random-server/Manifest b/virtual/random-server/Manifest
index f43e8ef..95c5886 100644
--- a/virtual/random-server/Manifest
+++ b/virtual/random-server/Manifest
@@ -1,2 +1,2 @@
-EBUILD random-server-0.1.10.1.ebuild 1304 BLAKE2B e4b872cced8553fbe7681026fcc83c1ef371346f8333549533949e5b38b5fd813c94ec8bd3ac0caa1ac9cf5fd1d856a764aa4d4f0e4ee11fda7830160a1b3eb4 SHA512 275946185dbef6bf560ba35c85ca5348e43a90136d5b824846f02ef39b06f9b3d987624a4a87b1bdc9822736dffe14048a8e5cf8fcda18832f6b07d27dc644ac
-EBUILD random-server-0.1.9.ebuild 1293 BLAKE2B 2029df2325c320d44054d44b2b0292ccb2aaa0899bc5a32917b0cc40539f5af6baf3978e818daf9be988b51253af478f6854cc4e475c34d3f9bf3530cc9f7260 SHA512 7791a1b864e75d6173863b90da504742547ea87eb1d39cc3c766de4c036e2e9c82e9d6e6b5825674b963f46c4aca5ec302d1d8d673edcfe56fa625b4eabfd7e3
+EBUILD random-server-0.1.10.1.ebuild 1304 BLAKE2B 71904d6906cf20b6927e02bee6870af09227cdaa77c5d62f5d469669df74c7b23f358bae9e85294bb5ac5f707e9149f71d5a8dd59aa5c1ee6cab83b6306ae894 SHA512 d64214fd18990609d52191c35e2e1bcddb8ac622935c2af7432d06d756b1286ae102fc628bd5677bd3504b7c2808fc32587a52d0e85bdde3b88dd822446e0744
+EBUILD random-server-0.1.10.ebuild 1293 BLAKE2B c922865fe3057fa0fccf739d59202a8192160d56d639f87fea9018e1c4dc36b2b7bd595cfefab73ae42e729fcb04373d51db49da224810765a5d5640cced31c7 SHA512 5f269559bca670495e23dc441111f2db59615cd7ae950a9d7bdd4758fca54a51a4b3613274a75573b95054ec0ce83a949d4de83cccedfdede4b3e647cf805f01
diff --git a/virtual/random-server/random-server-0.1.10.1.ebuild b/virtual/random-server/random-server-0.1.10.1.ebuild
index fe454b2..0c2a4bd 100644
--- a/virtual/random-server/random-server-0.1.10.1.ebuild
+++ b/virtual/random-server/random-server-0.1.10.1.ebuild
@@ -12,7 +12,7 @@ IUSE="mediaserver dosfs ocfs2 ci"
 RDEPEND="
 	sys-apps/tuned
 	=net-misc/unison-2.48*
-	=dev-lang/ocaml-4.04*
+	=dev-lang/ocaml-4.09*
 	sys-devel/distcc
 	app-text/highlight
 	net-dns/bind
diff --git a/virtual/random-server/random-server-0.1.10.ebuild b/virtual/random-server/random-server-0.1.10.ebuild
new file mode 100644
index 0000000..a1bed09
--- /dev/null
+++ b/virtual/random-server/random-server-0.1.10.ebuild
@@ -0,0 +1,64 @@
+EAPI=7
+
+DESCRIPTION="Virtual for Random servers"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
+IUSE="mediaserver dosfs ocfs2 ci"
+
+RDEPEND="
+	sys-apps/tuned
+	=net-misc/unison-2.48*
+	=dev-lang/ocaml-4.09*
+	sys-devel/distcc
+	app-text/highlight
+	net-dns/bind
+	net-firewall/iptables
+	net-fs/samba
+	net-misc/dhcp
+	net-proxy/haproxy
+	net-nds/smbldap-tools
+	net-nds/shelldap
+	virtual/miller-base
+	virtual/miller-mailserver
+	virtual/miller-postgresql
+	virtual/miller-mysql
+	virtual/miller-webappserver
+	virtual/miller-webserver
+	virtual/miller-proxy
+	sys-apps/logwatch
+	sys-apps/glacier2-service
+	net-misc/gentoobrowse-api
+	www-apps/mirrorsearch
+	dev-util/ccache
+	>=sys-cluster/heartbeat-3.0.6
+	net-analyzer/fail2ban
+	net-misc/openntpd
+	net-analyzer/nagios
+	net-analyzer/nagios-plugin-check_raid
+	net-analyzer/nrpe
+	net-analyzer/check_drbd
+	net-analyzer/check_haproxy_stats
+	net-analyzer/check_ice
+	ci? (
+			virtual/ci-server
+		)
+	dosfs? (
+			sys-fs/dosfstools
+	)
+	ocfs2? (
+			sys-cluster/drbd-utils
+			sys-apps/ocfs2-service
+			sys-fs/ocfs2-tools )
+	mediaserver? (
+			net-misc/minidlna
+			media-tv/mythtv
+			x11-misc/xkeyboard-config
+			media-tv/mythfs
+			media-tv/p2pvr
+			net-misc/youtube-dl
+			net-p2p/transmission )
+"
diff --git a/virtual/random-server/random-server-0.1.9.ebuild b/virtual/random-server/random-server-0.1.9.ebuild
deleted file mode 100644
index 3ea3949..0000000
--- a/virtual/random-server/random-server-0.1.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-EAPI=7
-
-DESCRIPTION="Virtual for Random servers"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 mips ppc ppc-macos sparc sparc-fbsd x86 x86-fbsd"
-IUSE="mediaserver dosfs ocfs2 ci"
-
-RDEPEND="
-	sys-apps/tuned
-	=net-misc/unison-2.48*
-	=dev-lang/ocaml-4.04*
-	sys-devel/distcc
-	app-text/highlight
-	net-dns/bind
-	net-firewall/iptables
-	net-fs/samba
-	net-misc/dhcp
-	net-proxy/haproxy
-	net-nds/smbldap-tools
-	net-nds/shelldap
-	virtual/miller-base
-	virtual/miller-mailserver
-	virtual/miller-postgresql
-	virtual/miller-mysql
-	virtual/miller-webappserver
-	virtual/miller-webserver
-	virtual/miller-proxy
-	sys-apps/logwatch
-	sys-apps/glacier2-service
-	net-misc/gentoobrowse-api
-	www-apps/mirrorsearch
-	dev-util/ccache
-	>=sys-cluster/heartbeat-3.0.6
-	net-analyzer/fail2ban
-	net-misc/openntpd
-	net-analyzer/nagios
-	net-analyzer/nagios-plugin-check_raid
-	net-analyzer/nrpe
-	net-analyzer/check_drbd
-	net-analyzer/check_haproxy_stats
-	net-analyzer/check_ice
-	ci? (
-			virtual/ci-server
-		)
-	dosfs? (
-			sys-fs/dosfstools
-	)
-	ocfs2? (
-			sys-cluster/drbd-utils
-			sys-apps/ocfs2-service
-			sys-fs/ocfs2-tools )
-	mediaserver? (
-			net-misc/minidlna
-			media-tv/mythtv
-			x11-misc/xkeyboard-config
-			media-tv/mythfs
-			media-tv/p2pvr
-			net-misc/youtube-dl
-			net-p2p/transmission )
-"
-- 
cgit v1.2.3