Import latest changes from science overlay, thanks Ted Tanberry for the work; fixes #504680

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

9 files changed, 647 insertions, 11 deletions

diff --git a/sci-biology/emboss/ChangeLog b/sci-biology/emboss/ChangeLog
index 7608647f1e7d..10c9731636aa 100644
--- a/sci-biology/emboss/ChangeLog
+++ b/sci-biology/emboss/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-biology/emboss
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.71 2014/12/28 16:46:09 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/ChangeLog,v 1.72 2015/03/28 17:03:16 jlec Exp $
+
+*emboss-6.6.0 (28 Mar 2015)
+
+  28 Mar 2015; Justin Lecher <jlec@gentoo.org> +emboss-6.6.0.ebuild,
+  +files/README.gentoo, +files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch,
+  +files/emboss-6.6.0_fix-build-system.patch,
+  +files/emboss-6.6.0_plplot-declarations.patch,
+  +files/emboss-6.6.0_qa-implicit-declarations.patch, metadata.xml:
+  Import latest changes from science overlay, thanks Ted Tanberry for the work;
+  fixes #504680
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> emboss-6.3.1_p4.ebuild,
   emboss-6.3.1_p4-r1.ebuild:
diff --git a/sci-biology/emboss/Manifest b/sci-biology/emboss/Manifest
index 622de573a238..c362048584fe 100644
--- a/sci-biology/emboss/Manifest
+++ b/sci-biology/emboss/Manifest
@@ -1,27 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 22emboss 110 SHA256 cf3bd3b8d2638a0cd14e57839033d63c855114a0e12883bbc7a5106b0cfc01ad SHA512 4ba3f49ac2dbe3cb80c39d15674d7437261341fb445c13ac46da8fb9d679948bf5883a99a0ef90bd6dc7f870547c245b61a8e0d88266af4edd260b69eb741df7 WHIRLPOOL d6cf646af57301b94c377701e19978cbe693aa10f5b9357027a1f4a63e0bab6870818c7ce9fde5d644c2c508607ff44603c1cdc9c22eb73435f3e25778f73cff
 AUX 6.3.1_p4-unbundle-libs.patch 18988 SHA256 1f6170a8f4182792d145fd21b6b23d817ea9f5ea39ba77721947ae67a6b6927d SHA512 c11383cca08adbb597c45fd0c86106fa8c051e31807e8afc2daa428f44c023efa9bde0ae093c8711b7de650144c2511e8db67c627cb02d926b1ebb4ffc56a013 WHIRLPOOL a43a09086f08ce7fda67b155720eb0776ee79dc41fc4e4894f1b3e27fa05665e5b75a16066d238f661f7fefa4944b6cb107ade6eb3d8c6700d023d7fd55276e8
 AUX README.Gentoo 1326 SHA256 33b517b977cc85824847bd6cf4113489a5554fb014f1a6b1d22d6f80c3487e9f SHA512 b8d4c96e03107a4a0f73181888950c8b71d0e2ddacaa97c2e7bbdfe3e24391ca107f960bc95cb91a809794eb2d55695654fd24e2708f477423b48535909aa670 WHIRLPOOL 216067009b1415eea119aaaa2c93c41ffa6735424683498b17791874255e833dfc478934edcd40b845f4232707e72241e3c06090e24e998f7fafda212ab214c3
+AUX README.gentoo 1522 SHA256 3cbb20ef948613f07698ab17c2b432e3aeab0ade6499a965c538d4feae8440d2 SHA512 a5441a056ebb11d24b83b8bfb9182f0753b85ec5ba126a123eb97c55fc665dadff2cc5f16c8e4314535f1b6a206c200324c0c5d5db6af109c841ee68ac76bb07 WHIRLPOOL b659d2c08416786ce4bdd0de0d61da49c1e6be4524e19c4b262a81a6455bf6b3e24ca0f1c7b5414c5fda35a006827fc5e229411821247b76bc26afda5a0a21d8
 AUX emboss-5.0.0-as-needed.patch 1751 SHA256 e57a60d911e32f1aea16c079e2fd0910a5f7ed43752ea71094d3f3b7575617d3 SHA512 a2d978ce86fc3a63dc691059c4da598ccfb958d51097bc6070204ad6062f257b3ac496b852bb2772041bda087d0732cf03c4a4868462781700705da4faff8b59 WHIRLPOOL 101b8c89052dbc24211363e4fbe45e1407a30f8046013269d360b983a677ad5e62be796baf1d1097ae30dc392dc8db789d784dad51384e9c9b8df526b475a1d6
 AUX emboss-6.3.1_p4-r1_plcol.patch 3638 SHA256 dfaf85cf5c53a42047a75b1544ca44b450f2d4219c458c243bab53166f917b64 SHA512 63feed3dc32769b1c77ee79c4fd2f7d84d3d9bc6b716bc5f8dbef9ecff441432e7c1030b4d42e2da647231a27b6a7ae094b2115730ba8de94a363644d33ee489 WHIRLPOOL 7ba010b3a3a7eb116e4b0b85734648112fd4a6d780d32bde67a459fe23385b5f73a70d69b67b6d775992227ea90fb5edba21db1e4b51624aabfe5831b590e40d
+AUX emboss-6.6.0_FORTIFY_SOURCE-fix.patch 417 SHA256 317bff2c29f321afe7274babba8db554420a26744cef6aa73885b18e7434e89f SHA512 9873504675825613c913fbd8c03d919c5d70ad7f15e3983ae9dc5ecd04e57d1086c303a4f38efd29def4f089099b24449014bbe965816c7f8b37a5d4ffa13469 WHIRLPOOL b23ea76326c732d5c25429589bed6301d0a6e9342523275a40c225c2af0e25eb2b6279905c52633b35eb3208bf43b7f4a1307c5f66bf95e81e8c8097d967d801
+AUX emboss-6.6.0_fix-build-system.patch 10976 SHA256 5ce7f95c2deaf6ce4f7ffa617f61de6c77dc05b74e420fa57e0562142215b180 SHA512 d03cc98b0dcbf997ab562007e2190c03e8dbbda4ee3d679001bbcdfb0d33afd717560e445f9a463b7b1e36bba59b4accb7318c2a38ffb2fb6283dd3482dbfbfc WHIRLPOOL cc58a4041730d48ce958c0babef2d0185df9bf1738daff88a5b62724ceca27438ea7c8370fafc309d816bf76b80b3c23d063d915dbe59e081ab794da29b38079
+AUX emboss-6.6.0_plplot-declarations.patch 1562 SHA256 d0146d519f23c0bee9c2b13cde1c8f6b4e2ae333740672623620d5236e58326d SHA512 fc27b7c1d518b5cdacf1964d56219c6574f43d18dc324e41b9dcdfd1afef17a784f2b209b62c366fb902ba57a50f438a1b328eb2118ee9463ce82b36039bc0bb WHIRLPOOL d23b7a061d1fa41c8319fd9f00168153022a70575148b6c23cd41d9fa9cf393caddb3d26a4ebcf94b66892998bd356b2ea391f448306706e364603bdbe809153
+AUX emboss-6.6.0_qa-implicit-declarations.patch 1324 SHA256 87de58d0a6225ba7f4644edd802d8c8658d59bd8140b48771da86b849e725b96 SHA512 15c303fe48a438f50f1c9a0efd7e8fcbcb4102151fc182feb8e0d74c47c3435385a1e44436cebd3c2017c97dd89b82832258748f28f3740e511a92b088f539fb WHIRLPOOL d1aeee505672c1ec596afc547052324144f4b72f397722d9e387d94c1940b30f81b8f265d9cd1ef902dea083f628ae79a3a3e5f65bb2342eb54c57fa169ca60a
 AUX emboss-README.Gentoo-1 1474 SHA256 e97558bbc8296f2e9395080061e494b282303ed69e1d6eb45554846617b47abd SHA512 92d6f567d10b6dc9188a736f502b8ab3961d6930424ed8ff3a6d21f9a8037cb94d5d20c9dce186fecd4da4b8cbc2cd842998e4d48a452abf69fc960d9bc9fd7f WHIRLPOOL 0ecc950f391c23afcdf3607ab6ef27a87b7a9b62e5ce15b3bca78166529c9dce7794cfdb181e99993326ee5b512707abfef230425a187b23b0bb8db2adb97af3
 AUX emboss-README.Gentoo-2 1516 SHA256 47f78101b0759f5c629ebee630c14871f1c579c40336a0666647680bc549914e SHA512 cc50a7c9310e57f2a3b9516d9265c47828e368b9eb13a2030c1baf85bc45d831479d3c873638fe0c208853829ed10776f4363a286f57a94852f0986a53249ef3 WHIRLPOOL b589c5407c1eb43455e7a09295a443b9b0806099e90d04545202d9d3d401b834e6f54b5063324c45ca20e2749101edc55c5128883630d582268244776f385687
 DIST EMBOSS-6.0.1.tar.gz 20204153 SHA256 3e352902aa9dab88bf486457ff23794f19398dfc6b550c4bf175dfcad34c233d
 DIST EMBOSS-6.1.0.tar.gz 21968220 SHA256 033d205c108e10e314b1ca61ec026a4a7fec2780e8781da67b0e16825b63af41
 DIST EMBOSS-6.3.1.tar.gz 23572243 SHA256 4f3290600a970c2a23a7e47f884d1fc8156ec40538f7191a6e83e23680d27a8d
+DIST EMBOSS-6.6.0.tar.gz 117962028 SHA256 7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e SHA512 2d28a03381f7dc98d205aa50202fbbac02ad218fc775d86579d310296be124403623484b1907154d915f15cd32a9f8cf16ecfaa6c4a28b362e24dc8e6380b75a WHIRLPOOL 25241e865b1ad4e5459f84a2b0def7cd00a6e2904db714838dfe0533e01f8373cfdd4c78df225f9d2a77ead4cb9998791bd19f46b32e220810ad950fa288b9fe
 DIST emboss-6.3.1_p4.patch.gz 4070 SHA256 61d1b62e3148541d496103711db6526ba76488a0899af2c98264b03bf8d6e24c
 EBUILD emboss-6.0.1.ebuild 3462 SHA256 e0b2cc3fa1d46fce803a3054e5a7a37f3e8f532822fe5c4e27c5f13988f3bdfd SHA512 60f0b43ab3377791dd44553a4bbd9817fa498afa7ac1a11c334f20ae3d431aef4e35b9a1b38a572bd185ecb5cd29e69de24f13c90c36b689299bc5b2d2194932 WHIRLPOOL 2fe9a606dc570e8236898fbde67dac4b05ba19eb6c65bbfd13fefb11e6bc2e0fab19c39555cccbcdab734636b9f058f88529816e0878a3db8e40548610cceb0d
 EBUILD emboss-6.1.0-r1.ebuild 3697 SHA256 599e0cda62759ffe7eee70380f38535c3b293caeaba42e7d71e57f29dc562d05 SHA512 76e8d983d40f22932ff927b3ee4795d4fc960c8f9af51915a8015c1f2e5af8a8546025befbbe98482fbf07eb72b74259f6d3cfda9983fa2df4aee73319f38d3d WHIRLPOOL ffbc015fdae4041d27a238888e0bb432618014cf6aadbd736526d7f6d0413b72c78bca4efd991294bcd78879c289e4524906fcd1a41a5a2427dc9c537600e02b
 EBUILD emboss-6.3.1_p4-r1.ebuild 3552 SHA256 b98299dbbd7c6fe64de451eccb224935cbd36566b837ec98d672c5e0ecda5571 SHA512 f0d2eafdf5364a4a64011b1ede64e78014a41357187cd746979f12afd30de4135e43a525f856b8f43153fd85863ed306236edfb2848f849a471a8028c298668f WHIRLPOOL 7952605042b63201d5e0aececb9554c06ca8270f1abcbd6e221d59b19803e8fcc38889df0464deed16d874da4970cfb9ad505613092286d0cf2fd1f53b5933e2
 EBUILD emboss-6.3.1_p4.ebuild 3513 SHA256 adaead0663a722e32cd1e4d90117e5073a5627652495adc3204cd01b5fd92418 SHA512 0ada918e8b916fb5e58a927d100db3e2302aa6d07584f390baedd5d62dc860fe78d22456695a73a935f18d6a93954f7a3a75bf9955c51fb75b71163fcb21e2e6 WHIRLPOOL 37e9d6553116ce552d93274031e69c0445d439320c3cb75ffb5b0099e891ffd2f21024c5e36cc730bc9d727ae08521a37f5fc3d566dba1d8fd6479f90c17a915
-MISC ChangeLog 12310 SHA256 efde615e77e693431a3303e09c66f85f57d3601a711d1ffb2abfe44e0edf5d01 SHA512 8b53c46732dba18d7f8397345ceca76fc3912d0abdaed1aad44d40cf20beface776dafcf71426129b959929607c6d939ed2ff6a7775dec6a1e9a896e3c0f0ce0 WHIRLPOOL d40d6c3ddf56c68c8e2979af8f6bc983de6451dc7b0ceb972cdb56d446f68974c9f811fa69c9db3914b0e3603da89046a0f7c9c63d51774bb3dc53608bfded74
-MISC metadata.xml 924 SHA256 9a25a29f9ad98792903c439ad7dd4ec485e44e60e23beaf1fa4c209ea89be49b SHA512 1373628f4293e287705092d8d3dea2b44fed318d52d4171704f0b4199469eee45cf59f49155d12650f8081557bba4253f7266f61b5cb295c80f37fb940fd5156 WHIRLPOOL b5546eeac598092b59ca7f9734bfef77110b3ff21a541db3906e8915a1893c8d7189848ef0dd643e065b273c5034cdc441535ad1ffc21bc504c3566979a6a037
+EBUILD emboss-6.6.0.ebuild 1779 SHA256 7590f591ce76ae91a14314ff7fe906a5a7af80348516ada361d19a0e4be93e37 SHA512 2f990414a1e1c1468ca43aa70a9dd5a8c10762a5f299b8c8a292be4d855a2d296780794ad954e6fb433bf931ab243f3e1f9bfe47a51fc6b0354665a4af179ea2 WHIRLPOOL 1b10864dc65760a4e90e2aa71f2d340421fdc7c21ec235c4c1e6efcf406a789fd991906b8383588df786428b69342e6661631df2fbe802b7ffb3b3580d6f068b
+MISC ChangeLog 12732 SHA256 5f2012c51ea53e490e79afad355bcbd9e9677f02f020133261d4f19d9281ff29 SHA512 b0c5cd0dd8f2330d98cdcf848004677dc31f651f92e504843455fc9cecdf2d5e0bde4b3d4fc9415e69cd025d620b0af5a67a7595292f7557928bc185f20134e7 WHIRLPOOL 5ed257dab795fa0057f334313c8cf10e441b75a6a601a69669b768ee184f9eac68608d1094ec4fc8564894b2f70e76cf95b97ea0b1fa92ab1c2dda86792410ef
+MISC metadata.xml 926 SHA256 71766485eac6593e84b57885a4ecdd945700276f699ae0e2f041ef0fa2e4287e SHA512 2da828f1c2eca2eff95c972eadbf48a59a610966a0eac30d45302ff8ff133069121fd8d14e2a1135d866b2a4610b772f6a74445fa1324959dac08ec353284a41 WHIRLPOOL 61c4316c57e6fc9451ef928fa81a0becf2f3c4b3c4fcb2fb23896655b8bd0c1471797d84fa0c86a5502e1c02421f9605b62bbb83ee1893a3d2f7af8167436dfc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlSgM9MACgkQVxOqA9G7/aCChAD/fG1Q1zF/QSpbKyb+ZGK/cIuQ
-YYQEA1G4PAH+0IIleyMBAIOl5+S+9zJ0mdjvktfCckWrxBk8IYECCcJwoNNWWHjK
-=FAgX
+iQJ8BAEBCgBmBQJVFt7ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirW1AP/05BrCCzqT8q+cKlhZ9m8KND
+4n4TbX69qvhJ1FFfrO3tMPpSd+zOJhH50myjHIE1SCp0j+gNbFPY/W5IUzbg8/lM
+gDeQrqTgLFZlpllGU3ZRPP0bga6yH+W5zfnV0xhmOSk76o04ce3GI6Fz+MpMNWeh
+CE1pVbfPHbDMtIivoR6Jbq15i3sCHu38KIHyWV+1TxxZAKWHmOLayWcjHDCnhRhH
+D8WLsbkOjpqhjr13D4YmloadbLSuXLDDyo6dSQNaQ0oQr5Lm5SQTzOGG8oin4lDG
+huZzW8FATLUnn+0Wc6nfl+06tzi5htIUQEm3Mfh8o0qxyLZ3AnAQwzGpSaR2eCm9
+V50Bwvu9eFyi1WY2mxbJ45M6sfjHVgyOdJ5oreZVaX978Rq3/kZlfoO4p0lCkpx/
+hIUHaG6bIFxau18WuS8QvyDSSJusXws/FyXoAPjDXTZGGIyFz4cvmh+yPE/JFdnQ
+Tq77++RGlEoGxMg1iUSV3P1l/e8x07mwphzbFBDfv5BKQpcXEHcVM86seFhfMcFb
+MQg1KjLPXvcTZl1eUrHwTw3TfC6QpgzfO29J3NcKuU5UWimdeAJg2aEDRv0Akp+o
+wplfsnrMhsq0PvQR3kRWr92UE2G7Que0pMIwzSy2XOugOkN6QWQtu4zhlmZwn+RD
+/3wvZcXOYvOzIMO2OF/r
+=lRGc
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/emboss/emboss-6.6.0.ebuild b/sci-biology/emboss/emboss-6.6.0.ebuild
new file mode 100644
index 000000000000..5343130d128e
--- /dev/null
+++ b/sci-biology/emboss/emboss-6.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/emboss/emboss-6.6.0.ebuild,v 1.1 2015/03/28 17:03:16 jlec Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+inherit autotools-utils emboss-r1 eutils readme.gentoo
+
+DESCRIPTION="The European Molecular Biology Open Software Suite - A sequence analysis package"
+SRC_URI="ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE+=" minimal"
+
+RDEPEND+=" !sys-devel/cons"
+PDEPEND+="
+	!minimal? (
+		sci-biology/aaindex
+		sci-biology/cutg
+		sci-biology/prints
+		sci-biology/prosite
+		sci-biology/rebase
+		)"
+
+S="${WORKDIR}"/EMBOSS-${PV}
+
+DOCS=( ChangeLog AUTHORS NEWS THANKS FAQ )
+
+PATCHES=(
+	"${FILESDIR}"/${P}_fix-build-system.patch
+	"${FILESDIR}"/${P}_FORTIFY_SOURCE-fix.patch
+	"${FILESDIR}"/${P}_plplot-declarations.patch
+	"${FILESDIR}"/${P}_qa-implicit-declarations.patch
+)
+
+src_install() {
+	# Use autotools-utils_* to remove useless *.la files
+	autotools-utils_src_install
+
+	readme.gentoo_create_doc
+
+	# Install env file for setting libplplot and acd files path.
+	cat > 22emboss <<- EOF
+		# ACD files location
+		EMBOSS_ACDROOT="${EPREFIX}/usr/share/EMBOSS/acd"
+		EMBOSS_DATA="${EPREFIX}/usr/share/EMBOSS/data"
+	EOF
+	doenvd 22emboss
+
+	# Remove useless dummy files
+	find "${ED}"/usr/share/EMBOSS -name dummyfile -delete || die "Failed to remove dummy files."
+
+	# Move the provided codon files to a different directory. This will avoid
+	# user confusion and file collisions on case-insensitive file systems (see
+	# bug #115446). This change is documented in "README.gentoo".
+	mv "${ED}"/usr/share/EMBOSS/data/CODONS{,.orig} || \
+			die "Failed to move CODON directory."
+}
diff --git a/sci-biology/emboss/files/README.gentoo b/sci-biology/emboss/files/README.gentoo
new file mode 100644
index 000000000000..d1879bd0811c
--- /dev/null
+++ b/sci-biology/emboss/files/README.gentoo
@@ -0,0 +1,34 @@
+Administrating EMBOSS on Gentoo systems
+=======================================
+
+
+Codon data files location
+-------------------------
+
+The codon data files that are distributed with EMBOSS are installed in the
+``EPREFIX/usr/share/EMBOSS/data/CODONS.orig`` directory instead of the usual
+``EPREFIX/usr/share/EMBOSS/data/CODONS``. This is done to avoid confusion between
+these codon files and those installed with the CUTG database. The names of
+these files sometimes vary only by their case. Having both sets of files in
+the same directory is also impossible on systems such as MacOSX, where the
+root filesystem is case insensitive. If you do not have the CUTG database
+installed and want to use the codon files distributed with EMBOSS, you can
+symlink the ``CODONS.orig`` directory to ``CODONS``::
+
+	# cd ${EPREFIX}/usr/share/EMBOSS/data
+	# ln -s CODONS.orig CODONS
+
+
+Restriction enzymes equivalence file location
+---------------------------------------------
+
+The restriction enzymes equivalence file distributed with EMBOSS is installed
+as ``EPREFIX/usr/share/EMBOSS/data/embossre.equ.orig`` rather than the usual
+``EPREFIX/usr/share/EMBOSS/data/embossre.equ``. This is done to avoid a file
+collision with the equivalence file provided by the Rebase database. If you do
+not have the Rebase database installed and want to use the equivalence file
+distributed with EMBOSS, you can symlink the ``embossre.equ.orig`` file to
+``embossre.equ``::
+
+	# cd ${EPREFIX}/usr/share/EMBOSS/data
+	# ln -s embossre.equ.orig embossre.equ
diff --git a/sci-biology/emboss/files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch b/sci-biology/emboss/files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch
new file mode 100644
index 000000000000..7704873e9d26
--- /dev/null
+++ b/sci-biology/emboss/files/emboss-6.6.0_FORTIFY_SOURCE-fix.patch
@@ -0,0 +1,11 @@
+--- EMBOSS-6.6.0/emboss/embossversion.c
++++ EMBOSS-6.6.0/emboss/embossversion.c
+@@ -415,7 +415,7 @@
+ 	ajFmtPrintF(outfile, "X_DISPLAY_MISSING %d\n", X_DISPLAY_MISSING);
+ #endif
+ #ifdef _FORTIFY_SOURCE
+-	ajFmtPrintF(outfile, "_FORTIFY_SOURCE %d\n", _FORTIFY_SOURCE);
++	ajFmtPrintF(outfile, "_FORTIFY_SOURCE %d\n", __USE_FORTIFY_LEVEL);
+ #endif
+ 	ajFmtPrintF(outfile, "\n");
+ 	ajFmtPrintF(outfile, "Sizes (bytes):\n");
diff --git a/sci-biology/emboss/files/emboss-6.6.0_fix-build-system.patch b/sci-biology/emboss/files/emboss-6.6.0_fix-build-system.patch
new file mode 100644
index 000000000000..c831c3ba7e28
--- /dev/null
+++ b/sci-biology/emboss/files/emboss-6.6.0_fix-build-system.patch
@@ -0,0 +1,368 @@
+--- EMBOSS-6.6.0/ajax/acd/Makefile.am
++++ EMBOSS-6.6.0/ajax/acd/Makefile.am
+@@ -3,16 +3,20 @@
+ lib_LTLIBRARIES = libacd.la
+ 
+ libacd_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
++libacd_la_LIBADD = ../core/libajax.la ../graphics/libajaxg.la
+ 
+ libacd_la_CPPFLAGS  = -I$(top_srcdir)/ajax/ajaxdb
++libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/core
+ libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/ensembl
+ libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/graphics
+-libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ if !ESYSTEMLIBS
++libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+ libacd_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
+-endif
+ libacd_la_CPPFLAGS += -I$(top_srcdir)/plplot
++else
++libacd_la_CFLAGS   += $(PLPLOT_CFLAGS)
++endif
+ libacd_la_CPPFLAGS += $(JAVA_CPPFLAGS)
+ 
+ libacd_la_LDFLAGS  = -version-info 6:5:0
+--- EMBOSS-6.6.0/ajax/ajaxdb/Makefile.am
++++ EMBOSS-6.6.0/ajax/ajaxdb/Makefile.am
+@@ -3,14 +3,16 @@
+ lib_LTLIBRARIES = libajaxdb.la
+ 
+ libajaxdb_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
++libajaxdb_la_LIBADD = ../core/libajax.la ../ensembl/libensembl.la
+ 
+ libajaxdb_la_CPPFLAGS  = -I$(top_srcdir)/ajax/ensembl
+-libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
++libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/core
+ if !ESYSTEMLIBS
++libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+ libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
+-endif
+ libajaxdb_la_CPPFLAGS += -I$(top_srcdir)/plplot
++endif
+ libajaxdb_la_CPPFLAGS += $(AXIS2C_CPPFLAGS)
+ libajaxdb_la_CPPFLAGS += $(JAVA_CPPFLAGS)
+ 
+--- EMBOSS-6.6.0/ajax/core/ajreg.h
++++ EMBOSS-6.6.0/ajax/core/ajreg.h
+@@ -39,9 +39,8 @@
+ #include "ajdefine.h"
+ #include "ajstr.h"
+ 
+-#include "pcre_config.h"
+-#include "pcre_internal.h"
+-#include "pcreposix.h"
++#include <pcre.h>
++#include <pcreposix.h>
+ 
+ AJ_BEGIN_DECLS
+ 
+@@ -84,7 +83,7 @@
+ 
+ typedef struct AjSRegexp
+ {
+-    real_pcre *pcre;
++    struct real_pcre *pcre;
+     pcre_extra *extra;
+     int *ovector;
+     const char* orig;
+--- EMBOSS-6.6.0/ajax/core/Makefile.am
++++ EMBOSS-6.6.0/ajax/core/Makefile.am
+@@ -3,13 +3,15 @@
+ lib_LTLIBRARIES = libajax.la
+ 
+ libajax_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
++libajax_la_LIBADD = $(EXPAT_LIBS) $(PCRE_LIBS) $(ZLIB_LIBS)
+ 
+-libajax_la_CPPFLAGS  = -I$(top_srcdir)/ajax/pcre
++libajax_la_CPPFLAGS  =
+ if !ESYSTEMLIBS
++libajax_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ libajax_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+ libajax_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
+-endif
+ libajax_la_CPPFLAGS += -I$(top_srcdir)/plplot
++endif
+ libajax_la_CPPFLAGS += $(JAVA_CPPFLAGS)
+ libajax_la_CPPFLAGS += $(MYSQL_CPPFLAGS)
+ libajax_la_CPPFLAGS += $(POSTGRESQL_CPPFLAGS)
+--- EMBOSS-6.6.0/ajax/ensembl/Makefile.am
++++ EMBOSS-6.6.0/ajax/ensembl/Makefile.am
+@@ -3,13 +3,15 @@
+ lib_LTLIBRARIES = libensembl.la
+ 
+ libensembl_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
++libensembl_la_LIBADD = ../core/libajax.la
+ 
+-libensembl_la_CPPFLAGS  = -I$(top_srcdir)/ajax/pcre
++libensembl_la_CPPFLAGS  = -I$(top_srcdir)/ajax/core
+ if !ESYSTEMLIBS
++libensembl_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ libensembl_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+ libensembl_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
+-endif
+ libensembl_la_CPPFLAGS += -I$(top_srcdir)/plplot
++endif
+ libensembl_la_CPPFLAGS += $(JAVA_CPPFLAGS)
+ 
+ libensembl_la_LDFLAGS  = -version-info 6:5:0
+--- EMBOSS-6.6.0/ajax/graphics/Makefile.am
++++ EMBOSS-6.6.0/ajax/graphics/Makefile.am
+@@ -3,12 +3,16 @@
+ lib_LTLIBRARIES = libajaxg.la
+ 
+ libajaxg_la_CFLAGS = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
++libajaxg_la_LIBADD = ../core/libajax.la $(PLPLOT_LIBS)
+ 
+-libajaxg_la_CPPFLAGS  = -I$(top_srcdir)/ajax/pcre
++libajaxg_la_CPPFLAGS  = -I$(top_srcdir)/ajax/core
+ if !ESYSTEMLIBS
++libajaxg_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ libajaxg_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+-endif
+ libajaxg_la_CPPFLAGS += -I$(top_srcdir)/plplot
++else
++libajaxg_la_CFLAGS   += $(PLPLOT_CFLAGS)
++endif
+ libajaxg_la_CPPFLAGS += $(JAVA_CPPFLAGS)
+ 
+ libajaxg_la_LDFLAGS  = -version-info 6:5:0
+--- EMBOSS-6.6.0/ajax/Makefile.am
++++ EMBOSS-6.6.0/ajax/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS  = pcre
++SUBDIRS  =
+ if !ESYSTEMLIBS
+-SUBDIRS += expat zlib
++SUBDIRS += pcre expat zlib
+ endif
+ SUBDIRS += core graphics ensembl ajaxdb acd
+--- EMBOSS-6.6.0/configure.ac
++++ EMBOSS-6.6.0/configure.ac
+@@ -629,32 +629,6 @@
+ 
+ 
+ 
+-
+-dnl PCRE library definitions - see the MAJOR and MINOR values
+-dnl to see which version's configure.in these lines come from
+-
+-dnl Provide the current PCRE version information. Do not use numbers
+-dnl with leading zeros for the minor version, as they end up in a C
+-dnl macro, and may be treated as octal constants. Stick to single
+-dnl digits for minor numbers less than 10. There are unlikely to be
+-dnl that many releases anyway.
+-
+-PCRE_MAJOR="7"
+-PCRE_MINOR="9"
+-PCRE_DATE="11-Apr-2009"
+-PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
+-
+-dnl Default values for miscellaneous macros
+-
+-POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
+-
+-dnl Provide versioning information for libtool shared libraries that
+-dnl are built by default on Unix systems.
+-
+-PCRE_LIB_VERSION="0:1:0"
+-PCRE_POSIXLIB_VERSION="0:0:0"
+-
+-
+ dnl Define where the EMBOSS package is located
+ AC_SUBST([AJAX_FIXED_ROOT])
+ AJAX_FIXED_ROOT="\\\"`pwd`/emboss\\\""
+@@ -743,17 +717,7 @@
+ 
+ 
+ 
+-dnl "Export" these variables for PCRE
+ 
+-AC_SUBST([HAVE_MEMMOVE])
+-AC_SUBST([HAVE_STRERROR])
+-AC_SUBST([PCRE_MAJOR])
+-AC_SUBST([PCRE_MINOR])
+-AC_SUBST([PCRE_DATE])
+-AC_SUBST([PCRE_VERSION])
+-AC_SUBST([PCRE_LIB_VERSION])
+-AC_SUBST([PCRE_POSIXLIB_VERSION])
+-AC_SUBST([POSIX_MALLOC_THRESHOLD])
+ 
+ 
+ 
+@@ -849,7 +813,51 @@
+ 
+ AM_CONDITIONAL([ESYSTEMLIBS], [test "x${enable_systemlibs}" = "xyes"])
+ 
+-
++AS_IF([test "x${enable_systemlibs}" = "xyes"],
++[
++dnl using system libraries
++  PKG_CHECK_MODULES([PCRE], [libpcre])
++  PKG_CHECK_MODULES([EXPAT], [expat])
++  PKG_CHECK_MODULES([ZLIB], [zlib])
++  PKG_CHECK_MODULES([PLPLOT], [plplotd])
++],
++[
++dnl using bundled libraries
++  dnl PCRE library definitions - see the MAJOR and MINOR values
++  dnl to see which version's configure.ac these lines come from
++
++  dnl Provide the current PCRE version information. Do not use numbers
++  dnl with leading zeros for the minor version, as they end up in a C
++  dnl macro, and may be treated as octal constants. Stick to single
++  dnl digits for minor numbers less than 10. There are unlikely to be
++  dnl that many releases anyway.
++
++  PCRE_MAJOR="7"
++  PCRE_MINOR="9"
++  PCRE_DATE="11-Apr-2009"
++  PCRE_VERSION="${PCRE_MAJOR}.${PCRE_MINOR}"
++
++  dnl Default values for miscellaneous macros
++
++  POSIX_MALLOC_THRESHOLD="-DPOSIX_MALLOC_THRESHOLD=10"
++
++  dnl Provide versioning information for libtool shared libraries that
++  dnl are built by default on Unix systems.
++
++  PCRE_LIB_VERSION="0:1:0"
++  PCRE_POSIXLIB_VERSION="0:0:0"
++
++  dnl "Export" these variables for PCRE
++  AC_SUBST([HAVE_MEMMOVE])
++  AC_SUBST([HAVE_STRERROR])
++  AC_SUBST([PCRE_MAJOR])
++  AC_SUBST([PCRE_MINOR])
++  AC_SUBST([PCRE_DATE])
++  AC_SUBST([PCRE_VERSION])
++  AC_SUBST([PCRE_LIB_VERSION])
++  AC_SUBST([PCRE_POSIXLIB_VERSION])
++  AC_SUBST([POSIX_MALLOC_THRESHOLD])
++])
+ 
+ 
+ # Enable the purify tool: --enable-purify, sets CC and LIBTOOL
+--- EMBOSS-6.6.0/emboss/Makefile.am
++++ EMBOSS-6.6.0/emboss/Makefile.am
+@@ -28,15 +28,18 @@
+ 
+ AM_CPPFLAGS  = -I$(top_srcdir)/ajax/acd
+ AM_CPPFLAGS += -I$(top_srcdir)/ajax/ajaxdb
++AM_CPPFLAGS += -I$(top_srcdir)/ajax/core
+ AM_CPPFLAGS += -I$(top_srcdir)/ajax/ensembl
+ AM_CPPFLAGS += -I$(top_srcdir)/ajax/graphics
+-AM_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ if !ESYSTEMLIBS
++AM_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ AM_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+ AM_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
++AM_CPPFLAGS += -I$(top_srcdir)/plplot
++else
++AM_CFLAGS   += $(PLPLOT_CFLAGS)
+ endif
+ AM_CPPFLAGS += -I$(top_srcdir)/nucleus
+-AM_CPPFLAGS += -I$(top_srcdir)/plplot
+ AM_CPPFLAGS += $(AXIS2C_CPPFLAGS)
+ AM_CPPFLAGS += $(JAVA_CPPFLAGS)
+ 
+@@ -49,9 +52,11 @@
+ if !ESYSTEMLIBS
+ LDADD += ../ajax/zlib/libezlib.la
+ LDADD += ../ajax/expat/libeexpat.la
+-endif
+ LDADD += ../ajax/pcre/libepcre.la
+ LDADD += ../plplot/libeplplot.la
++else
++LDADD += $(EXPAT_LIBS) $(PCRE_LIBS) $(ZLIB_LIBS) $(PLPLOT_LIBS)
++endif
+ LDADD += $(XLIB)
+ 
+ #if PURIFY
+--- EMBOSS-6.6.0/jemboss/lib/Makefile.am
++++ EMBOSS-6.6.0/jemboss/lib/Makefile.am
+@@ -12,7 +12,7 @@
+ jalviewApplet.jar \
+ jemboss.jar
+ 
+-jemboss.jar:../org/emboss/jemboss/server/JembossFile*Server.java
++jemboss.jar:$(srcdir)/../org/emboss/jemboss/server/JembossFile*Server.java
+ if JAVA_BUILD
+ 	$(ANT) -f ../build.xml package -Demboss.data=../emboss/data -Dname=jemboss -Djar.dir=lib -Dnotformemboss=yes;
+ endif
+--- EMBOSS-6.6.0/m4/idxdbs.m4
++++ EMBOSS-6.6.0/m4/idxdbs.m4
+@@ -1,17 +1,8 @@
+ AC_DEFUN([CHECK_IDXDBS],
+ [
+-AC_MSG_CHECKING(for EMBOSS pre-indexed databases)
++AC_MSG_NOTICE(checking for EMBOSS pre-indexed databases)
+ 
+-
+-if test -f ./emboss/index/edam.xac; then
+-AC_MSG_RESULT(yes)
+-else
+-AC_MSG_RESULT(no)
+-echo ""
+-echo "Pre-indexed edam, taxon + drcat databases not found."
+-echo "Please download them from within this directory using:"
+-echo "    rsync -av rsync://emboss.open-bio.org/EMBOSS/ ."
+-echo "and then repeat the configure step."
+-exit 1
+-fi
++AC_CHECK_FILE([$srcdir/emboss/index/edam.xac],
++	[],
++	[AC_MSG_ERROR([cannot find pre-indexed edam, taxon + drcat databases])])
+ ])
+--- EMBOSS-6.6.0/Makefile.am
++++ EMBOSS-6.6.0/Makefile.am
+@@ -12,8 +12,11 @@
+ ONEWS \
+ PROBLEMS
+ 
+-SUBDIRS = \
+-plplot \
++SUBDIRS =
++if !ESYSTEMLIBS
++SUBDIRS += plplot
++endif
++SUBDIRS += \
+ ajax \
+ nucleus \
+ emboss \
+@@ -33,5 +36,3 @@
+ 	tar cBf - doc | ( cd $(distdir); tar xBf - ; find doc -name CVS | xargs rm -rf; )
+ 	tar cBf - jemboss | ( cd $(distdir); tar xBf - ; find jemboss -name CVS | xargs rm -rf; find jemboss -name Makefile | xargs rm -rf; find jemboss -name .cvsignore | xargs rm -rf )
+ 
+-install-exec-hook:
+-	$(bindir)/embossupdate
+--- EMBOSS-6.6.0/nucleus/Makefile.am
++++ EMBOSS-6.6.0/nucleus/Makefile.am
+@@ -3,6 +3,7 @@
+ lib_LTLIBRARIES = libnucleus.la
+ 
+ libnucleus_la_CFLAGS  = $(WARN_CFLAGS) $(DEVWARN_CFLAGS) $(JAVA_CFLAGS)
++libnucleus_la_LIBADD  = ../ajax/core/libajax.la ../ajax/ajaxdb/libajaxdb.la ../ajax/acd/libacd.la
+ 
+ if ISSHARED
+ if ISAIXIA64
+@@ -10,11 +11,14 @@
+ endif
+ endif
+ 
+-libnucleus_la_CPPFLAGS  = -I$(top_srcdir)/plplot
+-libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
++libnucleus_la_CPPFLAGS  = -I$(top_srcdir)/ajax/core
+ if !ESYSTEMLIBS
++libnucleus_la_CPPFLAGS += -I$(top_srcdir)/plplot
++libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/pcre
+ libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/expat
+ libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/zlib
++else
++libnucleus_la_CFLAGS   += $(PLPLOT_CFLAGS)
+ endif
+ libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/graphics
+ libnucleus_la_CPPFLAGS += -I$(top_srcdir)/ajax/ensembl
diff --git a/sci-biology/emboss/files/emboss-6.6.0_plplot-declarations.patch b/sci-biology/emboss/files/emboss-6.6.0_plplot-declarations.patch
new file mode 100644
index 000000000000..15f5f967a07d
--- /dev/null
+++ b/sci-biology/emboss/files/emboss-6.6.0_plplot-declarations.patch
@@ -0,0 +1,61 @@
+--- EMBOSS-6.6.0/ajax/graphics/ajgraph.c
++++ EMBOSS-6.6.0/ajax/graphics/ajgraph.c
+@@ -49,7 +49,7 @@
+ 
+ #define GRAPH_DEBUG 1
+ 
+-#include "plplotP.h"
++#include <plplotP.h>
+ 
+ 
+ static void     GraphArray(ajuint numofpoints,
+@@ -964,10 +964,10 @@
+     if(!thys->ready)
+     {
+ #if GRAPH_DEBUG
+-        ajDebug("=g= plxsfnam ('%S', '%s')\n", txt, ext);
++        ajDebug("=g= plsfnam ('%S')\n", txt);
+ #endif
+ 
+-        plxsfnam(ajStrGetPtr(txt), ext);
++        plsfnam(ajStrGetPtr(txt));
+         ajStrAssignS(&graphBasename, txt);
+         ajStrAssignC(&graphExtension, ext);
+         if(ajStrGetCharFirst(graphExtension) == '.')
+@@ -1213,10 +1213,10 @@
+ void ajGraphicsSetPenwidth(float penwidth)
+ {
+ #if GRAPH_DEBUG
+-    ajDebug("=g= plwid(%.2f) [width]\n", penwidth);
++    ajDebug("=g= c_plwidth(%.2f) [width]\n", penwidth);
+ #endif
+ 
+-    plwid((PLINT)penwidth);
++    c_plwidth((PLINT)penwidth);
+ 
+     return;
+ }
+@@ -1538,10 +1538,10 @@
+ static void GraphSetPen(ajint colour)
+ {
+ #if GRAPH_DEBUG
+-    ajDebug("=g= plcol(%d '%s') [colour]\n", colour, graphColourName[colour]);
++    ajDebug("=g= plcol0(%d '%s') [colour]\n", colour, graphColourName[colour]);
+ #endif
+ 
+-    plcol((PLINT)colour);
++    plcol0((PLINT)colour);
+ 
+     return;
+ }
+--- EMBOSS-6.6.0/ajax/graphics/ajgraph.h
++++ EMBOSS-6.6.0/ajax/graphics/ajgraph.h
+@@ -32,7 +32,7 @@
+ /* ========================================================================= */
+ 
+ #include "ajdefine.h"
+-#include "plplot.h"
++#include <plplot.h>
+ #include "ajgraphstruct.h"
+ #include "ajdefine.h"
+ #include "ajstr.h"
diff --git a/sci-biology/emboss/files/emboss-6.6.0_qa-implicit-declarations.patch b/sci-biology/emboss/files/emboss-6.6.0_qa-implicit-declarations.patch
new file mode 100644
index 000000000000..eff10b2e6700
--- /dev/null
+++ b/sci-biology/emboss/files/emboss-6.6.0_qa-implicit-declarations.patch
@@ -0,0 +1,74 @@
+--- EMBOSS-6.6.0/ajax/core/ajfeatread.c
++++ EMBOSS-6.6.0/ajax/core/ajfeatread.c
+@@ -45,6 +45,7 @@
+ 
+ #include <limits.h>
+ #include <math.h>
++#include <string.h>
+ #include <errno.h>
+ 
+ #ifdef WIN32
+--- EMBOSS-6.6.0/ajax/core/ajfeatwrite.c
++++ EMBOSS-6.6.0/ajax/core/ajfeatwrite.c
+@@ -43,7 +43,7 @@
+ 
+ #include <limits.h>
+ #include <math.h>
+-
++#include <string.h>
+ 
+ static AjPRegexp featoutRegUfoFmt = NULL;
+ static AjPRegexp featoutRegUfoFile = NULL;
+--- EMBOSS-6.6.0/ajax/core/ajpdbio.c
++++ EMBOSS-6.6.0/ajax/core/ajpdbio.c
+@@ -37,7 +37,7 @@
+ 
+ #include <limits.h>
+ #include <math.h>
+-
++#include <string.h>
+ 
+ 
+ 
+--- EMBOSS-6.6.0/ajax/core/ajreg.c
++++ EMBOSS-6.6.0/ajax/core/ajreg.c
+@@ -32,6 +32,7 @@
+ #include "ajlib.h"
+ 
+ #include "ajreg.h"
++#include <string.h>
+ 
+ 
+ 
+--- EMBOSS-6.6.0/ajax/core/ajseqtype.c
++++ EMBOSS-6.6.0/ajax/core/ajseqtype.c
+@@ -32,7 +32,7 @@
+ #include "ajfeat.h"
+ #include "ajfile.h"
+ #include "ajreg.h"
+-
++#include <string.h>
+ 
+ 
+ 
+--- EMBOSS-6.6.0/nucleus/embindex.c
++++ EMBOSS-6.6.0/nucleus/embindex.c
+@@ -35,6 +35,7 @@
+ #include "ajnam.h"
+ 
+ #include <errno.h>
++#include <string.h>
+ 
+ #define BTENTRYFILE     ".ent"
+ #define KWLIMIT 12
+--- EMBOSS-6.6.0/nucleus/embword.c
++++ EMBOSS-6.6.0/nucleus/embword.c
+@@ -36,7 +36,7 @@
+ #include "ajutil.h"
+ 
+ #include <math.h>
+-
++#include <string.h>
+ 
+ 
+ 
diff --git a/sci-biology/emboss/metadata.xml b/sci-biology/emboss/metadata.xml
index b85761d07029..3af936dc1564 100644
--- a/sci-biology/emboss/metadata.xml
+++ b/sci-biology/emboss/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-biology</herd>
-	<longdescription>
+  <herd>sci-biology</herd>
+  <longdescription>
 		EMBOSS is "The European Molecular Biology Open Software Suite".
 		EMBOSS is a free Open Source software analysis package specially
 		developed for the needs of the molecular biology (e.g. EMBnet) user