fix install paths #103210

(Portage version: 2.0.51.22-r2)

4 files changed, 3 insertions, 56 deletions

diff --git a/media-libs/jpeg-mmx/ChangeLog b/media-libs/jpeg-mmx/ChangeLog
index c5cd4282f668..8674278c7ee0 100644
--- a/media-libs/jpeg-mmx/ChangeLog
+++ b/media-libs/jpeg-mmx/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for media-libs/jpeg-mmx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/ChangeLog,v 1.15 2005/08/21 16:33:45 chainsaw Exp $
-
-  21 Aug 2005; Tony Vroon <chainsaw@gentoo.org> +jpeg-mmx-0.1.6.ebuild:
-  -r1 causes sandbox violation. Putting last working release back in the tree.
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/ChangeLog,v 1.16 2005/08/21 18:09:24 vapier Exp $
 
 *jpeg-mmx-0.1.6-r1 (21 Aug 2005)
 
diff --git a/media-libs/jpeg-mmx/files/digest-jpeg-mmx-0.1.6 b/media-libs/jpeg-mmx/files/digest-jpeg-mmx-0.1.6
deleted file mode 100644
index d8b6cf2f216b..000000000000
--- a/media-libs/jpeg-mmx/files/digest-jpeg-mmx-0.1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9156c429bd8c4dea65c877c50ed89e15 jpeg-mmx-0.1.6.tar.gz 597439
diff --git a/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild b/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild
index 3ea63d4eeba3..04d91183328a 100644
--- a/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild
+++ b/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.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/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild,v 1.1 2005/08/21 04:34:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/jpeg-mmx-0.1.6-r1.ebuild,v 1.2 2005/08/21 18:09:24 vapier Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr/include/jpeg-mmx
-	make install-headers prefix="${D}"/usr || die "headers"
+	make install-headers includedir="${D}"/usr/include/jpeg-mmx || die "headers"
 
 	for x in cjpeg djpeg jpegtran ; do
 		newbin .libs/${x} ${x}-mmx || die "dobin ${x}"
diff --git a/media-libs/jpeg-mmx/jpeg-mmx-0.1.6.ebuild b/media-libs/jpeg-mmx/jpeg-mmx-0.1.6.ebuild
deleted file mode 100644
index 1cea3e6f6730..000000000000
--- a/media-libs/jpeg-mmx/jpeg-mmx-0.1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/jpeg-mmx-0.1.6.ebuild,v 1.4 2005/08/21 16:33:45 chainsaw Exp $
-
-inherit eutils
-
-DESCRIPTION="JPEG library with mmx enhancements"
-HOMEPAGE="http://mjpeg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
-
-DEPEND="dev-lang/nasm"
-RDEPEND=""
-
-S=${WORKDIR}/jpeg-mmx
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-PIC.patch
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	econf \
-		--includedir=/usr/include/jpeg-mmx \
-		--enable-shared \
-		--enable-static \
-		|| die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	dodir /usr/include/jpeg-mmx
-	make install-headers prefix="${D}"/usr || die "headers"
-
-	for x in cjpeg djpeg jpegtran ; do
-		newbin .libs/${x} ${x}-mmx || die "dobin ${x}"
-	done
-
-	dolib.a .libs/libjpeg-mmx.a || die "dolib.a"
-	cp -a .libs/libjpeg-mmx.so* libjpeg-mmx.la "${D}"/usr/lib/ || die "dolib.so"
-
-	dodoc README change.log structure.doc libjpeg.doc
-}