version bump

(Portage version: 2.0.53)

17 files changed, 196 insertions, 214 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 73e845ff402d..be0d4c2bb771 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.135 2005/12/13 18:10:48 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.136 2005/12/17 01:10:50 carlo Exp $
+
+*k3b-0.12.10 (17 Dec 2005)
+
+  17 Dec 2005; Carsten Lohrke <carlo@gentoo.org> +k3b-0.12.10.ebuild:
+  version bump
 
   13 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> k3b-0.12.8.ebuild:
   Stable on amd64, bug 114669.
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 45e01405bbdd..8e6bbb60c475 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4eabc7bc5c6283404e98efa502252d82 ChangeLog 18866
+MD5 4a370b64f0178c532ff1b545bbd05c53 ChangeLog 18980
 MD5 a1b5a05a8513587c957d81f2f7eb44c0 files/digest-k3b-0.11.24 133
+MD5 90fbad86fc495f56923154be7712507a files/digest-k3b-0.12.10 135
 MD5 384b07ebe51023847a4cbdb756c9e867 files/digest-k3b-0.12.4a 135
 MD5 8bdf1530c459d3f1a176f6c1a93ad6ea files/digest-k3b-0.12.5 133
 MD5 fe05540c8069e25ad1a94fb44442f25f files/digest-k3b-0.12.6 133
@@ -14,6 +12,7 @@ MD5 49d32c38a705809a2646228a8d0b71d4 files/k3b-0.12.4a-qt-3.3.5.patch 574
 MD5 05b0752bbeda2fa5179d6c1933e5efb5 files/k3b-0.12.9-conditional.patch 774
 MD5 5f469d8bb9067596d861b4a9a0a450a1 files/k3b-dvdrip-transcode.patch 1999
 MD5 c58ebf198d19232866dd5ca596a2b147 k3b-0.11.24.ebuild 3108
+MD5 ff3f34e33ac373c5eb14463c0d6e50d1 k3b-0.12.10.ebuild 3270
 MD5 d1b3e1189286fb4f434e42a935ab9ee4 k3b-0.12.4a.ebuild 3343
 MD5 07519615ce63b52b1fec22f11ce8b6c6 k3b-0.12.5.ebuild 3209
 MD5 29fd37eefbdf691fefa5212bc6d4f3d5 k3b-0.12.6.ebuild 3208
@@ -21,10 +20,3 @@ MD5 5369e74b32bdfe1461c6f5f4b4de118d k3b-0.12.7.ebuild 3208
 MD5 7589f91fa47187acffd79b20e9e1ae3d k3b-0.12.8.ebuild 3206
 MD5 7f6ce5ba021d698dab797583646af804 k3b-0.12.9.ebuild 3374
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnw60ntT9W3vfTuoRAl0WAKCqcJaFtBQUqwlIoEITn4ZnWHHBBACgqZ4O
-I57XswMDveZGgqjoi4chX5w=
-=uols
------END PGP SIGNATURE-----
diff --git a/app-cdr/k3b/files/digest-k3b-0.12.10 b/app-cdr/k3b/files/digest-k3b-0.12.10
new file mode 100644
index 000000000000..722f522ee8e0
--- /dev/null
+++ b/app-cdr/k3b/files/digest-k3b-0.12.10
@@ -0,0 +1,2 @@
+MD5 f685230ef445b36ccba42fc80b922dfa k3b-0.12.10.tar.bz2 4084756
+MD5 db3bc6d94da5b63f22bd04e981486974 k3b-i18n-0.12.10.tar.bz2 4330221
diff --git a/app-cdr/k3b/k3b-0.12.10.ebuild b/app-cdr/k3b/k3b-0.12.10.ebuild
new file mode 100644
index 000000000000..aeb7d321ea1e
--- /dev/null
+++ b/app-cdr/k3b/k3b-0.12.10.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.10.ebuild,v 1.1 2005/12/17 01:10:50 carlo Exp $
+
+inherit kde eutils
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="alsa css dvdr encode ffmpeg flac hal kde mp3 musepack musicbrainz sndfile vcd vorbis"
+
+DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
+	hal? ( sys-apps/dbus sys-apps/hal )
+	media-libs/libsamplerate
+	media-libs/taglib
+	>=media-sound/cdparanoia-3.9.8
+	sndfile? ( media-libs/libsndfile )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	musepack? ( media-libs/libmpcdec )
+	vorbis? ( media-libs/libvorbis )
+	musicbrainz? ( media-libs/musicbrainz )
+	encode? ( media-sound/lame )
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	>=app-cdr/cdrdao-1.1.7-r3
+	media-sound/normalize
+	dvdr? ( app-cdr/dvd+rw-tools )
+	css? ( media-libs/libdvdcss )
+	encode? ( media-sound/sox
+	          media-video/transcode )
+	vcd? ( media-video/vcdimager )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+need-kde 3.3
+
+I18N="${PN}-i18n-${PV}"
+
+# Supported languages and translated documentation for 0.12.8
+LANGS="bg br bs ca cs cy da de el en_GB es et fr ga \
+	he hi hu is it lt mk nb nl nn pa pl pt pt_BR \
+	ro ru sl sr sr@Latn sv ta tr uk zh_CN"
+
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+done
+
+pkg_setup() {
+	if use hal && ! built_with_use sys-apps/dbus qt; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
+		eerror "but sys-apps/dbus is not built with Qt support."
+		die
+	fi
+
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	local MAKE_LANGS
+	for X in ${LANGS}; do
+		use linguas_${X} && MAKE_LANGS="${MAKE_LANGS} ${X}"
+	done
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		cd "${WORKDIR}/${I18N}"
+		sed -i -e "s,^SUBDIRS = .*,SUBDIRS = ${MAKE_LANGS}," Makefile.in
+	fi
+}
+
+src_compile() {
+	local myconf="--enable-libsuffix= \
+			--with-external-libsamplerate	\
+			--without-resmgr		\
+			$(use_with kde k3bsetup)	\
+			$(use_with hal)			\
+			$(use_with encode lame)		\
+			$(use_with ffmpeg)		\
+			$(use_with flac)		\
+			$(use_with vorbis oggvorbis)	\
+			$(use_with sndfile)		\
+			$(use_with mp3 libmad)		\
+			$(use_with musepack)		\
+			$(use_with musicbrainz)		\
+			$(use_with alsa)"
+
+	# Build process of K3b
+	kde_src_compile
+
+	# Build process of K3b-i18n
+	local _S=${S}
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		S="${WORKDIR}/${I18N}"
+		cd "${S}"
+		kde_src_compile
+	fi
+	S=${_S}
+}
+
+src_install() {
+	kde_src_install
+	dodoc FAQ KNOWNBUGS PERMISSIONS
+
+	local _S=${S}
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		S="${WORKDIR}/${I18N}"
+		cd "${S}"
+		kde_src_install
+	fi
+	S=${_S}
+
+	# Move menu entry
+	if use kde; then
+		mv ${D}/usr/share/applnk/Settings/System/k3bsetup2.desktop ${D}/usr/share/applications/kde/
+	fi
+	rm -fR ${D}/usr/share/applnk/
+}
+
+pkg_postinst() {
+	echo
+	einfo "Make sure you have proper read/write permissions on the cdrom device(s)."
+	einfo "Usually, it is sufficient to be in the cdrom group."
+	echo
+}
diff --git a/dev-lang/smarteiffel/ChangeLog b/dev-lang/smarteiffel/ChangeLog
index a2c42135563e..bad627bf3067 100644
--- a/dev-lang/smarteiffel/ChangeLog
+++ b/dev-lang/smarteiffel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/smarteiffel
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/ChangeLog,v 1.18 2005/12/16 11:07:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/ChangeLog,v 1.19 2005/12/17 01:15:29 carlo Exp $
+
+*smarteiffel-2.2_rc3 (17 Dec 2005)
+
+  17 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  -smarteiffel-1.0_beta5.ebuild, -smarteiffel-2.0_rc2.ebuild,
+  -smarteiffel-2.2_rc1.ebuild, +smarteiffel-2.2_rc3.ebuild:
+  version bump
 
   16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
   smarteiffel-2.2_rc1.ebuild:
diff --git a/dev-lang/smarteiffel/Manifest b/dev-lang/smarteiffel/Manifest
index 5e877b8942d3..353c9ca2bb39 100644
--- a/dev-lang/smarteiffel/Manifest
+++ b/dev-lang/smarteiffel/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c1999d5e36c3a9bafa8243faee8577ae ChangeLog 3371
+MD5 dda1e2b8202238bbcfcc3bfb7cdbf5f3 ChangeLog 3594
 MD5 ac711f98b4db909cc9a1f5caac836200 files/digest-smarteiffel-1.0 56
-MD5 5eb607a2acf270cd997783730d6280f4 files/digest-smarteiffel-1.0_beta5 74
 MD5 8e77136ea7437bc6665796429795e5a3 files/digest-smarteiffel-1.1 56
-MD5 36e9f5dae78d0038a62ec283d005f07d files/digest-smarteiffel-2.0_rc2 64
-MD5 d104b254b70fcd6e476ffd10ea350493 files/digest-smarteiffel-2.2_rc1 73
+MD5 e2c0ab63520a9848651e6eb25d2acf21 files/digest-smarteiffel-2.2_rc3 73
 MD5 c4c708e3dc384f836a21bfea63ae3288 metadata.xml 162
 MD5 d69310e04c23327b2e72ce63d0279c0f smarteiffel-1.0.ebuild 2130
-MD5 d027ccde2ebc313d41a91a699044733c smarteiffel-1.0_beta5.ebuild 2229
 MD5 3c93ded265cf997556d78f95f834c429 smarteiffel-1.1.ebuild 2373
-MD5 c46453c3f2401d5d60dd3f345a644f04 smarteiffel-2.0_rc2.ebuild 2725
-MD5 9dea831efa89d6e5898a20ce1f00fc9f smarteiffel-2.2_rc1.ebuild 2795
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDoqACAiZjviIA2XgRAuN2AJ9A4zXnIyRQ92xZdMfnfVXbnIgyYgCgk1yS
-3oHVIFpSDzs/PyRcReAG/nQ=
-=luON
------END PGP SIGNATURE-----
+MD5 08e0649119ee5f387aa85b144e4549c4 smarteiffel-2.2_rc3.ebuild 2681
diff --git a/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5 b/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5
deleted file mode 100644
index 623eee4be6eb..000000000000
--- a/dev-lang/smarteiffel/files/digest-smarteiffel-1.0_beta5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c8b6d51223d9a34fc363ed98d90e178e smarteiffel-1.0_beta5.tar.bz2 955516
diff --git a/dev-lang/smarteiffel/files/digest-smarteiffel-2.0_rc2 b/dev-lang/smarteiffel/files/digest-smarteiffel-2.0_rc2
deleted file mode 100644
index 1bc0f7e99dd9..000000000000
--- a/dev-lang/smarteiffel/files/digest-smarteiffel-2.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a396f616f53f70c4a00768c948e99bb se-2-0-rc2.tar.bz2 4097126
diff --git a/dev-lang/smarteiffel/files/digest-smarteiffel-2.2_rc1 b/dev-lang/smarteiffel/files/digest-smarteiffel-2.2_rc1
deleted file mode 100644
index a81331ce78ae..000000000000
--- a/dev-lang/smarteiffel/files/digest-smarteiffel-2.2_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff5ee85f95a07e6f396341414921db25 SmartEiffel-2-2-rc1.tar.bz2 7065278
diff --git a/dev-lang/smarteiffel/files/digest-smarteiffel-2.2_rc3 b/dev-lang/smarteiffel/files/digest-smarteiffel-2.2_rc3
new file mode 100644
index 000000000000..64a1cb766da7
--- /dev/null
+++ b/dev-lang/smarteiffel/files/digest-smarteiffel-2.2_rc3
@@ -0,0 +1 @@
+MD5 b67f93cc870fb5f84aba26318f08ecd0 SmartEiffel-2-2-rc3.tar.bz2 7085163
diff --git a/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild b/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild
deleted file mode 100644
index a7eb88462fbf..000000000000
--- a/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-1.0_beta5.ebuild,v 1.6 2004/06/24 22:56:03 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="GNU Eiffel compiler"
-HOMEPAGE="http://smarteiffel.loria.fr/"
-
-#the source as distributed by authors has no versioning in its name,
-#this will break things when new version comes out.
-#just point SRC_URI to ibiblio mirror instead (with mangled name of source uploaded)
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="sys-devel/gcc"
-
-S="${WORKDIR}/SmartEiffel"
-
-src_compile() {
-	export SmartEiffel="${S}/sys/system.se"
-	export PATH="${S}/bin:${PATH}"
-	cd ${S}
-	make automatic || die
-
-	# Regenerate a proper loadpath.UNIX file.
-	cp sys/loadpath.UNIX sys/loadpath.UNIX.orig
-	sed -e "s:^${S}:/usr/lib/${PF}:" \
-		sys/loadpath.UNIX.orig > sys/loadpath.UNIX || die
-
-	# Setup proper links in the documentation.
-	cd man || die
-	for file in *.html; do
-		cp ${file} ${file}.orig || die
-		sed -e "s:../man/::g" < ${file}.orig > ${file} || die
-	done
-}
-
-src_install () {
-	# TODO: The build process of SmartEiffel doesn't include an install part.
-	# Basically, wherever you build it is where you install it. :) For now,
-	# we'll just do our own adhoc, FHS-compliant install step.
-	#
-	# Hopefully, SmartEiffel developers will move towards a more GNUlitical
-	# program in the future (i.e. Nice trivial configure and make process).
-	dodir /usr/lib/${PF}
-	cp -a ${S}/lib ${D}/usr/lib/${PF} || die
-	cp -a ${S}/tools ${D}/usr/lib/${PF} || die
-	cp -a ${S}/sys ${D}/usr/lib/${PF} || die
-	cp -a ${S}/bin ${D}/usr/lib/${PF} || die
-
-	# Create symlinks to the appropriate executable binaries.
-	dodir /usr/bin
-	for NAME in ${S}/bin/*; do
-		NAME=`basename ${NAME}`
-		# Mangle 'compile' to 'se-compile'
-		if [ ${NAME} = "compile" ]; then
-			dosym /usr/lib/${PF}/bin/${NAME} /usr/bin/se-compile
-		else
-			dosym /usr/lib/${PF}/bin/${NAME} /usr/bin/${NAME}
-		fi
-	done
-
-	# Setup 'SmartEiffel' environment variable.
-	dodir /etc/env.d
-	echo "SmartEiffel=/usr/lib/${PF}/sys/system.se" > \
-		${D}/etc/env.d/20smarteiffel || die
-
-	dodoc READ_ME
-	dohtml ${S}/man/*.html
-}
diff --git a/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild b/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild
deleted file mode 100644
index e3441cd29bd1..000000000000
--- a/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-2.0_rc2.ebuild,v 1.3 2005/05/04 11:00:24 dholm Exp $
-
-IUSE="doc tcc"
-
-MY_PV=${PV//./-}
-
-DESCRIPTION="GNU Eiffel compiler"
-HOMEPAGE="http://smarteiffel.loria.fr/"
-
-SRC_URI="ftp://ftp.loria.fr/pub/loria/SmartEiffel/se.latest/se-${MY_PV//_/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
-
-DEPEND="tcc? ( >=dev-lang/tcc-0.9.14 )"
-
-S="${WORKDIR}/SmartEiffel"
-# Destination directory to hold most of the SmartEiffel distribution.
-SE_DIR="/usr/lib/SmartEiffel"
-
-src_compile() {
-	use tcc && CFLAGS=""
-	use tcc && COMPILER=tcc || COMPILER=gcc
-	einfo "Using ${COMPILER} as default C-compiler for SmartEiffel!"
-
-	export SmartEiffel="${S}/sys/system.se"
-	export PATH="${S}/bin:${PATH}"
-	cd ${S}
-	ebegin "Compiling install-program"
-		${COMPILER} ${CFLAGS} -o install.bin install.c || die
-		#package authors created install directory right next to install.c
-		#how nice of them!
-	eend $?
-
-	einfo "Running install-program"
-	(	echo   #skipping stupid prompt
-		echo 2 #compiler setup
-		use tcc && (
-			 echo 11; echo tcc; echo g++
-		)
-		echo 12 #CFLAGS setup
-		echo "${CFLAGS}"
-		echo "${CXXFLAGS}"
-		echo 13 #main menu
-		echo 1; # configure
-		echo 1; echo "${S}/sys/system.se"; #set configuration file
-		echo 3; echo "${S}/bin/"; # set bin dir
-		echo 4; echo "${S}/sys/"; # set Sys dir
-		echo 5; echo "${S}/sys/"; # set Short dir
-		echo 6; # configure environment variables
-		echo 1;
-		echo "path_tutorial";
-		echo "${S}/tutorial/"
-		echo 1;
-		echo "path_tools";
-		echo "${S}/tools/";
-		echo 1;
-		echo "path_lib";
-		echo "${S}/lib/";
-		echo 3;
-		echo 8 #exit menu
-		echo 4 #save conf file
-		echo 5; echo
-		echo 6; echo #leave the menu
-	) | ./install.bin || die
-	einfo "finished running install"
-
-	#looks like only one file with path definitions, good
-	sed -i -e "s:${S}:${SE_DIR}:" ${S}/sys/system.se || die
-}
-
-src_install () {
-	dodir ${SE_DIR}
-	cp -a ${S}/{lib,tools,sys,bin} ${D}/${SE_DIR} || die
-
-	# Create symlinks to the appropriate executable binaries.
-	dodir /usr/bin
-	rm ${S}/bin/README.txt
-	#since then this became a bin file?
-	for NAME in ${S}/bin/*; do
-		NAME=`basename ${NAME}`
-		dosym ${SE_DIR}/bin/${NAME} /usr/bin/${NAME}
-	done
-
-	# Install documentation.
-	if use doc; then
-		einfo "Installing documentation"
-		dodir /usr/share/doc/${PF}
-		cp -a ${S}/{man,misc,tutorial,READ_ME} ${D}/usr/share/doc/${PF} || die
-	fi
-
-	# Setup 'SmartEiffel' environment variable.
-	dodir /etc/env.d
-	echo "SmartEiffel=${SE_DIR}/sys/system.se" > ${D}/etc/env.d/20smarteiffel
-	echo "SmartEiffelDirectory=${SE_DIR}" >> ${D}/etc/env.d/20smarteiffel
-}
diff --git a/dev-lang/smarteiffel/smarteiffel-2.2_rc1.ebuild b/dev-lang/smarteiffel/smarteiffel-2.2_rc3.ebuild
index deecf5386840..f8f08e9752d7 100644
--- a/dev-lang/smarteiffel/smarteiffel-2.2_rc1.ebuild
+++ b/dev-lang/smarteiffel/smarteiffel-2.2_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-2.2_rc1.ebuild,v 1.3 2005/12/16 11:07:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smarteiffel/smarteiffel-2.2_rc3.ebuild,v 1.1 2005/12/17 01:15:29 carlo Exp $
 
 inherit toolchain-funcs multilib
 
@@ -66,7 +66,7 @@ src_compile() {
 		echo 5; #save conf file
 		echo 6; echo
 		echo 0; echo #leave the menu
-
+		
 	) | ./install.bin || die
 	einfo "finished running install"
 
@@ -76,7 +76,7 @@ src_compile() {
 
 src_install () {
 	dodir ${SE_DIR}
-	cp -pPR ${S}/{lib,tools,sys,bin} ${D}/${SE_DIR} || die
+	cp -a ${S}/{lib,tools,sys,bin} ${D}/${SE_DIR} || die
 
 	# Create symlinks to the appropriate executable binaries.
 	dodir /usr/bin
@@ -91,7 +91,7 @@ src_install () {
 	if use doc; then
 		einfo "Installing documentation"
 		dodir /usr/share/doc/${PF}
-		cp -pPR ${S}/{man,misc,tutorial,READ_ME.txt} ${D}/usr/share/doc/${PF} || die
+		cp -a ${S}/{man,misc,tutorial,READ_ME.txt} ${D}/usr/share/doc/${PF} || die
 	fi
 
 	# Setup 'SmartEiffel' environment variable.
diff --git a/net-firewall/knetfilter/ChangeLog b/net-firewall/knetfilter/ChangeLog
index 9209820919a0..f74b2ca73251 100644
--- a/net-firewall/knetfilter/ChangeLog
+++ b/net-firewall/knetfilter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/knetfilter
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/ChangeLog,v 1.16 2005/07/26 11:58:31 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/ChangeLog,v 1.17 2005/12/17 01:12:08 carlo Exp $
+
+*knetfilter-3.5.0 (17 Dec 2005)
+
+  17 Dec 2005; Carsten Lohrke <carlo@gentoo.org> +knetfilter-3.5.0.ebuild:
+  version bump
 
   26 Jul 2005; David Holm <dholm@gentoo.org> knetfilter-3.4.0.ebuild:
   Added to ~ppc.
diff --git a/net-firewall/knetfilter/Manifest b/net-firewall/knetfilter/Manifest
index 7e610f2db10b..70729070d230 100644
--- a/net-firewall/knetfilter/Manifest
+++ b/net-firewall/knetfilter/Manifest
@@ -1,6 +1,8 @@
-MD5 965ebb36ac2906ae4e18026121b452d5 ChangeLog 3947
+MD5 ab021dc935648303d38b3ee1e169c193 ChangeLog 4071
+MD5 0560547615e22f8c3664b4574a114ec6 files/digest-knetfilter-3.3.0 68
+MD5 4f0786575477cc86bb46f79773696bd8 files/digest-knetfilter-3.4.0 69
+MD5 a1430ec394f48492d84fbe12dc96089f files/digest-knetfilter-3.5.0 69
 MD5 ed63beca1d7c74ec82802079a959ab5e knetfilter-3.3.0.ebuild 651
 MD5 963de7b0cd9a1d19e3c381278bdeb449 knetfilter-3.4.0.ebuild 608
+MD5 963de7b0cd9a1d19e3c381278bdeb449 knetfilter-3.5.0.ebuild 608
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 0560547615e22f8c3664b4574a114ec6 files/digest-knetfilter-3.3.0 68
-MD5 4f0786575477cc86bb46f79773696bd8 files/digest-knetfilter-3.4.0 69
diff --git a/net-firewall/knetfilter/files/digest-knetfilter-3.5.0 b/net-firewall/knetfilter/files/digest-knetfilter-3.5.0
new file mode 100644
index 000000000000..4a283bce3105
--- /dev/null
+++ b/net-firewall/knetfilter/files/digest-knetfilter-3.5.0
@@ -0,0 +1 @@
+MD5 b3072bc07ff6beea33cfabfb921a8f3a knetfilter-3.5.0.tar.gz 1282165
diff --git a/net-firewall/knetfilter/knetfilter-3.5.0.ebuild b/net-firewall/knetfilter/knetfilter-3.5.0.ebuild
new file mode 100644
index 000000000000..24993c5e4a9f
--- /dev/null
+++ b/net-firewall/knetfilter/knetfilter-3.5.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/knetfilter-3.5.0.ebuild,v 1.1 2005/12/17 01:12:08 carlo Exp $
+
+inherit kde
+
+DESCRIPTION="Manage Iptables firewalls with this KDE app"
+HOMEPAGE="http://expansa.sns.it/knetfilter/"
+SRC_URI="http://expansa.sns.it/knetfilter/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=net-firewall/iptables-1.2.5"
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+	make distclean
+	kde_sandbox_patch ${S}/src ${S}/src/scripts
+}