Version bump, thanks everyone at bug #210714.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-gentoo-r5 x86_64

5 files changed, 50 insertions, 67 deletions

diff --git a/kde-misc/tellico/ChangeLog b/kde-misc/tellico/ChangeLog
index 67ffa6c1251e..c9a2da3faf73 100644
--- a/kde-misc/tellico/ChangeLog
+++ b/kde-misc/tellico/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/tellico
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.77 2008/06/30 20:00:19 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/ChangeLog,v 1.78 2008/07/26 13:29:05 tgurr Exp $
+
+*tellico-1.3.3 (26 Jul 2008)
+
+  26 Jul 2008; Timo Gurr <tgurr@gentoo.org>
+  +files/tellico-1.3-releaseflaws.patch, -tellico-1.2.10.ebuild,
+  -tellico-1.2.11.ebuild, +tellico-1.3.3.ebuild:
+  Version bump, thanks everyone at bug #210714.
 
   30 Jun 2008; nixnut <nixnut@gentoo.org> tellico-1.2.14.ebuild:
   Stable on ppc wrt bug 216755
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index f671a5d79701..69845f8972c9 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,10 +1,9 @@
 AUX tellico-1.2.14-disable_formattest.patch 899 RMD160 c011f44a7733a72b11791eb18ef9f288003eb356 SHA1 8ffdfbb7f19e54c7509c4e54be333a7f292a5629 SHA256 72a498e0833a3690fdc2ff3517accafb75616adf4de1a6351f283b9eb64e4040
+AUX tellico-1.3-releaseflaws.patch 1111 RMD160 adc72164f6cc05c440aa78d043d14edcff098d29 SHA1 de24102d76282f71f0acefb6f31d644f1d79802b SHA256 e084052162770e267ffde2b1ca8b29d2507070c68adb90923ab767da9dad970a
 DIST kde-admindir-3.5.5.tar.bz2 187274 RMD160 24528f3bf94e7d1a1036b6e5af180719785839ed SHA1 b640d2606305201b0ec030555c324d326440efff SHA256 1aa56856e432839ec74a67ab33fc21b56ed4f1b4b5c60bfd5b953cb2d3423153
-DIST tellico-1.2.10.tar.gz 4707394 RMD160 be3b1491149872782058ea1ddedf1f1d811cda2d SHA1 bf90d3b46611ba109bfd793eeb36ceb0d4b29ae3 SHA256 6c9c105bf0b71f911e550b4a0e7a5fceb9516e327ad3f9ba62f89acc40626d89
-DIST tellico-1.2.11.tar.gz 4707191 RMD160 4308b9fbee15ddb7eeb976482a0ad73ab2430023 SHA1 6b2c80b7f716f002d11b7aa9e011152fc9ae3e75 SHA256 f6ee54964b67556852e401e3d87b51383f7e5230ae4d71cc7a3b4a68b65be35a
 DIST tellico-1.2.14.tar.gz 4802694 RMD160 e4d43f7770f216867ae523b91f2b6b4bb47509e7 SHA1 8619309362b299f4a81033e630cf0cb2aef88bd2 SHA256 d161550b1d7a68ba1077f073cd4e802405364729f0a9069635ce8a701160af7d
-EBUILD tellico-1.2.10.ebuild 1727 RMD160 d75d2b5f842becb341f3b7fd3b5724a96064f5af SHA1 ca176ef4928f6818bf7c58416864495ba0ced578 SHA256 7696d45845c7fe2c3ec332c757f6534cc1721db5e8b7a38ea2020393892219a5
-EBUILD tellico-1.2.11.ebuild 1725 RMD160 255a78c44c08f95c2aa70e6f9ad0edd0cff8fa26 SHA1 045e2562b8e4bc8c241ccad9c20d76e02ae41b3e SHA256 4441e6dc171b05a04900d16e6a17f8bf54c30c29200483d826a06b4173f2ad80
+DIST tellico-1.3.3.tar.gz 5099844 RMD160 09b5120f1dc38d7904784ed40f89ade3bff2087c SHA1 78961a388a71e663bfe7ec69ac98407ba3fc096d SHA256 eed0d2b29ec6d085c21fc7fa678f4f6aae5d135dbc28c80322bd9705878f2124
 EBUILD tellico-1.2.14.ebuild 2130 RMD160 d21c61a1b82d6e2ea492cf4f02056b764a04ac10 SHA1 6b774342c4786470b3b3510f9861df1c0403b145 SHA256 6e455a73e9c679b526fc2902752377103f17c091ccf5114f5fdb4bd0cafcc66c
-MISC ChangeLog 9187 RMD160 d9c1163bf1d43099d2c1f5e3a0846c1ad5e3a008 SHA1 403b15f941acb20d2d1a955de0531c1730281303 SHA256 91193f8453e7d3d8186a0ea45a4b97e243f88c2a72f23465391a16339f8201ef
+EBUILD tellico-1.3.3.ebuild 1903 RMD160 13073b17cee3ac926ba32627c667b0d1f4de8f8f SHA1 69844a4c03649e1f999243cc42cb35c30d8b47ae SHA256 cff19a8cac7a1d803317ccecd43794b10041e6cdd1d435c08a30bc993daf80c7
+MISC ChangeLog 9423 RMD160 a892ea26c0d9b87c5ea2fea586aa3661d9df5e3a SHA1 5f31dab3cec2f78ed6c9f5012c1dfba5a8148b37 SHA256 f2a1efc02be215bfcf720d44a9f056477785b247c0006c54f0ed687a0079e339
 MISC metadata.xml 404 RMD160 9156a395a53b2ae7ff5c140fe70c39c7b4cdcce6 SHA1 971f7d29e754f7aff2bc2e174a83cdf6160b086e SHA256 2b106abb4f2bb605fb0c4fc8db73ddd0562042705d9140999351cb7911812bbe
diff --git a/kde-misc/tellico/files/tellico-1.3-releaseflaws.patch b/kde-misc/tellico/files/tellico-1.3-releaseflaws.patch
new file mode 100644
index 000000000000..223c15920216
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-1.3-releaseflaws.patch
@@ -0,0 +1,22 @@
+--- admin/acinclude.m4.in.orig	2008-03-01 22:06:32.000000000 +0100
++++ admin/acinclude.m4.in	2008-03-01 22:06:58.000000000 +0100
+@@ -582,7 +582,7 @@
+ 
+         KDE_SET_DEFAULT_BINDIRS
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
+-        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
++        KDE_FIND_PATH(dcopidlng, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
+         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+         if test "$build_arts" '!=' "no"; then
+           KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+--- Makefile.am.orig	2008-03-01 22:05:52.000000000 +0100
++++ Makefile.am	2008-03-01 22:06:09.000000000 +0100
+@@ -36,6 +36,7 @@
+ 	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
+ 
+ xdg_apps_DATA = tellico.desktop
++xdg_mimedir = $(kde_datadir)/mime/packages
+ xdg_mime_DATA = tellico.xml
+ 
+ mimedir = $(kde_mimedir)/application
+
diff --git a/kde-misc/tellico/tellico-1.2.11.ebuild b/kde-misc/tellico/tellico-1.2.11.ebuild
deleted file mode 100644
index ce980c7d62f6..000000000000
--- a/kde-misc/tellico/tellico-1.2.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.11.ebuild,v 1.4 2008/02/18 23:05:53 ingmar Exp $
-
-inherit kde sgml-catalog
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A collection manager for the KDE environment."
-HOMEPAGE="http://www.periapsis.org/tellico"
-SRC_URI="http://www.periapsis.org/tellico/download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~x86"
-IUSE="calendar cddb yaz"
-
-RDEPEND=">=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.0.19
-	cddb?  ( || ( =kde-base/libkcddb-3.5* =kde-base/kdemultimedia-3.5* ) )
-	calendar? ( || ( ( =kde-base/ktnef-3.5* =kde-base/libkcal-3.5* ) =kde-base/kdepim-3.5* ) )
-	media-libs/taglib
-	yaz? ( dev-libs/yaz )"
-
-need-kde 3.5
-
-src_compile() {
-	local myconf="$(use_enable cddb libkcddb) $(use_enable calendar libkcal)"
-	kde_src_compile
-}
-
-pkg_postinst() {
-	einfo "Installing catalog..."
-	"${ROOT}"/usr/bin/xmlcatalog --noout --add "delegatePublic" \
-		"-//Robby Stephenson/DTD Tellico V9.0//EN" \
-		"file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-		"${ROOT}"/etc/xml/catalog
-	"${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateSystem" \
-		"http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-		"file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-		"${ROOT}"/etc/xml/catalog
-	"${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateURI" \
-		"http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-		"file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-		"${ROOT}"/etc/xml/catalog
-}
-
-pkg_postrm() {
-	"${ROOT}"/usr/bin/xmlcatalog --noout --del \
-		"file://${ROOT}usr/share/apps/tellico/tellico.dtd" \
-		"${ROOT}"/etc/xml/catalog
-}
diff --git a/kde-misc/tellico/tellico-1.2.10.ebuild b/kde-misc/tellico/tellico-1.3.3.ebuild
index b210b6bc2419..cf61a591ffb4 100644
--- a/kde-misc/tellico/tellico-1.2.10.ebuild
+++ b/kde-misc/tellico/tellico-1.3.3.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.2.10.ebuild,v 1.6 2008/02/18 23:05:53 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tellico/tellico-1.3.3.ebuild,v 1.1 2008/07/26 13:29:05 tgurr Exp $
 
-inherit kde sgml-catalog
+inherit kde sgml-catalog eutils
 
 MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A collection manager for the KDE environment."
 HOMEPAGE="http://www.periapsis.org/tellico"
-SRC_URI="http://www.periapsis.org/tellico/download/${MY_P}.tar.gz"
+SRC_URI="http://www.periapsis.org/tellico/download/${MY_P}.tar.gz
+		mirror://gentoo/kde-admindir-3.5.5.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="calendar cddb yaz"
 
 RDEPEND=">=dev-libs/libxml2-2.6
@@ -25,8 +26,15 @@ RDEPEND=">=dev-libs/libxml2-2.6
 
 need-kde 3.5
 
+src_unpack() {
+	kde_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-1.3-releaseflaws.patch"
+}
+
 src_compile() {
 	local myconf="$(use_enable cddb libkcddb) $(use_enable calendar libkcal)"
+	rm -f "${S}/configure"
 	kde_src_compile
 }
 
@@ -34,7 +42,7 @@ pkg_postinst() {
 	einfo "Installing catalog..."
 	"${ROOT}"/usr/bin/xmlcatalog --noout --add "delegatePublic" \
 		"-//Robby Stephenson/DTD Tellico V9.0//EN" \
-		"file://${ROOT}/usr/share/apps/tellico/tellico.dtd" \
+		"file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
 		"${ROOT}"/etc/xml/catalog
 	"${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateSystem" \
 		"http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
@@ -42,12 +50,12 @@ pkg_postinst() {
 		"${ROOT}"/etc/xml/catalog
 	"${ROOT}"/usr/bin/xmlcatalog --noout --add "delegateURI" \
 		"http://www.periapsis.org/tellico/dtd/v9/tellico.dtd" \
-		"file://${ROOT}/usr/share/apps/tellico/tellico.dtd" \
+		"file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
 		"${ROOT}"/etc/xml/catalog
 }
 
 pkg_postrm() {
 	"${ROOT}"/usr/bin/xmlcatalog --noout --del \
-		"file://${ROOT}/usr/share/apps/tellico/tellico.dtd" \
+		"file:/"${ROOT}"usr/share/apps/tellico/tellico.dtd" \
 		"${ROOT}"/etc/xml/catalog
 }