| 1 |
scarabeus 09/04/23 15:51:41 |
| 2 |
|
| 3 |
Modified: ChangeLog kget-4.2.2.ebuild |
| 4 |
Log: |
| 5 |
Update build system not to die by default. Per bug #266597. |
| 6 |
(Portage version: 2.2_rc30/cvs/Linux x86_64, RepoMan options: --force) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.114 kde-base/kget/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kget/ChangeLog?rev=1.114&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kget/ChangeLog?rev=1.114&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kget/ChangeLog?r1=1.113&r2=1.114 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v |
| 18 |
retrieving revision 1.113 |
| 19 |
retrieving revision 1.114 |
| 20 |
diff -u -r1.113 -r1.114 |
| 21 |
--- ChangeLog 17 Apr 2009 07:55:04 -0000 1.113 |
| 22 |
+++ ChangeLog 23 Apr 2009 15:51:41 -0000 1.114 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for kde-base/kget |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.113 2009/04/17 07:55:04 alexxy Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.114 2009/04/23 15:51:41 scarabeus Exp $ |
| 28 |
+ |
| 29 |
+ 23 Apr 2009; Tomas Chvatal <scarabeus@g.o> kget-4.2.2.ebuild: |
| 30 |
+ Update build system not to die by default. Per bug #266597. |
| 31 |
|
| 32 |
17 Apr 2009; Alexey Shvetsov <alexxy@g.o> kget-4.2.2: |
| 33 |
Restore ~hppa keywords |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.4 kde-base/kget/kget-4.2.2.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild?rev=1.4&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild?rev=1.4&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild?r1=1.3&r2=1.4 |
| 42 |
|
| 43 |
Index: kget-4.2.2.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild,v |
| 46 |
retrieving revision 1.3 |
| 47 |
retrieving revision 1.4 |
| 48 |
diff -u -r1.3 -r1.4 |
| 49 |
--- kget-4.2.2.ebuild 17 Apr 2009 07:55:04 -0000 1.3 |
| 50 |
+++ kget-4.2.2.ebuild 23 Apr 2009 15:51:41 -0000 1.4 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2009 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild,v 1.3 2009/04/17 07:55:04 alexxy Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-4.2.2.ebuild,v 1.4 2009/04/23 15:51:41 scarabeus Exp $ |
| 56 |
|
| 57 |
EAPI="2" |
| 58 |
|
| 59 |
@@ -27,21 +27,6 @@ |
| 60 |
semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] ) |
| 61 |
" |
| 62 |
|
| 63 |
-pkg_setup() { |
| 64 |
- if use bittorrent && use bittorrent-external; then |
| 65 |
- echo |
| 66 |
- eerror "USE flag 'bittorrent' conflicts with these USE flag 'bittorrent-external'" |
| 67 |
- eerror |
| 68 |
- eerror "You must disable these conflicting flags before you can emerge this package." |
| 69 |
- eerror "You can do this by disabling one of these flags in /etc/portage/package.use:" |
| 70 |
- eerror " =${CATEGORY}/${PN}-${PV} -bittorrent-external" |
| 71 |
- echo |
| 72 |
- die "Conflicting USE flags found" |
| 73 |
- fi |
| 74 |
- |
| 75 |
- kde4-base_pkg_setup |
| 76 |
-} |
| 77 |
- |
| 78 |
src_prepare() { |
| 79 |
if ! use bittorrent && ! use bittorrent-external; then |
| 80 |
sed -i -e '/bittorrent/s:^:#DONOTCOMPILE :' \ |
| 81 |
@@ -56,12 +41,21 @@ |
| 82 |
} |
| 83 |
|
| 84 |
src_configure() { |
| 85 |
+ if use bittorent-external && use bittorent ; then |
| 86 |
+ einfo "Using the external plugin." |
| 87 |
+ einfo "Disable bittorent-external useflag if you want iternal one." |
| 88 |
+ fi |
| 89 |
+ if use bittorent-external; then |
| 90 |
+ mycmakeargs="${mycmakeargs} -DEMBEDDED_TORRENT_SUPPORT=OFF" |
| 91 |
+ else |
| 92 |
+ mycmakeargs="${mycmakeargs} |
| 93 |
+ $(cmake-utils_use_enable bittorrent EMBEDDED_TORRENT_SUPPORT)" |
| 94 |
+ fi |
| 95 |
mycmakeargs="${mycmakeargs} |
| 96 |
- $(cmake-utils_use_enable bittorrent EMBEDDED_TORRENT_SUPPORT) |
| 97 |
- $(cmake-utils_use_with plasma Plasma) |
| 98 |
+ $(cmake-utils_use_with plasma) |
| 99 |
$(cmake-utils_use_with semantic-desktop Nepomuk) |
| 100 |
$(cmake-utils_use_with semantic-desktop Soprano) |
| 101 |
- $(cmake-utils_use_with sqlite Sqlite)" |
| 102 |
+ $(cmake-utils_use_with sqlite)" |
| 103 |
|
| 104 |
kde4-meta_src_configure |
| 105 |
} |
Archives