Cleaned old ebuild.

Package-Manager: portage-2.1.3_rc8

8 files changed, 11 insertions, 421 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index 3040ac6be765..116704be5ef9 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/djvu
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.65 2007/06/27 06:03:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.66 2007/07/22 06:34:22 pva Exp $
+
+  22 Jul 2007; <pva@gentoo.org> -files/djvu-3.5.16-gcc41-hash.patch,
+  -files/djvu-3.5.16-gcc41.patch,
+  -files/djvu-3.5.17-dont-prestrip-bins.patch, -files/gentoo-acdesktop.m4,
+  -djvu-3.5.17.ebuild:
+  Cleaned old ebuild.
 
   27 Jun 2007; Markus Rothe <corsair@gentoo.org> djvu-3.5.19.ebuild:
   Stable on ppc64; bug #183056
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 7dc1474c23b1..c47d5f7f2c44 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,44 +1,20 @@
-AUX djvu-3.5.16-gcc41-hash.patch 4158 RMD160 50f7df203aa9d3fbf8049dab8b748d481908fd2d SHA1 2ed1237cfe5bf8895ff570f3be92f1c5c2894d4b SHA256 92b9778c5f1b0b7b2a1d819e31546765bf32a8fadafd23e114977b28b910e568
-MD5 8b63d5bd9cc44163e6e9ab5dac8c0477 files/djvu-3.5.16-gcc41-hash.patch 4158
-RMD160 50f7df203aa9d3fbf8049dab8b748d481908fd2d files/djvu-3.5.16-gcc41-hash.patch 4158
-SHA256 92b9778c5f1b0b7b2a1d819e31546765bf32a8fadafd23e114977b28b910e568 files/djvu-3.5.16-gcc41-hash.patch 4158
-AUX djvu-3.5.16-gcc41.patch 1101 RMD160 aacb8ee4217323b36b7e0ce7d15cbaa8a86b7a5e SHA1 75e952c57b865330e3e51d791ef5eae7a9752c13 SHA256 febb7593e80136ec3b25817ab620efd1754b4b063a4800bec57f2f3e9c096571
-MD5 24b806f27bb6ea3af18cbf288a784d8c files/djvu-3.5.16-gcc41.patch 1101
-RMD160 aacb8ee4217323b36b7e0ce7d15cbaa8a86b7a5e files/djvu-3.5.16-gcc41.patch 1101
-SHA256 febb7593e80136ec3b25817ab620efd1754b4b063a4800bec57f2f3e9c096571 files/djvu-3.5.16-gcc41.patch 1101
-AUX djvu-3.5.17-dont-prestrip-bins.patch 1586 RMD160 0dfc6e238a795ae1017366c7461f4b11ca732a31 SHA1 94e8e145b8743444f0a85232122da91bc207757f SHA256 9f82c40011fbac673d2d28587af63a8d13d9e3503e7554a5f26964e4d206cc45
-MD5 d6c0c71675e509501f69b0f47f991560 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
-RMD160 0dfc6e238a795ae1017366c7461f4b11ca732a31 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
-SHA256 9f82c40011fbac673d2d28587af63a8d13d9e3503e7554a5f26964e4d206cc45 files/djvu-3.5.17-dont-prestrip-bins.patch 1586
 AUX djvulibre-3.5.17-pthread-flag.patch 2419 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 SHA1 2c028fd4bff1316a9278bc9047f6595ea3fc1e64 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f
 MD5 90ec522dba21d16d4df5e55e50e2a36d files/djvulibre-3.5.17-pthread-flag.patch 2419
 RMD160 35f4c484e567ed7a7dcfb51559925ed49ad5db26 files/djvulibre-3.5.17-pthread-flag.patch 2419
 SHA256 e5bd52eba105c7792866f13f5abccf07daca220dc68ac045a4abc431c329805f files/djvulibre-3.5.17-pthread-flag.patch 2419
-AUX gentoo-acdesktop.m4 2491 RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 SHA1 946fe237382867a0d580bcf6b57b2f818e6338e7 SHA256 0a9ec40c7ebe2a75025cd832a1d6eba25dc904593702e4e312662eb689ae5eef
-MD5 0da6de34d8db09192d2c881416108427 files/gentoo-acdesktop.m4 2491
-RMD160 1795c1b9bcb6aacd54962a65d5b8d551c15c17d4 files/gentoo-acdesktop.m4 2491
-SHA256 0a9ec40c7ebe2a75025cd832a1d6eba25dc904593702e4e312662eb689ae5eef files/gentoo-acdesktop.m4 2491
-DIST djvulibre-3.5.17.tar.gz 2298690 RMD160 1f9d2b1106d1e1898f04c0657b2c8b557246c33e SHA1 ee7358b0d3a5941e0f68dae1f5cd44407d63b1bd SHA256 a39977be3ca99f5b1d6a01a7795133c18de538bf20ff1f2d52d652bac94647c7
 DIST djvulibre-3.5.19.tar.gz 2380092 RMD160 2eb9b5df021bb7121a051d3256999da27dd3b682 SHA1 439977e03c8c35ca74eb5887993edb317923133f SHA256 57ffa154f45de309b352ce53aa6618af2f8639d1e330470c3c955241d44ccd78
-EBUILD djvu-3.5.17.ebuild 2136 RMD160 45a4e268f6159b9de239c3c55bf0a169dad3fdbf SHA1 dae34f1bfb18f87c88d56ff7add46522ef29ac0d SHA256 665d1034f46d227e3ba22c5f845c2814b3af314a026a2a2fda2d5d61bfa37a8f
-MD5 2eb88ca26ed4ced18ed8dbe79ff05aa5 djvu-3.5.17.ebuild 2136
-RMD160 45a4e268f6159b9de239c3c55bf0a169dad3fdbf djvu-3.5.17.ebuild 2136
-SHA256 665d1034f46d227e3ba22c5f845c2814b3af314a026a2a2fda2d5d61bfa37a8f djvu-3.5.17.ebuild 2136
 EBUILD djvu-3.5.19.ebuild 3295 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 SHA1 965f1fc093303026bba9eaf4829e1438ed84f898 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce
 MD5 a61cb04829515ab5d96cb5b56a4adfe1 djvu-3.5.19.ebuild 3295
 RMD160 85ad554d5a7c8dd8990f8f8408c3b3953eba8704 djvu-3.5.19.ebuild 3295
 SHA256 8c50ba5e182e3ecd34ec9a002159c8365f1a9e4c4b9af3be3ffd58734f60f9ce djvu-3.5.19.ebuild 3295
-MISC ChangeLog 8314 RMD160 10b2fef8c263e707f378f139f39eb657caa2eff5 SHA1 eac8eaeb3e6c353cab044d8525bcaec23c59d616 SHA256 d4dc2f15965e7f6b230e87638859e5afe77a82a4e9f847527ebab46de3d0e7f9
-MD5 c811f38c86ba16412f2a1d44d043b8f2 ChangeLog 8314
-RMD160 10b2fef8c263e707f378f139f39eb657caa2eff5 ChangeLog 8314
-SHA256 d4dc2f15965e7f6b230e87638859e5afe77a82a4e9f847527ebab46de3d0e7f9 ChangeLog 8314
+MISC ChangeLog 8534 RMD160 58145dc4f02f03c35225639161352c5d6ddf7259 SHA1 4a7d55af889b5121d8a792f3c62f5b8eb2a27c6b SHA256 e96503e763a3398bb0b44eca0928006193eada7efdc298350a14bbd56ee43199
+MD5 13ba80e238f8b466bc9452de09a30d00 ChangeLog 8534
+RMD160 58145dc4f02f03c35225639161352c5d6ddf7259 ChangeLog 8534
+SHA256 e96503e763a3398bb0b44eca0928006193eada7efdc298350a14bbd56ee43199 ChangeLog 8534
 MISC metadata.xml 865 RMD160 09cb90b4680856217c680e395e15957263c01472 SHA1 35e8a38a7dbed0d7f547cf21fa5bbb0133591e3d SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672
 MD5 ad8a8096a50ceca743956ec76d0818ef metadata.xml 865
 RMD160 09cb90b4680856217c680e395e15957263c01472 metadata.xml 865
 SHA256 13f4ad340f245deb6b5ba0d5ecfd5fe5aa408ff8ef9b2fe37a2f63ffc793c672 metadata.xml 865
-MD5 a9e217b0929984f6ebc7e06e81c94736 files/digest-djvu-3.5.17 253
-RMD160 a5c10def62ab40a70338cf96867754df9515486b files/digest-djvu-3.5.17 253
-SHA256 d09697f4e47fd027ca22b391ecc4ee4f47d4f0d0c747fabe8bf3a041dc7ca16b files/digest-djvu-3.5.17 253
 MD5 28fc1d89b6b373dbba13e0c296c04e7f files/digest-djvu-3.5.19 253
 RMD160 b704bedd8a6fb5a7dc68f17f3bc302e4f2ec207a files/digest-djvu-3.5.19 253
 SHA256 68a72e2fd1d6cf67ff769e59191eef47f78757563183a908cb0ec667a374ceb5 files/digest-djvu-3.5.19 253
diff --git a/app-text/djvu/djvu-3.5.17.ebuild b/app-text/djvu/djvu-3.5.17.ebuild
deleted file mode 100644
index 04773f3274b8..000000000000
--- a/app-text/djvu/djvu-3.5.17.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.17.ebuild,v 1.18 2007/04/04 16:00:48 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit nsplugins flag-o-matic fdo-mime eutils multilib toolchain-funcs autotools
-
-MY_P="${PN}libre-${PV}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( <x11-libs/qt-4 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use qt3; then
-		ewarn
-		ewarn "The standalone djvu viewer, djview, will not be compiled."
-		ewarn "Add \"qt3\" to your USE flags if you want it."
-		ewarn
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${P}-dont-prestrip-bins.patch"
-	epatch "${FILESDIR}/djvulibre-3.5.17-pthread-flag.patch"
-
-	# Replace autochecking acdesktop.m4 with a gentoo-specific one
-	cp "${FILESDIR}/gentoo-acdesktop.m4" "${S}/gui/desktop/acdesktop.m4"
-
-	AT_M4DIR="config gui/desktop" eautoreconf
-}
-
-src_compile() {
-	# assembler problems and hence non-building with pentium4
-	# <obz@gentoo.org>
-	replace-flags -march=pentium4 -march=pentium3
-
-	if use kde ; then
-		export kde_mimelnk=/usr/share/mimelnk
-	fi
-
-	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt3 ; then
-		QTCONF=" --with-qt --enable-threads "
-	elif use threads ; then
-		QTCONF=" --enable-threads "
-	else
-		QTCONF=" --disable-threads "
-	fi
-
-	econf --enable-desktopfiles \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		$(use_enable nls i18n) \
-		$(use_enable debug) \
-		${QTCONF} \
-		|| die "econf failed"
-
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i ${S}/gui/Makefile || die
-	fi
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
-}
diff --git a/app-text/djvu/files/digest-djvu-3.5.17 b/app-text/djvu/files/digest-djvu-3.5.17
deleted file mode 100644
index 3a03d05d9347..000000000000
--- a/app-text/djvu/files/digest-djvu-3.5.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 18e71eec1f7d59ef4710b405ea64650e djvulibre-3.5.17.tar.gz 2298690
-RMD160 1f9d2b1106d1e1898f04c0657b2c8b557246c33e djvulibre-3.5.17.tar.gz 2298690
-SHA256 a39977be3ca99f5b1d6a01a7795133c18de538bf20ff1f2d52d652bac94647c7 djvulibre-3.5.17.tar.gz 2298690
diff --git a/app-text/djvu/files/djvu-3.5.16-gcc41-hash.patch b/app-text/djvu/files/djvu-3.5.16-gcc41-hash.patch
deleted file mode 100644
index f11a8bdfec38..000000000000
--- a/app-text/djvu/files/djvu-3.5.16-gcc41-hash.patch
+++ /dev/null
@@ -1,180 +0,0 @@
---- libdjvu/GContainer.h.old	2006-01-29 11:04:51.000000000 +0100
-+++ libdjvu/GContainer.h	2006-01-29 11:05:32.000000000 +0100
-@@ -134,6 +134,88 @@
- //@{
- 
- 
-+// ------------------------------------------------------------
-+// HASH FUNCTIONS
-+// ------------------------------------------------------------
-+
-+
-+/** @name Hash functions
-+    These functions let you use template class \Ref{GMap} with the
-+    corresponding elementary types. The returned hash code may be reduced to
-+    an arbitrary range by computing its remainder modulo the upper bound of
-+    the range.
-+    @memo Hash functions for elementary types. */
-+//@{
-+
-+/** Hashing function (unsigned int). */
-+static inline unsigned int 
-+hash(const unsigned int & x) 
-+{ 
-+  return x; 
-+}
-+
-+/** Hashing function (int). */
-+static inline unsigned int 
-+hash(const int & x) 
-+{ 
-+  return (unsigned int)x;
-+}
-+
-+/** Hashing function (long). */
-+static inline unsigned int
-+hash(const long & x) 
-+{ 
-+  return (unsigned int)x;
-+}
-+
-+/** Hashing function (unsigned long). */
-+static inline unsigned int
-+hash(const unsigned long & x) 
-+{ 
-+  return (unsigned int)x;
-+}
-+
-+/** Hashing function (void *). */
-+static inline unsigned int 
-+hash(void * const & x) 
-+{ 
-+  return (unsigned long) x; 
-+}
-+
-+/** Hashing function (const void *). */
-+static inline unsigned int 
-+hash(const void * const & x) 
-+{ 
-+  return (unsigned long) x; 
-+}
-+
-+/** Hashing function (float). */
-+static inline unsigned int
-+hash(const float & x) 
-+{ 
-+  // optimizer will get rid of unnecessary code  
-+  unsigned int *addr = (unsigned int*)&x;
-+  if (sizeof(float)<2*sizeof(unsigned int))
-+    return addr[0];
-+  else
-+    return addr[0]^addr[1];
-+}
-+
-+/** Hashing function (double). */
-+static inline unsigned int
-+hash(const double & x) 
-+{ 
-+  // optimizer will get rid of unnecessary code
-+  unsigned int *addr = (unsigned int*)&x;
-+  if (sizeof(double)<2*sizeof(unsigned int))
-+    return addr[0];
-+  else if (sizeof(double)<4*sizeof(unsigned int))
-+    return addr[0]^addr[1];
-+  else
-+    return addr[0]^addr[1]^addr[2]^addr[3];    
-+}
-+
-+
- 
- // ------------------------------------------------------------
- // HELPER CLASSES
-@@ -1266,88 +1348,6 @@
- };
- 
- 
--// ------------------------------------------------------------
--// HASH FUNCTIONS
--// ------------------------------------------------------------
--
--
--/** @name Hash functions
--    These functions let you use template class \Ref{GMap} with the
--    corresponding elementary types. The returned hash code may be reduced to
--    an arbitrary range by computing its remainder modulo the upper bound of
--    the range.
--    @memo Hash functions for elementary types. */
--//@{
--
--/** Hashing function (unsigned int). */
--static inline unsigned int 
--hash(const unsigned int & x) 
--{ 
--  return x; 
--}
--
--/** Hashing function (int). */
--static inline unsigned int 
--hash(const int & x) 
--{ 
--  return (unsigned int)x;
--}
--
--/** Hashing function (long). */
--static inline unsigned int
--hash(const long & x) 
--{ 
--  return (unsigned int)x;
--}
--
--/** Hashing function (unsigned long). */
--static inline unsigned int
--hash(const unsigned long & x) 
--{ 
--  return (unsigned int)x;
--}
--
--/** Hashing function (void *). */
--static inline unsigned int 
--hash(void * const & x) 
--{ 
--  return (unsigned long) x; 
--}
--
--/** Hashing function (const void *). */
--static inline unsigned int 
--hash(const void * const & x) 
--{ 
--  return (unsigned long) x; 
--}
--
--/** Hashing function (float). */
--static inline unsigned int
--hash(const float & x) 
--{ 
--  // optimizer will get rid of unnecessary code  
--  unsigned int *addr = (unsigned int*)&x;
--  if (sizeof(float)<2*sizeof(unsigned int))
--    return addr[0];
--  else
--    return addr[0]^addr[1];
--}
--
--/** Hashing function (double). */
--static inline unsigned int
--hash(const double & x) 
--{ 
--  // optimizer will get rid of unnecessary code
--  unsigned int *addr = (unsigned int*)&x;
--  if (sizeof(double)<2*sizeof(unsigned int))
--    return addr[0];
--  else if (sizeof(double)<4*sizeof(unsigned int))
--    return addr[0]^addr[1];
--  else
--    return addr[0]^addr[1]^addr[2]^addr[3];    
--}
--
--
- //@}
- //@}
- //@}
diff --git a/app-text/djvu/files/djvu-3.5.16-gcc41.patch b/app-text/djvu/files/djvu-3.5.16-gcc41.patch
deleted file mode 100644
index 922acf2be5c3..000000000000
--- a/app-text/djvu/files/djvu-3.5.16-gcc41.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libdjvu/GURL.h.old	2006-01-29 10:22:53.000000000 +0100
-+++ libdjvu/GURL.h	2006-01-29 10:24:04.000000000 +0100
-@@ -278,10 +278,10 @@
-       //@}
- 
-       /// Returns TRUE if #gurl1# and #gurl2# are the same
--   bool	GURL::operator==(const GURL & gurl2) const;
-+   bool	operator==(const GURL & gurl2) const;
- 
-       /// Returns TRUE if #gurl1# and #gurl2# are different
--   bool	GURL::operator!=(const GURL & gurl2) const;
-+   bool	operator!=(const GURL & gurl2) const;
- 
-       /// Assignment operator
-    GURL &	operator=(const GURL & url);
---- libdjvu/ByteStream.h.old	2006-01-29 10:24:38.000000000 +0100
-+++ libdjvu/ByteStream.h	2006-01-29 10:24:55.000000000 +0100
-@@ -242,7 +242,7 @@
-       and writes it to the specified stream. */
-   void formatmessage( const char *fmt, ... );
-   /** Looks up the message and writes it to the specified stream. */
--  void ByteStream::writemessage( const char *message );
-+  void writemessage( const char *message );
-   /** Writes a one-byte integer to a ByteStream. */
-   void write8 (unsigned int card8);
-   /** Writes a two-bytes integer to a ByteStream.
diff --git a/app-text/djvu/files/djvu-3.5.17-dont-prestrip-bins.patch b/app-text/djvu/files/djvu-3.5.17-dont-prestrip-bins.patch
deleted file mode 100644
index 87ebf9c1e197..000000000000
--- a/app-text/djvu/files/djvu-3.5.17-dont-prestrip-bins.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN djvulibre-3.5.17.orig/gui/djview/Makefile.in djvulibre-3.5.17/gui/djview/Makefile.in
---- djvulibre-3.5.17.orig/gui/djview/Makefile.in	2004-08-24 19:58:55.000000000 +0200
-+++ djvulibre-3.5.17/gui/djview/Makefile.in	2006-06-02 09:11:29.000000000 +0200
-@@ -174,7 +174,7 @@
- install-bin: ${PROGRAM} FORCE
- 	${INSTALL} -d ${DESTDIR}${bindir}
- 	${LIBTOOL} --mode=install \
--	  ${INSTALL_PROGRAM} -s ${PROGRAM} ${DESTDIR}${bindir}
-+	  ${INSTALL_PROGRAM} ${PROGRAM} ${DESTDIR}${bindir}
- 
- install-man: FORCE
- 	${INSTALL} -d ${DESTDIR}${mandir}/man1
-diff -urN djvulibre-3.5.17.orig/tools/Makefile.in djvulibre-3.5.17/tools/Makefile.in
---- djvulibre-3.5.17.orig/tools/Makefile.in	2005-08-23 18:49:23.000000000 +0200
-+++ djvulibre-3.5.17/tools/Makefile.in	2006-06-02 09:10:52.000000000 +0200
-@@ -75,7 +75,7 @@
- 	${INSTALL} -d ${DESTDIR}${bindir}
- 	for n in ${PROGRAMS} ; do \
- 	  ${LIBTOOL} --mode=install \
--	    ${INSTALL_PROGRAM} -s $$n ${DESTDIR}${bindir} \
-+	    ${INSTALL_PROGRAM} $$n ${DESTDIR}${bindir} \
-           || exit ; done
- 
- install-scripts: FORCE
-diff -urN djvulibre-3.5.17.orig/xmltools/Makefile.in djvulibre-3.5.17/xmltools/Makefile.in
---- djvulibre-3.5.17.orig/xmltools/Makefile.in	2004-08-24 19:58:56.000000000 +0200
-+++ djvulibre-3.5.17/xmltools/Makefile.in	2006-06-02 09:10:30.000000000 +0200
-@@ -63,7 +63,7 @@
- 	${INSTALL} -d ${DESTDIR}${bindir}
- 	for n in ${PROGRAMS} ; do \
- 	  ${LIBTOOL} --mode=install \
--	    ${INSTALL_PROGRAM} -s $$n ${DESTDIR}${bindir} \
-+	    ${INSTALL_PROGRAM} $$n ${DESTDIR}${bindir} \
-           || exit ; done
- 
- install-data: FORCE
diff --git a/app-text/djvu/files/gentoo-acdesktop.m4 b/app-text/djvu/files/gentoo-acdesktop.m4
deleted file mode 100644
index 61e59245d483..000000000000
--- a/app-text/djvu/files/gentoo-acdesktop.m4
+++ /dev/null
@@ -1,62 +0,0 @@
-dnl Copyright (c) 2002  Leon Bottou and Yann Le Cun.
-dnl Copyright (c) 2001  AT&T
-dnl
-dnl Most of these macros are derived from macros listed
-dnl at the GNU Autoconf Macro Archive
-dnl http://www.gnu.org/software/ac-archive/
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111 USA
-dnl
-
-dnl -------------------------------------------------------
-dnl @synopsis AC_VARIFY(varname)
-dnl Replace expansion of $libdir, $datadir, $bindir, $prefix
-dnl by references to the variable.
-dnl -------------------------------------------------------
-AC_DEFUN([AC_VARIFY],[
-    xdir="`eval echo \"$libdir\"`"
-    $1=`echo [$]$1 | sed -e 's:^'"$xdir"'/:${libdir}/:'`
-    xdir="`eval echo \"$datadir\"`"
-    $1=`echo [$]$1 | sed -e 's:^'"$xdir"'/:${datadir}/:'`
-    xdir="`eval echo \"$bindir\"`"
-    $1=`echo [$]$1 | sed -e 's:^'"$xdir"'/:${bindir}/:'`
-    xdir="`eval echo \"$prefix\"`"
-    $1=`echo [$]$1 | sed -e 's:^'"$xdir"'/:${prefix}/:'`
-])
-
-
-dnl -------------------------------------------------------
-dnl @synopsis AC_LOCATE_DESKTOP_DIRS
-dnl Define installation paths for desktop config files
-dnl (mime types, menu entries, icons, etc.)
-dnl -------------------------------------------------------
-AC_DEFUN([AC_FIND_DESKTOP_DIRS],[
-   dtop_applications=/usr/share/applications          # XDG menu entries
-   dtop_icons=/usr/share/icons                 # KDE-style icon directories
-   dtop_mime_info=/usr/share/mime-info             # Gnome mime database
-   dtop_application_registry=/usr/share/application-registry  # Gnome mime associations
-   dtop_mimelnk=${kde_mimelnk}               # KDE mime database
-
-   AC_SUBST(dtop_applications)
-   AC_SUBST(dtop_icons)
-   AC_SUBST(dtop_pixmaps)
-   AC_SUBST(dtop_mime_info)
-   AC_SUBST(dtop_application_registry)
-   AC_SUBST(dtop_applnk)
-   AC_SUBST(dtop_mimelnk)
-   AC_SUBST(dtop_menu)
-])
-
-