* [gentoo-commits] proj/gentoo-guis:master commit in: app-portage/kdemerge/
@ 2011-10-05 18:53 Johannes Huber
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Huber @ 2011-10-05 18:53 UTC (permalink / raw
To: gentoo-commits
commit: e23408679245dc04f984e703a56e327ff60b3392
Author: Johannes Huber <johu <AT> gmx <DOT> de>
AuthorDate: Wed Oct 5 18:53:22 2011 +0000
Commit: Johannes Huber <johu <AT> gmx <DOT> de>
CommitDate: Wed Oct 5 18:53:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=e2340867
[app-portage/kdemerge] Installs kcm now, improvements by tampakrap and me
(Portage version: 2.2.0_alpha60/git/Linux i686, signed Manifest commit with key DF018462)
---
app-portage/kdemerge/Manifest | 18 ++++--------------
app-portage/kdemerge/kdemerge-9999.ebuild | 19 +++++++++++--------
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/app-portage/kdemerge/Manifest b/app-portage/kdemerge/Manifest
index 9fe9c46..eb6ce73 100644
--- a/app-portage/kdemerge/Manifest
+++ b/app-portage/kdemerge/Manifest
@@ -1,24 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX create_repolinks 1394 RMD160 e6680eb60e143bc55ccec42ae89b86cd278b57cd SHA1 c54a58763b443586784fa83a968eacf1358cbbd0 SHA256 9d9c179328fb2636e05080e22f5b513f053637b828ceb7caa377285c331a129a
AUX git-wrapper 845 RMD160 a4a4467f57e30cd8c4759acd8fe76c93b63f08df SHA1 cd806e8a60b4c984bfb2c4de5e98da181a89b9b0 SHA256 aea845604887afae861c722a71780240ea0e0a7fdf6b5393202ed479bb609e93
-EBUILD kdemerge-9999.ebuild 551 RMD160 03ca0068f0e7a2fe61f88cd908c14bc003e6990e SHA1 ab3d72b415b50b5fb5c4aa733d4ed8719ef014c4 SHA256 39178f38bd3b196288d497ef589da09277e67ec2bb28ac8a3213b4c52316af19
+EBUILD kdemerge-9999.ebuild 613 RMD160 821f4b191851abc58880a0dac6f3dda000c7d6b6 SHA1 963d9cea7534b2cc83871020b39202302da2cc28 SHA256 73169dd3a45277e8ceb0f48dbcba8d16f1d26e2fbb598bfb064b181bad250a29
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk6LkEEACgkQvRf93N8BhGIySgD/QRCrJr4W9ljWV+B/A/mJfrN4
-gCYL5HpsQhG+e6cQveYA/2voFvP89H3ewFYFxyuH6Hv0orjNF4t7Vy7hJvSp4X0O
-=tQcG
-- -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk6LkzoACgkQvRf93N8BhGJ0gAD/ZEoF6hrUCRFMm8BV6m+LAOaJ
-Xq2S/11O9zUUCxZt73YA/i0jVkotfAKVfTlDmjOwZKZdyMY9FPi9irXQrIG0ByMq
-=TDKh
+iF4EAREIAAYFAk6Mp6EACgkQvRf93N8BhGLnWgD/bQMeUCucg9Pd4N5kI2KCaN1+
+L5Ni/4OHLVhfzt4ZeGwA/2RaiufIRvJnetjBoCffbKpamTH0GqRYbOyS81JZerHR
+=KVlb
-----END PGP SIGNATURE-----
diff --git a/app-portage/kdemerge/kdemerge-9999.ebuild b/app-portage/kdemerge/kdemerge-9999.ebuild
index 1bfd08e..d6d5dd7 100644
--- a/app-portage/kdemerge/kdemerge-9999.ebuild
+++ b/app-portage/kdemerge/kdemerge-9999.ebuild
@@ -4,27 +4,30 @@
EAPI=4
-inherit git-2
+KDE_MINIMAL="4.7"
+
+inherit kde4-base git-2
DESCRIPTION="KDE app to set up a KDE Development environment"
HOMEPAGE="http://github.com/terietor/kdemerge"
-EGIT_REPO_URI="git://github.com/terietor/kdemerge.git"
+EGIT_REPO_URI="git://github.com/terietor/${PN}.git"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="4"
KEYWORDS=""
-IUSE=""
+IUSE="debug"
DEPEND=""
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kcmshell)
+"
src_install() {
- #${FILESDIR}/gitconfig
-
exeinto /usr/local/bin
newexe ${FILESDIR}/git-wrapper git
exeinto /usr/local/bin
doexe ${FILESDIR}/create_repolinks
-}
+ kde4-base_src_install
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoo-guis:master commit in: app-portage/kdemerge/
@ 2011-10-05 19:31 Theo Chatzimichos
0 siblings, 0 replies; 4+ messages in thread
From: Theo Chatzimichos @ 2011-10-05 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 3405fe5615ff5ddf9c857b1690e6f4c5dd756e7c
Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 5 19:32:32 2011 +0000
Commit: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Wed Oct 5 19:32:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=3405fe56
[app-portage/kdemerge] minor fix
---
app-portage/kdemerge/Manifest | 12 +-----------
app-portage/kdemerge/kdemerge-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/app-portage/kdemerge/Manifest b/app-portage/kdemerge/Manifest
index eb6ce73..5953cba 100644
--- a/app-portage/kdemerge/Manifest
+++ b/app-portage/kdemerge/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
AUX create_repolinks 1394 RMD160 e6680eb60e143bc55ccec42ae89b86cd278b57cd SHA1 c54a58763b443586784fa83a968eacf1358cbbd0 SHA256 9d9c179328fb2636e05080e22f5b513f053637b828ceb7caa377285c331a129a
AUX git-wrapper 845 RMD160 a4a4467f57e30cd8c4759acd8fe76c93b63f08df SHA1 cd806e8a60b4c984bfb2c4de5e98da181a89b9b0 SHA256 aea845604887afae861c722a71780240ea0e0a7fdf6b5393202ed479bb609e93
-EBUILD kdemerge-9999.ebuild 613 RMD160 821f4b191851abc58880a0dac6f3dda000c7d6b6 SHA1 963d9cea7534b2cc83871020b39202302da2cc28 SHA256 73169dd3a45277e8ceb0f48dbcba8d16f1d26e2fbb598bfb064b181bad250a29
+EBUILD kdemerge-9999.ebuild 609 RMD160 5e71d61a246cc88d18bca829aa75d1e92a89e4dd SHA1 3592f81bd4f6795751a8e06e1deed1e7299c1641 SHA256 5ef41dbb79d348f208974d47b0db3a918f06f3c296d7f967d54659d1a6420380
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk6Mp6EACgkQvRf93N8BhGLnWgD/bQMeUCucg9Pd4N5kI2KCaN1+
-L5Ni/4OHLVhfzt4ZeGwA/2RaiufIRvJnetjBoCffbKpamTH0GqRYbOyS81JZerHR
-=KVlb
------END PGP SIGNATURE-----
diff --git a/app-portage/kdemerge/kdemerge-9999.ebuild b/app-portage/kdemerge/kdemerge-9999.ebuild
index d6d5dd7..e5c300b 100644
--- a/app-portage/kdemerge/kdemerge-9999.ebuild
+++ b/app-portage/kdemerge/kdemerge-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base git-2
DESCRIPTION="KDE app to set up a KDE Development environment"
HOMEPAGE="http://github.com/terietor/kdemerge"
-EGIT_REPO_URI="git://github.com/terietor/${PN}.git"
+EGIT_REPO_URI="git://github.com/terietor/${PN}"
LICENSE="GPL-2"
SLOT="4"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoo-guis:master commit in: app-portage/kdemerge/
@ 2011-10-17 17:32 Theo Chatzimichos
0 siblings, 0 replies; 4+ messages in thread
From: Theo Chatzimichos @ 2011-10-17 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 36e7fa2bd69c2c43fd9afaefb00233eb22f9730d
Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 17:33:56 2011 +0000
Commit: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 17:33:56 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=36e7fa2b
[app-portage/kdemerge] Remove the installation of my scripts, they
confuse my system and interfere with the further development
---
app-portage/kdemerge/Manifest | 2 +-
app-portage/kdemerge/kdemerge-9999.ebuild | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-portage/kdemerge/Manifest b/app-portage/kdemerge/Manifest
index 5953cba..aa05f7d 100644
--- a/app-portage/kdemerge/Manifest
+++ b/app-portage/kdemerge/Manifest
@@ -1,4 +1,4 @@
AUX create_repolinks 1394 RMD160 e6680eb60e143bc55ccec42ae89b86cd278b57cd SHA1 c54a58763b443586784fa83a968eacf1358cbbd0 SHA256 9d9c179328fb2636e05080e22f5b513f053637b828ceb7caa377285c331a129a
AUX git-wrapper 845 RMD160 a4a4467f57e30cd8c4759acd8fe76c93b63f08df SHA1 cd806e8a60b4c984bfb2c4de5e98da181a89b9b0 SHA256 aea845604887afae861c722a71780240ea0e0a7fdf6b5393202ed479bb609e93
-EBUILD kdemerge-9999.ebuild 609 RMD160 5e71d61a246cc88d18bca829aa75d1e92a89e4dd SHA1 3592f81bd4f6795751a8e06e1deed1e7299c1641 SHA256 5ef41dbb79d348f208974d47b0db3a918f06f3c296d7f967d54659d1a6420380
+EBUILD kdemerge-9999.ebuild 613 RMD160 19f509fa41883f1fd610c87521d514e08c811181 SHA1 8f9990c90c61a7ae9caf7f230ae07de67c216a22 SHA256 72b65a23fd0141b48b59d229d47fc32ab604526ff4b0ff8c302866246b206884
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-portage/kdemerge/kdemerge-9999.ebuild b/app-portage/kdemerge/kdemerge-9999.ebuild
index e5c300b..565db55 100644
--- a/app-portage/kdemerge/kdemerge-9999.ebuild
+++ b/app-portage/kdemerge/kdemerge-9999.ebuild
@@ -23,11 +23,11 @@ RDEPEND="${DEPEND}
"
src_install() {
- exeinto /usr/local/bin
- newexe ${FILESDIR}/git-wrapper git
+# exeinto /usr/local/bin
+# newexe ${FILESDIR}/git-wrapper git
- exeinto /usr/local/bin
- doexe ${FILESDIR}/create_repolinks
+# exeinto /usr/local/bin
+# doexe ${FILESDIR}/create_repolinks
kde4-base_src_install
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gentoo-guis:master commit in: app-portage/kdemerge/
@ 2011-10-18 1:08 Theo Chatzimichos
0 siblings, 0 replies; 4+ messages in thread
From: Theo Chatzimichos @ 2011-10-18 1:08 UTC (permalink / raw
To: gentoo-commits
commit: a56c0bf8d35d6cfa0cd59da5a61792ef0603b4ce
Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 01:09:43 2011 +0000
Commit: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 01:09:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-guis.git;a=commit;h=a56c0bf8
[app-portage/kdemerge] Moved to git.kde.org
---
app-portage/kdemerge/Manifest | 2 +-
app-portage/kdemerge/kdemerge-9999.ebuild | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app-portage/kdemerge/Manifest b/app-portage/kdemerge/Manifest
index aa05f7d..d1a406a 100644
--- a/app-portage/kdemerge/Manifest
+++ b/app-portage/kdemerge/Manifest
@@ -1,4 +1,4 @@
AUX create_repolinks 1394 RMD160 e6680eb60e143bc55ccec42ae89b86cd278b57cd SHA1 c54a58763b443586784fa83a968eacf1358cbbd0 SHA256 9d9c179328fb2636e05080e22f5b513f053637b828ceb7caa377285c331a129a
AUX git-wrapper 845 RMD160 a4a4467f57e30cd8c4759acd8fe76c93b63f08df SHA1 cd806e8a60b4c984bfb2c4de5e98da181a89b9b0 SHA256 aea845604887afae861c722a71780240ea0e0a7fdf6b5393202ed479bb609e93
-EBUILD kdemerge-9999.ebuild 613 RMD160 19f509fa41883f1fd610c87521d514e08c811181 SHA1 8f9990c90c61a7ae9caf7f230ae07de67c216a22 SHA256 72b65a23fd0141b48b59d229d47fc32ab604526ff4b0ff8c302866246b206884
+EBUILD kdemerge-9999.ebuild 605 RMD160 e668da5aa54734c7eedb59f638996f759f5ca176 SHA1 57c4ebb1142b7d7469a4a8a88a91f8699083489c SHA256 2b0842ecb3fde424542cfe50855546a33c1a1640a57365dcf8b80ee25b1c2363
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-portage/kdemerge/kdemerge-9999.ebuild b/app-portage/kdemerge/kdemerge-9999.ebuild
index 565db55..c3dc12d 100644
--- a/app-portage/kdemerge/kdemerge-9999.ebuild
+++ b/app-portage/kdemerge/kdemerge-9999.ebuild
@@ -5,12 +5,13 @@
EAPI=4
KDE_MINIMAL="4.7"
+KDE_SCM="git"
+KMNAME="scratch/theoc/${PN}"
-inherit kde4-base git-2
+inherit kde4-base
DESCRIPTION="KDE app to set up a KDE Development environment"
HOMEPAGE="http://github.com/terietor/kdemerge"
-EGIT_REPO_URI="git://github.com/terietor/${PN}"
LICENSE="GPL-2"
SLOT="4"
@@ -22,12 +23,12 @@ RDEPEND="${DEPEND}
$(add_kdebase_dep kcmshell)
"
-src_install() {
+#src_install() {
# exeinto /usr/local/bin
# newexe ${FILESDIR}/git-wrapper git
# exeinto /usr/local/bin
# doexe ${FILESDIR}/create_repolinks
- kde4-base_src_install
-}
+# kde4-base_src_install
+#}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-18 1:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-05 18:53 [gentoo-commits] proj/gentoo-guis:master commit in: app-portage/kdemerge/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2011-10-05 19:31 Theo Chatzimichos
2011-10-17 17:32 Theo Chatzimichos
2011-10-18 1:08 Theo Chatzimichos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox