Sort inherit and/or USE

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 7 insertions, 136 deletions

diff --git a/sci-chemistry/rosetta/Manifest b/sci-chemistry/rosetta/Manifest
index 017524446..9c9b8547a 100644
--- a/sci-chemistry/rosetta/Manifest
+++ b/sci-chemistry/rosetta/Manifest
@@ -8,14 +8,13 @@ AUX 3.0-platform.patch 431 RMD160 2359b805d3d87f58eeff88864e1ebd0cba02d2ae SHA1
 AUX 3.0-user-settings.patch 989 RMD160 fbdb678459c4663d181eb83b1ed4d58fcc507065 SHA1 e90cfd9b9055d8dc3b0e3029ff20ae05fd5fb601 SHA256 0b751e7a885faa0645de0d3450f6b3229c2959d5b42dc7dd77956199947b77df
 AUX 3.0-zlib.patch 289 RMD160 dac6ffb48adff95d7ea5a8aa90ebe8be13087a6a SHA1 6336f6d23a924ce42943ea5959937ab397cb9365 SHA256 ee8cae00b2098b4e672fa46b60a35d381cc17d5ccbc6bbf38cdf966777ff1f03
 DIST rosetta3_source.tgz 98443598 RMD160 09c7bdaef58ef761bfdc8143c38f81f814be41a4 SHA1 3477856807a6fb4898c8c2aa7852b3b6e4fe90ee SHA256 1870727caea342c3b55af7c353b991758fe1cf4a395a65b48543708e52dc75c5
-EBUILD rosetta-3.0-r1.ebuild 3423 RMD160 6f2d3c21353f943bc3a4cb246bcafd0491c78ee1 SHA1 de3b6153a139c9f3e8fd4d0699af4fbc182bc8e5 SHA256 b8bb9a29208b308de314b244ee43f9e1b6dec190d09849989b9d72a49ad0332f
-EBUILD rosetta-3.0.ebuild 2914 RMD160 f535a0716d7d6c50251ed62af0858866da1eccfc SHA1 c036a94ba58ffac71a0ed3ca3223fe7d0a954292 SHA256 fab910170f4c65ae3eb1277be0e0063f2148f638f29f59e2aafb3cb40703e6c6
+EBUILD rosetta-3.0-r1.ebuild 3423 RMD160 48c459b3e149d60a59a1c536da42b548bc3d461f SHA1 53465e695ee22b31c15b1e82ad3f08fce18be526 SHA256 6e12bf887186d3038d824bd48d3926c04cf74b6f91d7ba6d17b369750b6e2292
 MISC ChangeLog 1212 RMD160 6017f34695998e08fa47ffe7c8234b80764b9175 SHA1 467bced72b308ef42aff65867dd5f210f0d51471 SHA256 a7f2135a922ef4865a1e2fd1a37c0e060957149c6449c681e713a291dc82a7a1
 MISC metadata.xml 450 RMD160 13d6fc607a68ab354ae5e01887aa96152c1838fd SHA1 857337c1113dfe1826ea2ba81694e416440a4e55 SHA256 979b679698fd4b06b80ce01558fba3759219e071787a56fd036ee8dfa51ee8ac
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyV4vkACgkQgAnW8HDreRZjYgCeKt03LOMTj3rfHeLTSnYd5nRT
-KzUAoM6J6ZphPiigh5XHxUpJx2Y17jd4
-=hcJ+
+iEYEARECAAYFAk4EjDIACgkQgAnW8HDreRbGMgCgw1s0CVXNEiWiqMiRPrdjbkn1
+0I8An05W+4AMfBB4RQVRryQMywBSpJMM
+=yABE
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/rosetta/rosetta-3.0-r1.ebuild b/sci-chemistry/rosetta/rosetta-3.0-r1.ebuild
index 1e26712ab..da1d22620 100644
--- a/sci-chemistry/rosetta/rosetta-3.0-r1.ebuild
+++ b/sci-chemistry/rosetta/rosetta-3.0-r1.ebuild
@@ -6,7 +6,7 @@
 
 EAPI="2"
 
-inherit versionator eutils multilib
+inherit eutils multilib versionator
 
 MY_P="${PN}$(get_major_version)_source"
 
@@ -17,7 +17,7 @@ SRC_URI="${MY_P}.tgz"
 LICENSE="|| ( rosetta-academic rosetta-commercial )"
 SLOT="0"
 KEYWORDS=""
-IUSE="boinc boost X mpi debug doc"
+IUSE="boinc boost debug doc mpi X"
 RESTRICT="fetch"
 
 RDEPEND="mpi? ( virtual/mpi )
diff --git a/sci-chemistry/rosetta/rosetta-3.0.ebuild b/sci-chemistry/rosetta/rosetta-3.0.ebuild
deleted file mode 100644
index c4056e8ad..000000000
--- a/sci-chemistry/rosetta/rosetta-3.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit versionator eutils multilib
-
-MY_P="${PN}$(get_major_version)_source"
-
-DESCRIPTION="Prediction and design of protein structures, folding mechanisms, and protein-protein interactions"
-HOMEPAGE="http://www.rosettacommons.org/"
-SRC_URI="${MY_P}.tgz"
-
-LICENSE="|| ( rosetta-academic rosetta-commercial )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost X mpi debug"
-RESTRICT="fetch"
-
-RDEPEND="mpi? ( virtual/mpi )
-	boost? ( dev-libs/boost )
-	sci-libs/rosetta-db"
-DEPEND="${RDEPEND}
-	>=dev-util/scons-0.96.1
-	doc? ( app-doc/doxygen )
-	X? ( media-libs/freeglut )"
-
-MYCONF=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_nofetch() {
-	einfo "Go to ${HOMEPAGE} and get ${A}"
-	einfo "which must be placed in ${DISTDIR}"
-}
-
-src_prepare() {
-	local myCXXFLAGS
-	local myLDFLAGS
-
-	epatch "${FILESDIR}"/${PV}-platform.patch
-	epatch "${FILESDIR}"/${PV}-fix-scons-warnings.patch
-	epatch "${FILESDIR}"/${PV}-user-settings.patch
-	epatch "${FILESDIR}"/${PV}-fix-valgrind.patch
-	rm bin/* -f
-
-	for i in ${CXXFLAGS}; do
-		myCXXFLAGS="${myCXXFLAGS} \"${i/-/}\","
-	done
-
-	for i in ${LDFLAGS}; do
-		myLDFLAGS="${myLDFLAGS} \"${i/-/}\","
-	done
-
-	sed -e "s:GENTOO_CXXFLAGS:${myCXXFLAGS}:g" \
-		-e "s:GENTOO_LDFLAGS:${myCXXFLAGS} ${myLDFLAGS}:g" \
-		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-		-i tools/build/user.settings
-
-	use mpi && \
-	sed -e 's:mpiCC:mpicxx:g' \
-		-i tools/build/basic.settings
-}
-
-src_configure() {
-	local myextras=""
-	local mycxx=""
-
-	use boost && EXTRAS=$(my_list_append "${EXTRAS}" "boost")
-	use X && EXTRAS=$(my_list_append "${EXTRAS}" "graphics")
-	use mpi && EXTRAS=$(my_list_append "${EXTRAS}" "mpi")
-
-	COMPILER=$(expr match "$(tc-getCC)" '.*\([a-z]cc\)')
-	mycxx="cxx=${COMPILER}"
-
-	test -n "${EXTRAS}" && myextras="extras=${EXTRAS}"
-
-	if use debug; then
-		MODE="debug"
-	else
-		MODE="release"
-	fi
-
-	MAKEOPTS=$(my_filter_option "${MAKEOPTS}" "--load-average[=0-9.]*")
-	MAKEOPTS=$(my_filter_option "${MAKEOPTS}" "-l[0-9.]*")
-
-	MYCONF="${MAKEOPTS} mode=${MODE} ${myextras} ${mycxx}"
-}
-
-src_compile() {
-	einfo "running 'scons bin cat=src ${MYCONF}' ..."
-	scons bin cat=src ${MYCONF} || die "scons bin cat=src ${MYCONF} failed"
-}
-
-src_install() {
-	local BIT
-
-	use amd64 && BIT="64"
-	use x86 && BIT="32"
-
-	dolib.so build/src/${MODE}/linux/2.6/${BIT}/x86/${COMPILER}/${EXTRAS//,/-}/*.so || \
-	die "failed to install libs"
-
-	cd bin
-	for BIN in *; do
-		newbin ${BIN} ${BIN%%.*} || die "could not install rosetta program files"
-	done
-
-	mv "${D}"/usr/bin/cluster{,-${PN}}
-	mv "${D}"/usr/bin/benchmark{,-${PN}}
-}
-
-my_filter_option() {
-	local value="$1"
-	local exp="$2"
-	local result=`echo ${value} | sed -e s/${exp}//g`
-	echo "${result}"
-	return 0;
-}
-
-my_list_append() {
-	local old_value="$1"
-	local new_value="$2"
-	test -n "${old_value}" && old_value="${old_value},"
-	echo "${old_value}${new_value}"
-	return 0;
-}