Merge branch 'master' of github.com:tomboy-64/tbc

9 files changed, 4 insertions, 95 deletions

diff --git a/metadata/md5-cache/dev-util/idea-14.1.4 b/metadata/md5-cache/dev-util/idea-14.1.4
deleted file mode 100644
index 37a6ab7..0000000
--- a/metadata/md5-cache/dev-util/idea-14.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=IntelliJ IDEA is an intelligent Java IDE (Community Edition)
-EAPI=5
-HOMEPAGE=http://jetbrains.com/idea/
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.7
-RESTRICT=strip
-SLOT=0
-SRC_URI=http://download-cf.jetbrains.com/idea/ideaIC-14.1.4.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d8fd6130531d309ac8e8ab80c3e671b9
diff --git a/metadata/md5-cache/media-fonts/ricty-3.2.0-r1 b/metadata/md5-cache/media-fonts/ricty-3.2.0-r1
deleted file mode 100644
index 5b86746..0000000
--- a/metadata/md5-cache/media-fonts/ricty-3.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=media-fonts/inconsolata >=media-fonts/mix-mplus-ipa-20111002 media-gfx/fontforge X? ( x11-apps/mkfontdir media-fonts/encodings )
-DESCRIPTION=A beautiful sans-serif monotype Japanese font designed for code listings
-EAPI=4
-HOMEPAGE=http://save.sys.t.u-tokyo.ac.jp/~yusa/fonts/ricty.html
-IUSE=X
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=public-domain
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=https://github.com/yascentur/Ricty/tarball/3.2.0 -> Ricty-3.2.0.tar.gz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	font	cd7790315ca5b8c505e1e0513df6acce	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=552f984668f1a8e017a23c19ad8e44e1
diff --git a/metadata/md5-cache/net-misc/libres3-1.1 b/metadata/md5-cache/net-misc/libres3-1.1
index e955eb1..f335cb6 100644
--- a/metadata/md5-cache/net-misc/libres3-1.1
+++ b/metadata/md5-cache/net-misc/libres3-1.1
@@ -1,11 +1,11 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=dev-ml/camlp4 >=dev-ml/findlib-1.5.5 >dev-lang/ocaml-4 dev-ml/pcre-ocaml >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure unpack
+DEPEND=dev-libs/libpcre dev-libs/openssl:0 dev-ml/camlp4 >=dev-ml/findlib-1.5.5 >=dev-lang/ocaml-3.12.1 dev-ml/ocaml-ipaddr dev-ml/jsonm dev-ml/ocamlnet[cryptokit,httpd,pcre] dev-ml/ocaml-base64 dev-ml/ocaml-re dev-ml/ocaml-ssl dev-ml/odns dev-ml/optcomp dev-ml/ounit dev-ml/pcre-ocaml dev-ml/react dev-ml/tyxml dev-ml/uutf dev-ml/xmlm sys-devel/m4 sys-devel/make sys-libs/zlib virtual/pkgconfig >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Skylable LibreS3 - Amazon S3 compatible server
 EAPI=5
 HOMEPAGE=http://www.skylable.com/products/libres3
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 LGPL-2.1 openssl
-RDEPEND=dev-ml/camlp4 >=dev-ml/findlib-1.5.5 >dev-lang/ocaml-4 dev-ml/pcre-ocaml
+RDEPEND=dev-libs/libpcre dev-libs/openssl:0 dev-ml/camlp4 >=dev-ml/findlib-1.5.5 >=dev-lang/ocaml-3.12.1 dev-ml/ocaml-ipaddr dev-ml/jsonm dev-ml/ocamlnet[cryptokit,httpd,pcre] dev-ml/ocaml-base64 dev-ml/ocaml-re dev-ml/ocaml-ssl dev-ml/odns dev-ml/optcomp dev-ml/ounit dev-ml/pcre-ocaml dev-ml/react dev-ml/tyxml dev-ml/uutf dev-ml/xmlm sys-devel/m4 sys-devel/make sys-libs/zlib virtual/pkgconfig
 SLOT=0
 _eclasses_=eutils	351a78113be5b393c09a2c948701ad36	git-r3	1502b9838d043db47700b8120083e637	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361
-_md5_=38a2e4ed5569026dc7dcd1aca408e4d9
+_md5_=bb73e7f0749d0bfde16446e3db8ee090
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.10.15.23 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.10.15.23
deleted file mode 100644
index 9f0ff1a..0000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.10.15.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=10
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-23.15.10.0.tgz -> iwl7265-ucode-0.10.15.23.tgz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a0b4fe0ca5bd4bdb330200cf7240415b
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.12.17.25 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.12.17.25
deleted file mode 100644
index 19eed5d..0000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.12.17.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=12
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-25.17.12.0.tgz -> iwl7265-ucode-0.12.17.25.tgz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=e6c00291371546385ad63816e0e36f4c
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.13.30.25 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.13.30.25
deleted file mode 100644
index 9163161..0000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.13.30.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=13
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-25.30.13.0.tgz -> iwl7265-ucode-0.13.30.25.tgz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c50e12119a22226d1ce365130ce46c0c
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.14.30.25 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.14.30.25
deleted file mode 100644
index 2fe3851..0000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.14.30.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=14
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-25.30.14.0.tgz -> iwl7265-ucode-0.14.30.25.tgz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=783484efc552ed2756b929e4d6dc4d8d
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.8.24.22 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.8.24.22
deleted file mode 100644
index 0bb3274..0000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.8.24.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=8
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-22.24.8.0.tgz -> iwl7265-ucode-0.8.24.22.tgz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=d42e850d05558c702d2ba04b34781a02
diff --git a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.9.228.25 b/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.9.228.25
deleted file mode 100644
index 6f15d1d..0000000
--- a/metadata/md5-cache/sys-firmware/iwl7265-ucode-0.9.228.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install pretend setup
-DESCRIPTION=Firmware for Intel (R) Dual Band Wireless-AC 7265
-EAPI=5
-HOMEPAGE=http://wireless.kernel.org/en/users/Drivers/iwlwifi
-KEYWORDS=~amd64 ~x86
-LICENSE=ipw3945
-RDEPEND=!sys-kernel/linux-firmware[-savedconfig]
-SLOT=9
-SRC_URI=https://wireless.wiki.kernel.org/_media/en/users/drivers/iwlwifi-7265-ucode-25.228.9.0.tgz -> iwl7265-ucode-0.9.228.25.tgz
-_eclasses_=eutils	351a78113be5b393c09a2c948701ad36	linux-info	8f92e5ac1a1da684c5450b1b21a1f56a	multilib	df4e4d5cfd3d137d0c248e1991c0e4d6	toolchain-funcs	4b8d3388c0a6e798504e20ba30b49361	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ccd13f49eb6f396ad89a44cddc5f19eb