public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.2.0-r1.ebuild
@ 2009-01-31 13:39 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-01-31 13:39 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/01/31 13:39:42

  Modified:             ChangeLog
  Added:                kdelibs-4.2.0-r1.ebuild
  Log:
  Add upstream patches. Revbump.
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.554                kde-base/kdelibs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.554&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.554&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.553&r2=1.554

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- ChangeLog	27 Jan 2009 16:55:32 -0000	1.553
+++ ChangeLog	31 Jan 2009 13:39:42 -0000	1.554
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.553 2009/01/27 16:55:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.554 2009/01/31 13:39:42 scarabeus Exp $
+
+*kdelibs-4.2.0-r1 (31 Jan 2009)
+
+  31 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> +files/4.2.0-kded.patch,
+  +files/4.2.0-kio_copy.patch, +files/4.2.0-klauncher.patch,
+  +files/4.2.0-klauncher_konsole.patch, +kdelibs-4.2.0-r1.ebuild:
+  Add upstream patches. Revbump.
 
 *kdelibs-4.2.0 (27 Jan 2009)
 



1.1                  kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: kdelibs-4.2.0-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.1 2009/01/31 13:39:42 scarabeus Exp $

EAPI="2"

CPPUNIT_REQUIRED="optional"
OPENGL_REQUIRED="optional"
inherit kde4-base fdo-mime

DESCRIPTION="KDE libraries needed by all KDE programs."
HOMEPAGE="http://www.kde.org/"

KEYWORDS="~amd64 ~x86"
IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
LICENSE="LGPL-2.1"
RESTRICT="test"

# Blockers added for !kdeprefix? due to packages from old versions,
# removed in the meanwhile
# kde-base/libplasma
# kde-base/knewsticker
# kde-base/kpercentage
# kde-base/ktnef
COMMONDEPEND="
	!<=kde-base/kdebase-3.5.9-r4
	!<=kde-base/kdebase-startkde-3.5.10
	!kdeprefix? (
		!kde-base/kitchensync:4.1[kdeprefix=]
		!kde-base/knewsticker:4.1[kdeprefix=]
		!kde-base/kpercentage:4.1[kdeprefix=]
		!kde-base/ktnef:4.1[kdeprefix=]
		!kde-base/libplasma[kdeprefix=]
		!<=kde-misc/kdnssd-avahi-0.1.2:0
	)
	>=app-misc/strigi-0.6.3[qt4,dbus]
	dev-libs/libpcre
	dev-libs/libxml2
	dev-libs/libxslt
	>=kde-base/automoc-0.9.87
	media-libs/fontconfig
	media-libs/freetype:2
	media-libs/giflib
	media-libs/jpeg
	media-libs/libpng
	>=media-sound/phonon-4.3.0[xcb]
	sys-apps/dbus[X]
	x11-libs/libICE
	x11-libs/libSM
	x11-libs/libX11
	x11-libs/libXau
	x11-libs/libXcursor
	x11-libs/libXdmcp
	x11-libs/libXext
	x11-libs/libXfixes
	x11-libs/libXft
	x11-libs/libXpm
	x11-libs/libXrender
	x11-libs/libXtst
	x11-misc/shared-mime-info
	acl? (
		kernel_linux? ( sys-apps/acl )
	)
	alsa? ( media-libs/alsa-lib[midi] )
	fam? ( virtual/fam )
	jpeg2k? ( media-libs/jasper )
	kerberos? ( virtual/krb5 )
	nls? ( virtual/libintl )
	openexr? (
		media-libs/openexr
		media-libs/ilmbase
	)
	opengl? ( virtual/opengl )
	semantic-desktop? ( >=dev-libs/soprano-2.1.64 )
	spell? (
		app-dicts/aspell-en
		app-text/aspell
		app-text/enchant
	)
	ssl? ( dev-libs/openssl )
	zeroconf? (
		|| (
			net-dns/avahi[mdnsresponder-compat]
			!bindist? ( net-misc/mDNSResponder )
		)
	)
"

DEPEND="${COMMONDEPEND}
	sys-devel/gettext
	doc? ( app-doc/doxygen )
"

RDEPEND="${COMMONDEPEND}
	x11-apps/iceauth
	x11-apps/rgb
"

# upstream patches
PATCHES=(
	"$FILESDIR/$PV-kded.patch"
	"$FILESDIR/$PV-kio_copy.patch"
	"$FILESDIR/$PV-klauncher.patch"
	"$FILESDIR/$PV-klauncher_konsole.patch"
)

src_configure() {
	if use zeroconf; then
		if has_version net-dns/avahi; then
			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
		elif has_version net-misc/mDNSResponder; then
			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
		else
			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
		fi
	fi
	if use kdeprefix; then
		HME=".kde${SLOT}"
	else
		HME=".kde4"
	fi
	mycmakeargs="${mycmakeargs}
		-DWITH_HSPELL=OFF
		-DKDE_DEFAULT_HOME=${HME}
		$(cmake-utils_has 3dnow X86_3DNOW)
		$(cmake-utils_has altivec PPC_ALTIVEC)
		$(cmake-utils_has mmx X86_MMX)
		$(cmake-utils_has sse X86_SSE)
		$(cmake-utils_has sse2 X86_SSE2)
		$(cmake-utils_use_with acl ACL)
		$(cmake-utils_use_with alsa Alsa)
		$(cmake-utils_use_with bzip2 BZip2)
		$(cmake-utils_use_with fam FAM)
		$(cmake-utils_use_with jpeg2k Jasper)
		$(cmake-utils_use_with kerberos GSSAPI)
		$(cmake-utils_use_with nls Libintl)
		$(cmake-utils_use_with openexr OpenEXR)
		$(cmake-utils_use_with opengl OpenGL)
		$(cmake-utils_use_with semantic-desktop Soprano)
		$(cmake-utils_use_with spell ASPELL)
		$(cmake-utils_use_with spell ENCHANT)
		$(cmake-utils_use_with ssl OpenSSL)
	"
	kde4-base_src_configure
}

src_compile() {
	kde4-base_src_compile

	# The building of apidox is not managed anymore by the build system
	if use doc; then
		einfo "Building API documentation"
		cd "${S}"/doc/api/
		./doxygen.sh "${S}" || die "APIDOX generation failed"
	fi
}

src_install() {
	kde4-base_src_install

	if use doc; then
		einfo "Installing API documentation. This could take a bit of time."
		cd "${S}"/doc/api/
		docinto /HTML/en/kdelibs-apidox
		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
	fi

	dodir /etc/env.d
	dodir /etc/revdep-rebuild

	# List all the multilib libdirs
	local _libdir _libdirs
	for _libdir in $(get_all_libdirs); do
		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
	done
	_libdirs=${_libdirs#:}

	if use kdeprefix; then
		cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
PATH="${PREFIX}/bin"
ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
LDPATH="${_libdirs}"
MANPATH="${PREFIX}/share/man"
CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
#KDE_IS_PRELINKED=1
XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
COLON_SEPARATED="XDG_DATA_DIRS"
EOF
		doenvd "${T}"/43kdepaths-${SLOT}

		# make sure 'source /etc/profile' doesn't hose the PATH
		dodir /etc/profile.d
		cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
if [ -n "${KDEDIR}" ]; then
	export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
	export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
fi
EOF

		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
EOF
	else # Much simpler for the FHS compliant -kdeprefix install
		cat <<-EOF > "${T}"/43kdepaths # number goes down with version
CONFIG_PROTECT="/usr/share/config"
#KDE_IS_PRELINKED=1
XDG_DATA_DIRS="/usr/share:/usr/local/share"
COLON_SEPARATED="XDG_DATA_DIRS"
		EOF
		doenvd "${T}"/43kdepaths
	fi
	# Ensure that the correct permissions are set on ${PREFIX}/share/config
	fperms 755 "${PREFIX}"/share/config
}

pkg_postinst() {
	fdo-mime_mime_database_update
	if use zeroconf; then
		echo
		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
		elog "	hosts: files mdns dns"
		echo
	fi
	elog "Your homedir is set to "'${HOME}'"/${HME}"
	elog
	elog "If you experience weird application behavior (missing texts, etc.) run as root:"
	elog "# chmod 755 -R /usr/share/config $PREFIX/share/config"

	kde4-base_pkg_postinst
}

pkg_postrm() {
	fdo-mime_mime_database_update

	kde4-base_pkg_postrm
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.2.0-r1.ebuild
@ 2009-02-01 23:05 Jorge Manuel B. S. Vicetto (jmbsvicetto)
  0 siblings, 0 replies; 3+ messages in thread
From: Jorge Manuel B. S. Vicetto (jmbsvicetto) @ 2009-02-01 23:05 UTC (permalink / raw
  To: gentoo-commits

jmbsvicetto    09/02/01 23:05:29

  Modified:             ChangeLog kdelibs-4.2.0-r1.ebuild
  Log:
  Restored ~ppc and ~ppc64 keywords to KDE-4.2.0
  (Portage version: 2.2_rc23/cvs/Linux x86_64)

Revision  Changes    Path
1.557                kde-base/kdelibs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.557&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.557&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.556&r2=1.557

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -r1.556 -r1.557
--- ChangeLog	1 Feb 2009 06:55:46 -0000	1.556
+++ ChangeLog	1 Feb 2009 23:05:28 -0000	1.557
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.556 2009/02/01 06:55:46 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.557 2009/02/01 23:05:28 jmbsvicetto Exp $
+
+  01 Feb 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  kdelibs-4.2.0-r1.ebuild:
+  Restored ~ppc and ~ppc64 keywords to KDE-4.2.0
 
   01 Feb 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   kdelibs-4.2.0.ebuild:



1.3                  kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?r1=1.2&r2=1.3

Index: kdelibs-4.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-4.2.0-r1.ebuild	31 Jan 2009 13:58:08 -0000	1.2
+++ kdelibs-4.2.0-r1.ebuild	1 Feb 2009 23:05:28 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.2 2009/01/31 13:58:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.3 2009/02/01 23:05:28 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -11,7 +11,7 @@
 DESCRIPTION="KDE libraries needed by all KDE programs."
 HOMEPAGE="http://www.kde.org/"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
 kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
 LICENSE="LGPL-2.1"






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.2.0-r1.ebuild
@ 2009-02-05 17:47 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-02-05 17:47 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/02/05 17:47:01

  Modified:             ChangeLog kdelibs-4.2.0-r1.ebuild
  Log:
  Add patch fixing kode crashes. Per bug #257535. Forcing due to ppc mess :]
  (Portage version: 2.2_rc23/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.559                kde-base/kdelibs/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.559&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.559&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.558&r2=1.559

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
retrieving revision 1.558
retrieving revision 1.559
diff -u -r1.558 -r1.559
--- ChangeLog	3 Feb 2009 22:57:36 -0000	1.558
+++ ChangeLog	5 Feb 2009 17:47:00 -0000	1.559
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.558 2009/02/03 22:57:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.559 2009/02/05 17:47:00 scarabeus Exp $
+
+  05 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.2.0-kode_crash.patch, kdelibs-4.2.0-r1.ebuild:
+  Add patch fixing kode crashes. Per bug #257535
 
   03 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> kdelibs-4.2.0.ebuild,
   kdelibs-4.2.0-r1.ebuild:



1.5                  kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild?r1=1.4&r2=1.5

Index: kdelibs-4.2.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdelibs-4.2.0-r1.ebuild	3 Feb 2009 22:57:36 -0000	1.4
+++ kdelibs-4.2.0-r1.ebuild	5 Feb 2009 17:47:01 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.4 2009/02/03 22:57:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.5 2009/02/05 17:47:01 scarabeus Exp $
 
 EAPI="2"
 
@@ -105,6 +105,7 @@
 	"$FILESDIR/$PV-kio_copy.patch"
 	"$FILESDIR/$PV-klauncher.patch"
 	"$FILESDIR/$PV-klauncher_konsole.patch"
+	"$FILESDIR/$PV-kode_crash.patch"
 )
 
 src_configure() {






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2009-02-05 17:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-02-05 17:47 [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.2.0-r1.ebuild Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2009-02-01 23:05 Jorge Manuel B. S. Vicetto (jmbsvicetto)
2009-01-31 13:39 Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox