Version bump and removed old ebuilds. Also disabled striping of (see bug #241238).

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686)

6 files changed, 42 insertions, 293 deletions

diff --git a/sci-mathematics/singular/ChangeLog b/sci-mathematics/singular/ChangeLog
index 6355f041697e..1a618a395441 100644
--- a/sci-mathematics/singular/ChangeLog
+++ b/sci-mathematics/singular/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-mathematics/singular
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.23 2008/08/06 20:49:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/ChangeLog,v 1.24 2008/10/20 12:30:00 markusle Exp $
+
+*singular-3.0.4.4 (20 Oct 2008)
+
+  20 Oct 2008; Markus Dittrich <markusle@gentoo.org>
+  -files/singular-3.0.2-gentoo.diff, -files/singular-3.0.3-gentoo.diff,
+  +files/singular-3.0.4.4-nostrip.patch, -singular-3.0.2.1.ebuild,
+  -singular-3.0.3.ebuild, +singular-3.0.4.4.ebuild:
+  Version bump and removed old ebuilds. Also disabled striping of binaries
+  (see bug #241238).
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff
deleted file mode 100644
index 165eadd28c7b..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.2-gentoo.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur Singular-3-0-2/kernel/feResource.cc Singular-3-0-2-new/kernel/feResource.cc
---- Singular-3-0-2/kernel/feResource.cc	2005-11-21 06:05:26.000000000 -0500
-+++ Singular-3-0-2-new/kernel/feResource.cc	2006-10-12 22:15:28.000000000 -0400
-@@ -41,7 +41,7 @@
- #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
- #endif
- #else // ! defined(MAKE_DISTRIBUTION)
--#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-+#define SINGULAR_DEFAULT_DIR "/usr"
- #endif // defined(MAKE_DISTRIBUTION)
- 
- /*****************************************************************
-@@ -73,33 +73,31 @@
- {
-   {"SearchPath",    's', feResPath,  NULL,
-    "$SINGULARPATH;"
--   "%b/LIB;"
--   "%b/MOD;"
-+   "%r/share/singular/MOD;"
-    "%r/LIB;"
--   "%r/../LIB;"
-+   "%r/share/singular/LIB;"
-    "%d/LIB;"
--   "%d/../LIB"
-    ""},
--  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",""},
--  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME            ""},
--  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                ""},
-+  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular",""},
-+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin"            ""},
-+  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                ""},
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},
--  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},
--  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},
--  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              ""},
-+  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/share/singular/singular.hlp", ""},
-+  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/share/singular/singular.idx",  ""},
-+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/share/doc/PFSUBST/html",              ""},
- #ifdef ix86_Win
-   {"HtmlHelpFile",   'C',    feResFile,   "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",              ""},
- #endif
-   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    ""},
--  {"ExDir",      'm',   feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",              ""},
-+  {"ExDir",      'm',   feResDir,   "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples",              ""},
-   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
- 
- #ifdef ESINGULAR
-   {"emacs",    'E',    feResBinary, "ESINGULAR_EMACS",      "%b/emacs",              ""},
-   {"xemacs",    'A',    feResBinary, "ESINGULAR_EMACS",      "%b/xemacs",              ""},
-   {"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR",    "%b/Singular",           ""},
--  {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%e/.emacs-singular",             ""},
--  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/emacs",             ""},
-+  {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%r/share/singular/emacs/.emacs-singular",             ""},
-+  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/share/singular/emacs",             ""},
- #elif defined(TSINGULAR)
-   {"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR",    "%b/Singular",           ""},
- #ifdef ix86_Win
-@@ -108,7 +106,7 @@
-   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},
- #endif
- #else
--  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},
-+  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/singular/emacs",             ""},
- #endif
-   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
- };
-diff -Naur Singular-3-0-2/kernel/mod_raw.cc Singular-3-0-2-new/kernel/mod_raw.cc
---- Singular-3-0-2/kernel/mod_raw.cc	2006-07-18 15:35:44.000000000 -0400
-+++ Singular-3-0-2-new/kernel/mod_raw.cc	2006-10-12 22:15:28.000000000 -0400
-@@ -111,11 +111,11 @@
- void* dynl_open_binary_warn(char* binary_name, const char* msg)
- {
-   void* handle = NULL;
--  const char* bin_dir = feGetResource('b');
-+  const char* bin_dir = feGetResource('r');
-   if (bin_dir != NULL)
-   {
-     char path_name[MAXPATHLEN];
--    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, 
-+    sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name, 
-             DL_TAIL);
-     handle = dynl_open(path_name);
-     if (handle == NULL && ! warn_handle)
diff --git a/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff b/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff
deleted file mode 100644
index aeb556cb1fdf..000000000000
--- a/sci-mathematics/singular/files/singular-3.0.3-gentoo.diff
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -Naur Singular-3-0-3/kernel/feResource.cc Singular-3-0-3.new/kernel/feResource.cc
---- Singular-3-0-3/kernel/feResource.cc	2005-07-27 05:46:19.000000000 -0400
-+++ Singular-3-0-3.new/kernel/feResource.cc	2007-08-04 07:52:22.000000000 -0400
-@@ -41,7 +41,7 @@
- #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
- #endif
- #else // ! defined(MAKE_DISTRIBUTION)
--#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
-+#define SINGULAR_DEFAULT_DIR "/usr"
- #endif // defined(MAKE_DISTRIBUTION)
- 
- /*****************************************************************
-@@ -73,33 +73,31 @@
- {
-   {"SearchPath",    's', feResPath,  NULL,
-    "$SINGULARPATH;"
--   "%b/LIB;"
--   "%b/MOD;"
-+   "%r/share/singular/MOD;"
-    "%r/LIB;"
--   "%r/../LIB;"
-+   "%r/share/singular/LIB;"
-    "%d/LIB;"
--   "%d/../LIB"
-    ""},
--  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",""},
--  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME            ""},
--  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                ""},
-+  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/bin/Singular",""},
-+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/bin"            ""},
-+  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%d",                ""},
-   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},
--  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},
--  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},
--  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              ""},
-+  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/share/singular/singular.hlp", ""},
-+  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/share/singular/singular.idx",  ""},
-+  {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/share/doc/PFSUBST/html",              ""},
- #ifdef ix86_Win
-   {"HtmlHelpFile",   'C',    feResFile,   "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",              ""},
- #endif
-   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    ""},
--  {"ExDir",      'm',   feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",              ""},
-+  {"ExDir",      'm',   feResDir,   "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples",              ""},
-   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
- 
- #ifdef ESINGULAR
-   {"emacs",    'E',    feResBinary, "ESINGULAR_EMACS",      "%b/emacs",              ""},
-   {"xemacs",    'A',    feResBinary, "ESINGULAR_EMACS",      "%b/xemacs",              ""},
-   {"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR",    "%b/Singular",           ""},
--  {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%e/.emacs-singular",             ""},
--  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/emacs",             ""},
-+  {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%r/share/singular/emacs/.emacs-singular",             ""},
-+  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/share/singular/emacs",             ""},
- #elif defined(TSINGULAR)
-   {"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR",    "%b/Singular",           ""},
- #ifdef ix86_Win
-@@ -108,7 +106,7 @@
-   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},
- #endif
- #else
--  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},
-+  {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/share/singular/emacs",             ""},
- #endif
-   {NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
- };
-diff -Naur Singular-3-0-3/kernel/mod_raw.cc Singular-3-0-3.new/kernel/mod_raw.cc
---- Singular-3-0-3/kernel/mod_raw.cc	2007-03-17 12:38:42.000000000 -0400
-+++ Singular-3-0-3.new/kernel/mod_raw.cc	2007-08-04 07:52:22.000000000 -0400
-@@ -111,11 +111,11 @@
- void* dynl_open_binary_warn(char* binary_name, const char* msg)
- {
-   void* handle = NULL;
--  const char* bin_dir = feGetResource('b');
-+  const char* bin_dir = feGetResource('r');
-   if (bin_dir != NULL)
-   {
-     char path_name[MAXPATHLEN];
--    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, 
-+    sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name, 
-             DL_TAIL);
-     handle = dynl_open(path_name);
-     if (handle == NULL && ! warn_handle)
diff --git a/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
new file mode 100644
index 000000000000..5884b6cd2d60
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-3.0.4.4-nostrip.patch
@@ -0,0 +1,12 @@
+diff -Naur Singular-3-0-4/IntegerProgramming/Makefile.in Singular-3-0-4.new/IntegerProgramming/Makefile.in
+--- Singular-3-0-4/IntegerProgramming/Makefile.in	2008-07-09 07:55:13.000000000 -0400
++++ Singular-3-0-4.new/IntegerProgramming/Makefile.in	2008-10-19 22:40:41.000000000 -0400
+@@ -21,7 +21,7 @@
+ endif
+ 
+ INSTALL		= @INSTALL@
+-INSTALL_PROGRAM	= @INSTALL_PROGRAM@  -s
++INSTALL_PROGRAM	= @INSTALL_PROGRAM@ 
+ MKINSTALLDIRS   = ../mkinstalldirs
+ 
+ ##
diff --git a/sci-mathematics/singular/singular-3.0.2.1.ebuild b/sci-mathematics/singular/singular-3.0.2.1.ebuild
deleted file mode 100644
index a4c1ed82001b..000000000000
--- a/sci-mathematics/singular/singular-3.0.2.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.2.1.ebuild,v 1.4 2007/08/05 17:20:48 markusle Exp $
-
-inherit eutils flag-o-matic autotools multilib
-
-PV_MAJOR=${PV%.*}
-MY_PV=${PV//./-}
-MY_PN=${PN/s/S}
-MY_PV_MAJOR=${MY_PV%-*}
-
-DESCRIPTION="Computer algebra system for polynomial computations"
-HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$MY_PV_MAJOR/${MY_PN}-${MY_PV}.tar.gz
-	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-${MY_PV_MAJOR}-share.tar.gz"
-
-LICENSE="singular"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc emacs boost"
-
-DEPEND=">=dev-lang/perl-5.6
-		>=dev-libs/gmp-4.1-r1
-		emacs? ( || ( virtual/xemacs
-					virtual/emacs ) )
-		boost? ( dev-libs/boost )"
-
-S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
-
-src_unpack () {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-${PV_MAJOR}-gentoo.diff
-
-	cd "${S}"/kernel
-	sed -e "s/PFSUBST/${PF}/" -i feResource.cc || \
-		die "sed failed on feResource.cc"
-
-	cd "${S}"/Singular
-	if ! use boost; then
-		sed -e "s/AC_CHECK_HEADERS(boost/#AC_CHECK_HEADERS(boost/" \
-			-i configure.in || \
-			die "failed to fix detection of boost headers"
-	else
-		# -no-exceptions and boost don't play well
-		sed -e "/CXXFLAGS/ s/--no-exceptions//g" \
-			-i configure.in || \
-			die "sed failed on configure"
-	fi
-	eautoconf
-}
-
-src_compile() {
-	local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --with-gmp --prefix=${S}"
-	econf $(use_enable emacs) \
-		${myconf} || die "econf failed"
-	emake -j1 || die "make failed"
-}
-
-src_install () {
-	# install basic docs
-	cd "${S}" && dodoc BUGS ChangeLog || \
-		die "failed to install docs"
-
-	# install data files
-	insinto /usr/share/${PN}/LIB
-	cd "${S}"/${MY_PN}/LIB && doins *.lib COPYING help.cnf || \
-		die "failed to install lib files"
-	insinto /usr/share/${PN}/LIB/gftables
-	cd gftables && doins * \
-		|| die "failed to install files int LIB/gftables"
-
-	cd "${S}"/*-Linux
-
-	# install binaries
-	rm ${MY_PN} || die "failed to remove ${MY_PN}"
-	dobin ${MY_PN}* gen_test change_cost solve_IP \
-		toric_ideal LLL || die "failed to install binaries"
-
-	if use emacs; then
-		dobin E${MY_PN} || die "failed to install ESingular"
-	fi
-
-	# install libraries
-	insinto /usr/$(get_libdir)/${PN}
-	doins *.so || die "failed to install libraries"
-
-	# create symbolic link
-	dosym /usr/bin/${MY_PN}-${MY_PV_MAJOR} /usr/bin/${MY_PN} || \
-		die "failed to create symbolic link"
-
-	# install examples
-	cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}
-	insinto /usr/share/${PN}/examples
-	doins examples/* || die "failed to install examples"
-
-	# install extended docs
-	if use doc; then
-		dohtml -r html/* || die "failed to install html docs"
-
-		cp info/${PN}.hlp info/${PN}.info &&
-		doinfo info/${PN}.info || \
-		die "failed to install info files"
-	fi
-
-	# install emacs specific stuff
-	if use emacs; then
-		insinto /usr/share/${PN}/emacs
-		doins emacs/* && doins emacs/.emacs* || \
-		die "failed to set up emacs files"
-	fi
-}
-
-pkg_postinst() {
-	einfo "The authors ask you to register as a SINGULAR user."
-	einfo "Please check the license file for details."
-}
diff --git a/sci-mathematics/singular/singular-3.0.3.ebuild b/sci-mathematics/singular/singular-3.0.4.4.ebuild
index fe58e927565f..07a88c8ed509 100644
--- a/sci-mathematics/singular/singular-3.0.3.ebuild
+++ b/sci-mathematics/singular/singular-3.0.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.3.ebuild,v 1.3 2007/09/25 12:26:50 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/singular/singular-3.0.4.4.ebuild,v 1.1 2008/10/20 12:30:00 markusle Exp $
 
 inherit eutils elisp-common flag-o-matic autotools multilib
 
@@ -11,8 +11,8 @@ MY_PV_MAJOR=${MY_PV%-*}
 
 DESCRIPTION="Computer algebra system for polynomial computations"
 HOMEPAGE="http://www.singular.uni-kl.de/"
-SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-0-3/${MY_PV}/${MY_PN}-${MY_PV}.tar.gz
-	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-${MY_PV}-share.tar.gz"
+SRC_URI="http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-0-4/${MY_PN}-${MY_PV}.tar.gz
+	http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/UNIX/${MY_PN}-3-0-4-2-share.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,12 +24,19 @@ DEPEND=">=dev-lang/perl-5.6
 		emacs? ( virtual/emacs )
 		boost? ( dev-libs/boost )"
 
-S="${WORKDIR}"/${MY_PN}-${MY_PV}
+S="${WORKDIR}"/${MY_PN}-${MY_PV_MAJOR}
 SITEFILE=60${PN}-gentoo.el
 
 src_unpack () {
 	unpack ${A}
-	epatch "${FILESDIR}"/${P}-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0.4.2-gentoo.diff
+	epatch "${FILESDIR}"/${P}-nostrip.patch
+
+	# for some unknown reason this ldflag causes the
+	# build system to choke
+	# NOTE: Look at the source and figure out why
+	filter-ldflags "*hash-style*"
 
 	cd "${S}"/kernel
 	sed -e "s/PFSUBST/${PF}/" -i feResource.cc || \
@@ -50,13 +57,13 @@ src_unpack () {
 }
 
 src_compile() {
-	local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --with-gmp --prefix=${S}"
+	local myconf="${myconf} --disable-doc --without-MP --with-factory --with-libfac --disable-gmp --prefix=${S}"
 	econf $(use_enable emacs) \
 		${myconf} || die "econf failed"
 	emake -j1 || die "make failed"
 
 	if use emacs; then
-		cd "${WORKDIR}"/${MY_PN}/${MY_PV}/emacs/
+		cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}/emacs/
 		elisp-compile *.el || die "elisp-compile failed"
 	fi
 }
@@ -86,11 +93,11 @@ src_install () {
 	doins *.so || die "failed to install libraries"
 
 	# create symbolic link
-	dosym /usr/bin/${MY_PN}-${MY_PV} /usr/bin/${MY_PN} || \
+	dosym /usr/bin/${MY_PN}-${MY_PV_MAJOR} /usr/bin/${MY_PN} || \
 		die "failed to create symbolic link"
 
 	# install examples
-	cd "${WORKDIR}"/${MY_PN}/${MY_PV}
+	cd "${WORKDIR}"/${MY_PN}/${MY_PV_MAJOR}
 	insinto /usr/share/${PN}/examples
 	doins examples/* || die "failed to install examples"
 
@@ -98,6 +105,9 @@ src_install () {
 	if use doc; then
 		dohtml -r html/* || die "failed to install html docs"
 
+		insinto /usr/share/${PN}
+		doins doc/singular.idx || die "failed to install idx file"
+
 		cp info/${PN}.hlp info/${PN}.info &&
 		doinfo info/${PN}.info || \
 		die "failed to install info files"