| 1 |
jmbsvicetto 08/10/02 11:03:19 |
| 2 |
|
| 3 |
Modified: ChangeLog metadata.xml |
| 4 |
Added: marble-4.1.2.ebuild |
| 5 |
Log: |
| 6 |
Add kde-4.1.2 into the tree from the kde-testing overlay. |
| 7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.15 kde-base/marble/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.15&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.15&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?r1=1.14&r2=1.15 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v |
| 19 |
retrieving revision 1.14 |
| 20 |
retrieving revision 1.15 |
| 21 |
diff -u -r1.14 -r1.15 |
| 22 |
--- ChangeLog 9 Jun 2008 15:19:45 -0000 1.14 |
| 23 |
+++ ChangeLog 2 Oct 2008 11:03:18 -0000 1.15 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for kde-base/marble |
| 26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.14 2008/06/09 15:19:45 keytoaster Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.15 2008/10/02 11:03:18 jmbsvicetto Exp $ |
| 29 |
+ |
| 30 |
+*marble-4.1.2 (02 Oct 2008) |
| 31 |
+ |
| 32 |
+ 02 Oct 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
| 33 |
+ metadata.xml, +marble-4.1.2.ebuild: |
| 34 |
+ Add kde-4.1.2 into the tree from the kde-testing overlay. |
| 35 |
|
| 36 |
09 Jun 2008; Tobias Heinlein <keytoaster@g.o> -marble-4.0.2.ebuild, |
| 37 |
-marble-4.0.3.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.3 kde-base/marble/metadata.xml |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/metadata.xml?rev=1.3&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/metadata.xml?rev=1.3&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/metadata.xml?r1=1.2&r2=1.3 |
| 46 |
|
| 47 |
Index: metadata.xml |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/metadata.xml,v |
| 50 |
retrieving revision 1.2 |
| 51 |
retrieving revision 1.3 |
| 52 |
diff -u -r1.2 -r1.3 |
| 53 |
--- metadata.xml 23 Aug 2008 05:32:08 -0000 1.2 |
| 54 |
+++ metadata.xml 2 Oct 2008 11:03:18 -0000 1.3 |
| 55 |
@@ -1,8 +1,8 @@ |
| 56 |
<?xml version="1.0" encoding="UTF-8"?> |
| 57 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 58 |
<pkgmetadata> |
| 59 |
- <herd>kde</herd> |
| 60 |
- <use> |
| 61 |
- <flag name="designer-plugin">Enable designer plugin</flag> |
| 62 |
- </use> |
| 63 |
+<use> |
| 64 |
+ <flag name="designer-plugin">Enable designer plugin</flag> |
| 65 |
+</use> |
| 66 |
+<herd>kde</herd> |
| 67 |
</pkgmetadata> |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 kde-base/marble/marble-4.1.2.ebuild |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.1.2.ebuild?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.1.2.ebuild?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: marble-4.1.2.ebuild |
| 77 |
=================================================================== |
| 78 |
# Copyright 1999-2008 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.1.2.ebuild,v 1.1 2008/10/02 11:03:18 jmbsvicetto Exp $ |
| 81 |
EAPI="2" |
| 82 |
NEED_KDE="none" |
| 83 |
KMNAME=kdeedu |
| 84 |
|
| 85 |
if use kdeprefix; then |
| 86 |
KDEDIR="/usr/kde/4.1" |
| 87 |
else |
| 88 |
KDEDIR="/usr" |
| 89 |
fi |
| 90 |
CPPUNIT_REQUIRED="optional" |
| 91 |
|
| 92 |
# Goes in the ebuild because of NEED_KDE=none |
| 93 |
# Needs to be defined before inheriting kde4-meta |
| 94 |
SLOT="4.1" |
| 95 |
|
| 96 |
inherit kde4-meta |
| 97 |
|
| 98 |
DESCRIPTION="Generic geographical map widget" |
| 99 |
KEYWORDS="~amd64 ~x86" |
| 100 |
IUSE="debug designer-plugin htmlhandbook kde gps" |
| 101 |
|
| 102 |
# FIXME: undefined reference when building tests. RESTRICTed for now. |
| 103 |
# Last checked in 4.0.3. |
| 104 |
RESTRICT="test" |
| 105 |
|
| 106 |
COMMONDEPEND="gps? ( sci-geosciences/gpsd ) |
| 107 |
kde? ( >=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=] |
| 108 |
>=kde-base/kdepimlibs-${PV}:${SLOT}[kdeprefix=] ) |
| 109 |
!kdeprefix? ( !sci-geosciences/marble )" |
| 110 |
DEPEND="${COMMONDEPEND}" |
| 111 |
RDEPEND="${COMMONDEPEND}" |
| 112 |
|
| 113 |
src_configure() { |
| 114 |
mycmakeargs="${mycmakeargs} |
| 115 |
$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)" |
| 116 |
|
| 117 |
sed -i -e "s:add_subdirectory(cmake):#dontwantit:g" CMakeLists.txt \ |
| 118 |
|| die "disabling cmake includes failed" |
| 119 |
sed -i -e "s:add_subdirectory( cmake ):#dontwantit:g" CMakeLists.txt \ |
| 120 |
|| die "disabling cmake includes failed" |
| 121 |
|
| 122 |
if use gps; then |
| 123 |
mycmakeargs="${mycmakeargs} -DHAVE_LIBGPS=1" |
| 124 |
else |
| 125 |
sed -i -e 's:FIND_LIBRARY(libgps_LIBRARIES gps):# LIBGPS DISABLED &:' \ |
| 126 |
marble/Findlibgps.cmake || die "sed to disable gpsd failed." |
| 127 |
fi |
| 128 |
|
| 129 |
if ! use kde; then |
| 130 |
mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON" |
| 131 |
fi |
| 132 |
|
| 133 |
kde4-meta_src_configure |
| 134 |
} |
| 135 |
|
| 136 |
src_test() { |
| 137 |
mycmakeargs="${mycmakeargs} -DENABLE_TESTS=TRUE" |
| 138 |
kde4-meta_src_test |
| 139 |
} |
Archives