diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-03-01 04:31:17 +0100 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-03-01 04:31:17 +0100 |
| commit | 85cfec7a5d5e1511a31d56bacc346c1dca1dea74 (patch) | |
| tree | 00a4cecc106c3b33b04d9069b35acb1a0a7ce3a0 /dev-util/kdevplatform | |
| parent | 83d31d59630a3bf91f21d48203f170586ee54017 (diff) | |
| download | kde-85cfec7a5d5e1511a31d56bacc346c1dca1dea74.tar.gz kde-85cfec7a5d5e1511a31d56bacc346c1dca1dea74.tar.bz2 kde-85cfec7a5d5e1511a31d56bacc346c1dca1dea74.zip | |
kdevplatform live SLOT changed to 1, reordered variables a bit to make resolving conflicts easier (place immutable line
between IUSE and KEYWORDS as those are usually subject to change)
Diffstat (limited to 'dev-util/kdevplatform')
| -rw-r--r-- | dev-util/kdevplatform/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/kdevplatform/Manifest | 6 | ||||
| -rw-r--r-- | dev-util/kdevplatform/kdevplatform-0.9.91.ebuild | 18 | ||||
| -rw-r--r-- | dev-util/kdevplatform/kdevplatform-9999.ebuild | 5 |
4 files changed, 20 insertions, 14 deletions
diff --git a/dev-util/kdevplatform/ChangeLog b/dev-util/kdevplatform/ChangeLog index 36312625dda..7baa3c67e9c 100644 --- a/dev-util/kdevplatform/ChangeLog +++ b/dev-util/kdevplatform/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm> + kdevplatform-0.9.91.ebuild, kdevplatform-9999.ebuild: + Reordered variables a bit to make conflict resolving easier, SLOT live -> + 1 + 01 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org> metadata.xml, kdevplatform-0.9.91.ebuild: small fixes diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest index 9adf7d4b545..f391655ec86 100644 --- a/dev-util/kdevplatform/Manifest +++ b/dev-util/kdevplatform/Manifest @@ -1,5 +1,5 @@ DIST kdevplatform-0.9.91.tar.bz2 811975 RMD160 9e1ad97985275cf681c7dc159351b3bf14b518cb SHA1 b06f7ef3e07f932f75049925c96d9e137d7a822a SHA256 08e38af488bb562a28d7d82346dbfc64552f392d9e5f6729218a1c16736e36d9 -EBUILD kdevplatform-0.9.91.ebuild 1065 RMD160 404f19b4be55c6d1e6071ef088c349012a0cdd25 SHA1 782c1b671028e28d9c6c015b538154fa86583b52 SHA256 687875d075595a6d520cd0137ace963b1ec8794f9a469d305346171236ba0bf8 -EBUILD kdevplatform-9999.ebuild 964 RMD160 6b417cf0cfc2ba4faa7345e3d9ec53a91eda39fa SHA1 b37783981bc0ec09d92491f70b7289f1e8737ece SHA256 2b2fadfe70334fa39d52d263c5af44c3a52ecc140b609c8112e7eece88778c92 -MISC ChangeLog 1193 RMD160 f0a9badf6d9a848e50c2d56c25362f0ca4420ce3 SHA1 f5f7b27ef5cd0bcf18ef6e4e9e2d17b8f4cc14b4 SHA256 1a6dcfc188d8741b8f0a44b3c96a9da3b03a1622269a5020be0e9e2c681060d7 +EBUILD kdevplatform-0.9.91.ebuild 1064 RMD160 b0accab2f4f2365ca8c523b025df8394deae2214 SHA1 2d39ab01f38df4cc7716a23632669136316cdabc SHA256 d28c9bac05337f093d483a7b73b68870f24328ad785088998ab1adc29b494e29 +EBUILD kdevplatform-9999.ebuild 937 RMD160 487cfd8ae81fcfef0b7f85a0c9fd696ec1de30f2 SHA1 572bbf9fce6d8ab6b318f1fdbf9cc9b740209dab SHA256 8c1fece1513facafd9fc9a521a8f04a10fc438cb11aecc7ff3e376c1d5f61c6a +MISC ChangeLog 1394 RMD160 3bacdc6b681b4cf6835a0387ca44498a7b1dc2b6 SHA1 5c2f637ba4ddc15346aacf0160f5cb895a1d791a SHA256 674c3805599203232a0a3a094750a8bee077b3faef449cc174c9b1df84ecc106 MISC metadata.xml 331 RMD160 a867a3d44c687288864ebfd7ef0a1065455b29a1 SHA1 3ad8cae765ad8ebc88b7c5eca6474cb546a48119 SHA256 82410db37697d870ae14f1ec1f337a44fd7123ff6768b2b2080149f41d6ec3d1 diff --git a/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild index d50abb63a53..990054d3d3a 100644 --- a/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild +++ b/dev-util/kdevplatform/kdevplatform-0.9.91.ebuild @@ -11,18 +11,20 @@ DESCRIPTION="KDE development support libraries and apps" HOMEPAGE="http://www.kde.org/" SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2" -SLOT="1" +LICENSE="GPL-2 LGPL-2" KEYWORDS="~amd64 ~x86" +SLOT="1" IUSE="bazaar cvs debug git htmlhandbook mercurial subversion" -LICENSE="GPL-2 LGPL-2" - -DEPEND="subversion? ( >=dev-util/subversion-1.3 )" +DEPEND=" + subversion? ( >=dev-util/subversion-1.3 ) +" RDEPEND="${DEPEND} - bazaar? ( dev-util/bzr ) - cvs? ( dev-util/cvs ) - git? ( dev-util/git ) - mercurial? ( dev-util/mercurial )" + bazaar? ( dev-util/bzr ) + cvs? ( dev-util/cvs ) + git? ( dev-util/git ) + mercurial? ( dev-util/mercurial ) +" src_configure() { mycmakeargs="${mycmakeargs} diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild index 9e3c5058e38..6757297124d 100644 --- a/dev-util/kdevplatform/kdevplatform-9999.ebuild +++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild @@ -9,16 +9,15 @@ inherit kde4-base DESCRIPTION="KDE development support libraries and apps" HOMEPAGE="http://www.kde.org/" +LICENSE="GPL-2 LGPL-2" KEYWORDS="" +SLOT="1" IUSE="bazaar cvs debug git htmlhandbook mercurial subversion" -LICENSE="GPL-2 LGPL-2" -SLOT="live" DEPEND=" subversion? ( >=dev-util/subversion-1.3 ) " RDEPEND="${DEPEND} - !kde-base/kdevplatform bazaar? ( dev-util/bzr ) cvs? ( dev-util/cvs ) git? ( dev-util/git ) |
