| 1 |
cryos 08/10/07 12:13:53 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: kdelibs-4.1.2-r1.ebuild |
| 5 |
Log: |
| 6 |
Improvements to the env files and minimised what is installed for -kdeprefix. |
| 7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.543 kde-base/kdelibs/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.543&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.543&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.542&r2=1.543 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
| 19 |
retrieving revision 1.542 |
| 20 |
retrieving revision 1.543 |
| 21 |
diff -u -r1.542 -r1.543 |
| 22 |
--- ChangeLog 2 Oct 2008 11:58:21 -0000 1.542 |
| 23 |
+++ ChangeLog 7 Oct 2008 12:13:53 -0000 1.543 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for kde-base/kdelibs |
| 26 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.542 2008/10/02 11:58:21 keytoaster Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.543 2008/10/07 12:13:53 cryos Exp $ |
| 29 |
+ |
| 30 |
+*kdelibs-4.1.2-r1 (07 Oct 2008) |
| 31 |
+ |
| 32 |
+ 07 Oct 2008; Marcus D. Hanwell <cryos@g.o> |
| 33 |
+ +kdelibs-4.1.2-r1.ebuild: |
| 34 |
+ Improvements to the env files and minimised what is installed for |
| 35 |
+ -kdeprefix. |
| 36 |
|
| 37 |
02 Oct 2008; Tobias Heinlein <keytoaster@g.o> |
| 38 |
+files/kdelibs-4.1.1-cmake-modules.patch: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 kde-base/kdelibs/kdelibs-4.1.2-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.1.2-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.1.2-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: kdelibs-4.1.2-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2008 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.1.2-r1.ebuild,v 1.1 2008/10/07 12:13:53 cryos Exp $ |
| 52 |
|
| 53 |
EAPI="2" |
| 54 |
|
| 55 |
CPPUNIT_REQUIRED="optional" |
| 56 |
OPENGL_REQUIRED="optional" |
| 57 |
inherit kde4-base |
| 58 |
|
| 59 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
| 60 |
HOMEPAGE="http://www.kde.org/" |
| 61 |
|
| 62 |
KEYWORDS="~amd64 ~x86" |
| 63 |
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k |
| 64 |
kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf" |
| 65 |
LICENSE="LGPL-2.1" |
| 66 |
RESTRICT="test" |
| 67 |
|
| 68 |
COMMONDEPEND=" |
| 69 |
!<kde-base/kdebase-3.5.7-r6 |
| 70 |
!<kde-base/kdebase-startkde-3.5.7-r1 |
| 71 |
!=kde-base/kdebase-3.5.8 |
| 72 |
!=kde-base/kdebase-3.5.8-r1 |
| 73 |
!=kde-base/kdebase-3.5.8-r2 |
| 74 |
!=kde-base/kdebase-startkde-3.5.8 |
| 75 |
!kdeprefix? ( !<=kde-misc/kdnssd-avahi-0.1.2:0 ) |
| 76 |
>=app-misc/strigi-0.5.9 |
| 77 |
>=dev-libs/libxml2-2.6.6 |
| 78 |
>=dev-libs/libxslt-1.1.17 |
| 79 |
media-libs/fontconfig |
| 80 |
>=media-libs/freetype-2 |
| 81 |
media-libs/giflib |
| 82 |
media-libs/jpeg |
| 83 |
media-libs/libpng |
| 84 |
>=media-sound/phonon-4.2.0 |
| 85 |
>=sys-apps/dbus-0.91[X] |
| 86 |
x11-libs/libICE |
| 87 |
x11-libs/libSM |
| 88 |
x11-libs/libX11 |
| 89 |
x11-libs/libXau |
| 90 |
x11-libs/libXcursor |
| 91 |
x11-libs/libXdmcp |
| 92 |
x11-libs/libXext |
| 93 |
x11-libs/libXfixes |
| 94 |
x11-libs/libXft |
| 95 |
x11-libs/libXpm |
| 96 |
x11-libs/libXrender |
| 97 |
x11-libs/libXtst |
| 98 |
>=x11-misc/shared-mime-info-0.20 |
| 99 |
acl? ( kernel_linux? ( sys-apps/acl ) ) |
| 100 |
alsa? ( >=media-libs/alsa-lib-1.0.14a[midi] ) |
| 101 |
fam? ( virtual/fam ) |
| 102 |
jpeg2k? ( media-libs/jasper ) |
| 103 |
kerberos? ( virtual/krb5 ) |
| 104 |
nls? ( virtual/libintl ) |
| 105 |
openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase ) |
| 106 |
opengl? ( virtual/opengl ) |
| 107 |
>=dev-libs/libpcre-4.5 |
| 108 |
semantic-desktop? ( >=dev-libs/soprano-2.1 ) |
| 109 |
spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant ) |
| 110 |
ssl? ( >=dev-libs/openssl-0.9.7d ) |
| 111 |
zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] |
| 112 |
!bindist? ( net-misc/mDNSResponder ) ) ) |
| 113 |
" |
| 114 |
|
| 115 |
DEPEND="${COMMONDEPEND} |
| 116 |
doc? ( app-doc/doxygen ) |
| 117 |
sys-devel/gettext |
| 118 |
" |
| 119 |
|
| 120 |
RDEPEND="${COMMONDEPEND} |
| 121 |
x11-apps/rgb |
| 122 |
x11-apps/iceauth |
| 123 |
" |
| 124 |
|
| 125 |
PATCHES=( "${FILESDIR}/${PN}-4.1.1-cmake-modules.patch" ) |
| 126 |
|
| 127 |
src_configure() { |
| 128 |
if use zeroconf; then |
| 129 |
if has_version net-dns/avahi; then |
| 130 |
mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF" |
| 131 |
elif has_version net-misc/mDNSResponder; then |
| 132 |
mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON" |
| 133 |
else |
| 134 |
die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found." |
| 135 |
fi |
| 136 |
fi |
| 137 |
if use kdeprefix; then |
| 138 |
HME=".kde${SLOT}" |
| 139 |
else |
| 140 |
HME=".kde4" |
| 141 |
fi |
| 142 |
mycmakeargs="${mycmakeargs} |
| 143 |
-DWITH_HSPELL=OFF |
| 144 |
-DKDE_DEFAULT_HOME=${HME} |
| 145 |
$(cmake-utils_has 3dnow X86_3DNOW) |
| 146 |
$(cmake-utils_has altivec PPC_ALTIVEC) |
| 147 |
$(cmake-utils_has mmx X86_MMX) |
| 148 |
$(cmake-utils_has sse X86_SSE) |
| 149 |
$(cmake-utils_has sse2 X86_SSE2) |
| 150 |
$(cmake-utils_use_with acl ACL) |
| 151 |
$(cmake-utils_use_with alsa Alsa) |
| 152 |
$(cmake-utils_use_with bzip2 BZip2) |
| 153 |
$(cmake-utils_use_with fam FAM) |
| 154 |
$(cmake-utils_use_with jpeg2k Jasper) |
| 155 |
$(cmake-utils_use_with kerberos GSSAPI) |
| 156 |
$(cmake-utils_use_with nls Libintl) |
| 157 |
$(cmake-utils_use_with openexr OpenEXR) |
| 158 |
$(cmake-utils_use_with opengl OpenGL) |
| 159 |
$(cmake-utils_use_with semantic-desktop Soprano) |
| 160 |
$(cmake-utils_use_with spell ASPELL) |
| 161 |
$(cmake-utils_use_with spell ENCHANT) |
| 162 |
$(cmake-utils_use_with ssl OpenSSL) |
| 163 |
" |
| 164 |
kde4-base_src_configure |
| 165 |
} |
| 166 |
|
| 167 |
src_compile() { |
| 168 |
kde4-base_src_compile |
| 169 |
|
| 170 |
# The building of apidox is not managed anymore by the build system |
| 171 |
if use doc; then |
| 172 |
einfo "Building API documentation" |
| 173 |
cd "${S}"/doc/api/ |
| 174 |
./doxygen.sh "${S}" || die "APIDOX generation failed" |
| 175 |
fi |
| 176 |
} |
| 177 |
|
| 178 |
src_install() { |
| 179 |
kde4-base_src_install |
| 180 |
|
| 181 |
if use doc; then |
| 182 |
einfo "Installing API documentation. This could take a bit of time." |
| 183 |
cd "${S}"/doc/api/ |
| 184 |
docinto /HTML/en/kdelibs-apidox |
| 185 |
dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed" |
| 186 |
fi |
| 187 |
|
| 188 |
dodir /etc/env.d |
| 189 |
dodir /etc/revdep-rebuild |
| 190 |
|
| 191 |
# List all the multilib libdirs |
| 192 |
local _libdir _libdirs |
| 193 |
for _libdir in $(get_all_libdirs); do |
| 194 |
_libdirs="${_libdirs}:${PREFIX}/${_libdir}" |
| 195 |
done |
| 196 |
_libdirs=${_libdirs#:} |
| 197 |
|
| 198 |
if use kdeprefix; then |
| 199 |
cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version |
| 200 |
PATH="${PREFIX}/bin" |
| 201 |
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin" |
| 202 |
LDPATH="${_libdirs}" |
| 203 |
MANPATH="${PREFIX}/share/man" |
| 204 |
CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" |
| 205 |
#KDE_IS_PRELINKED=1 |
| 206 |
XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" |
| 207 |
COLON_SEPARATED="XDG_DATA_DIRS" |
| 208 |
EOF |
| 209 |
doenvd "${T}"/43kdepaths-${SLOT} |
| 210 |
|
| 211 |
# make sure 'source /etc/profile' doesn't hose the PATH |
| 212 |
dodir /etc/profile.d |
| 213 |
cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh |
| 214 |
if [ -n "${KDEDIR}" ]; then |
| 215 |
export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") |
| 216 |
export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g") |
| 217 |
fi |
| 218 |
EOF |
| 219 |
|
| 220 |
cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}" |
| 221 |
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" |
| 222 |
EOF |
| 223 |
else # Much simpler for the FHS compliant -kdeprefix install |
| 224 |
cat <<-EOF > "${T}"/43kdepaths # number goes down with version |
| 225 |
CONFIG_PROTECT="/usr/share/config" |
| 226 |
#KDE_IS_PRELINKED=1 |
| 227 |
XDG_DATA_DIRS="/usr/share:/usr/local/share" |
| 228 |
COLON_SEPARATED="XDG_DATA_DIRS" |
| 229 |
EOF |
| 230 |
doenvd "${T}"/43kdepaths |
| 231 |
fi |
| 232 |
# Ensure that the correct permissions are set on ${PREFIX}/share/config |
| 233 |
chmod 755 ${PREFIX}/share/config |
| 234 |
} |
| 235 |
|
| 236 |
pkg_postinst() { |
| 237 |
if use zeroconf; then |
| 238 |
echo |
| 239 |
elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon" |
| 240 |
elog "is running. Make sure also that multicast dns lookups are enabled by editing" |
| 241 |
elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:" |
| 242 |
elog " hosts: files mdns dns" |
| 243 |
echo |
| 244 |
fi |
| 245 |
|
| 246 |
kde4-base_pkg_postinst |
| 247 |
} |
Archives