old, qa

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 13 insertions, 94 deletions

diff --git a/media-libs/jpgalleg/Manifest b/media-libs/jpgalleg/Manifest
index 332dc72f68ce..046bb31a36b4 100644
--- a/media-libs/jpgalleg/Manifest
+++ b/media-libs/jpgalleg/Manifest
@@ -1,17 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST jpgal11b.zip 1378 RMD160 f0475c3d418a97fb9c6e4dc8f32455ba70aafed8 SHA1 e22f94162f978668a718c47dec5b760f38a704d8 SHA256 7897ef1da80f4c916d8d906ed2359a4f794f890a09db9521b1f5e8d6017e5e94
 DIST jpgalleg-2.5.tar.gz 232648 RMD160 b840d1e6c39bbe0ba3445ac31ced94e479ad5f81 SHA1 00efe8f8921ca03ceac5513bb0c864bfc1f42de8 SHA256 5946b58f6da1a2f5ce907b25c8550d4db7f8aaf2614203278a3a1becc0daffcf
-DIST jpgalleg.zip 247782 RMD160 d2139388c43bea62fb927ba5622862f94fcffcf4 SHA1 efbb3e71b455325ab432d5ad5160ab9974385e74 SHA256 b0edd7591f89a4a1afe875edda4aa9e643897ae1523b39d285fc6f8b9b15d711
-EBUILD jpgalleg-1.1-r1.ebuild 1269 RMD160 c8f5b2d793c518fd59095d10611989c0a71a3ad8 SHA1 f7931c161aa2bcd76124a84995d16ccc2ae89f49 SHA256 c190382b9c601a5ae59bb8c5713a979f0f519bb17152f255e0ef74ebbf399440
-EBUILD jpgalleg-2.5.ebuild 912 RMD160 dcc0b46a79279334cd2e2ab3ca367fabbf43faa7 SHA1 ce5bdc62ab5cd41fdbb22689ec2edf16ac5e259c SHA256 4cf57af6cd3e9479cb20caebd3f8bf7822b5633cecd5232e84f87cdca5131dd4
+EBUILD jpgalleg-2.5.ebuild 795 RMD160 04719075bb5b17d921d698e5f9230d7c9105f373 SHA1 f422b7c96353ec2d424b0b0c2b952ede303e5af9 SHA256 5ad3f612cdbf585b23e46a358c7eaf11adb9cb0cc069a204acd9720dbc392102
 MISC ChangeLog 940 RMD160 23dfceda58853ccba9cd11f3ac7eca092bf710f1 SHA1 09a672cd438d9b2bb36a60a16cee62abe0f11574 SHA256 7163a6312cfee3fdceb98bffb9bde10c753b3cf7a70436adb7d16dd12e9b3ac7
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq428MACgkQkKaRLQcq0GLYMgCgixlpxmK3AkNxqpK+4sx3JNfA
-rBoAn2i3VcL7qej7ekMzlmlRY9t7AkpF
-=0AOl
------END PGP SIGNATURE-----
diff --git a/media-libs/jpgalleg/jpgalleg-1.1-r1.ebuild b/media-libs/jpgalleg/jpgalleg-1.1-r1.ebuild
deleted file mode 100644
index fc99f46e6a46..000000000000
--- a/media-libs/jpgalleg/jpgalleg-1.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpgalleg/jpgalleg-1.1-r1.ebuild,v 1.5 2004/06/24 23:04:21 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="The jpeg loading routines are able to load almost any JPG image file with Allegro."
-HOMEPAGE="http://orbflux.com/jpgalleg/"
-SRC_URI="http://orbflux.com/jpgalleg/${PN}.zip
-	http://www.dribin.org/dave/game_launcher/jpgal11b.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/allegro-4.0.0
-	>=app-arch/unzip-5.50
-	>=sys-apps/sed-4"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e 's:jpgal11b/::' jpgal11b.pat || \
-		die "sed jpgal11b.pat failed"
-
-	edos2unix jpgal11b.pat
-
-	epatch jpgal11b.pat || die
-
-	sed -i \
-		-e 's:allegro/aintern.h:allegro/internal/aintern.h:' jpeg.c || \
-		die "sed jpeg.c failed"
-
-	sed -i \
-		-e "s/-O3/${CFLAGS}/" makefile.dj || \
-		die "sed makefile.dj failed"
-}
-
-src_compile() {
-	emake -f makefile.dj libjpgal.a || die "emake failed"
-}
-
-src_install() {
-	cd ${S}/
-
-	insinto /usr/include
-	doins jpgalleg.h
-
-	insinto /usr/lib
-	doins libjpgal.a
-
-	dodoc README
-
-	insinto /usr/share/doc/${P}/examples
-	doins *.jpg ex*.c jpeg{data,demo}* makefile*
-}
diff --git a/media-libs/jpgalleg/jpgalleg-2.5.ebuild b/media-libs/jpgalleg/jpgalleg-2.5.ebuild
index c7dbba426af8..ce649fe49672 100644
--- a/media-libs/jpgalleg/jpgalleg-2.5.ebuild
+++ b/media-libs/jpgalleg/jpgalleg-2.5.ebuild
@@ -1,41 +1,33 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpgalleg/jpgalleg-2.5.ebuild,v 1.2 2009/09/22 14:13:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpgalleg/jpgalleg-2.5.ebuild,v 1.3 2009/09/28 12:25:04 ssuominen Exp $
 
-inherit eutils
-
-DESCRIPTION="The jpeg loading routines are able to load almost any JPG image
-file with Allegro."
+DESCRIPTION="The jpeg loading routines are able to load almost any JPG image file with Allegro"
 HOMEPAGE="http://www.ecplusplus.com/index.php?page=projects&pid=1"
-SRC_URI="http://www.ecplusplus.com/files/${PN}-${PV}.tar.gz"
+SRC_URI="http://www.ecplusplus.com/files/${P}.tar.gz"
 
 LICENSE="ZLIB"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=media-libs/allegro-4.0.0"
-S="${WORKDIR}/${PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-}
+RDEPEND=">=media-libs/allegro-4"
+DEPEND="${RDEPEND}"
 
 src_compile() {
 	./fix.sh unix --quick
-	emake || die "emake failed"
+	emake || die
 }
 
 src_install() {
-	mkdir ${D}usr
-	mkdir ${D}usr/include
-	mkdir ${D}usr/lib
+	dodir /usr
+	dodir /usr/include
+	dodir /usr/lib
 
-	emake install INSTALL_BASE_PATH="${D}usr" || die "emake install failed"
+	emake install INSTALL_BASE_PATH="${D}usr" || die
 
 	dodoc readme.txt
 
-	insinto /usr/share/doc/${P}/examples
+	insinto /usr/share/doc/${PF}/examples
 	doins examples/*
 }