Fixing up syntax and adding metadata for bug #48311

5 files changed, 36 insertions, 17 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 710a1af64caf..e289bad033aa 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.31 2004/04/17 23:02:17 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.32 2004/05/01 01:36:15 cyfred Exp $
+
+  01 May 2004; Andrew Bevitt <cyfred@gentoo.org>; +metadata.xml,
+  fltk-1.1.4.ebuild:
+  Fixing up ebuild syntax and adding metadata see bug #48311
 
   17 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> fltk-1.0.11-r3.ebuild:
   Removed S=
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 8b3a066d1f6d..376fa7bea9f5 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,6 +1,6 @@
 MD5 0e1b2b595b371750975973b6ac78f02e fltk-1.1.2-r2.ebuild 1965
 MD5 87bdd13d52ffb8018232640e3885ea76 fltk-1.0.11-r3.ebuild 1197
-MD5 fc5b4c77d931abd03eb0d3e2596b1ee6 fltk-1.1.4.ebuild 1968
+MD5 c41ca097ef432c64829fff06ba7d37ac fltk-1.1.4.ebuild 1982
 MD5 1f6cd63bb2b3b6be58bc412106a38c25 ChangeLog 5478
 MD5 d8bcde3e8eb3edad07403bd5cdc633e3 files/libs.diff 830
 MD5 66e9fc032d679befebde2ff1709eaa21 files/digest-fltk-1.0.11-r3 71
diff --git a/x11-libs/fltk/fltk-1.1.2-r2.ebuild b/x11-libs/fltk/fltk-1.1.2-r2.ebuild
index 3e44a67d73b5..bb6faad922dd 100644
--- a/x11-libs/fltk/fltk-1.1.2-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.1.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.2-r2.ebuild,v 1.3 2003/09/08 03:13:46 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.2-r2.ebuild,v 1.4 2004/05/01 01:36:15 cyfred Exp $
 
 inherit eutils
 
diff --git a/x11-libs/fltk/fltk-1.1.4.ebuild b/x11-libs/fltk/fltk-1.1.4.ebuild
index 3fd914122e1d..021cdb62840a 100644
--- a/x11-libs/fltk/fltk-1.1.4.ebuild
+++ b/x11-libs/fltk/fltk-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4.ebuild,v 1.4 2004/03/05 14:57:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.4.ebuild,v 1.5 2004/05/01 01:36:15 cyfred Exp $
 
 IUSE="opengl debug nptl"
 
@@ -8,20 +8,25 @@ inherit eutils
 
 DESCRIPTION="C++ user interface toolkit for X and OpenGL."
 HOMEPAGE="http://www.fltk.org"
-SRC_URI="ftp://ftp.easysw.com/pub/fltk/${PV/_/}/${P/_/}-source.tar.bz2"
+SRC_URI="ftp://ftp.easysw.com/pub/fltk/${PV}/${P}-source.tar.bz2"
 
-SLOT="1.1"
 KEYWORDS="x86 ~ppc sparc ~alpha amd64"
 LICENSE="FLTK | GPL-2"
 
+PV_MAJOR=${PV/.*/}
+PV_MINOR=${PV#${PV_MAJOR}.}
+PV_MINOR=${PV_MINOR/.*}
+SLOT="${PV_MAJOR}.${PV_MINOR}"
+
+INCDIR=/usr/include/fltk-${SLOT}
+LIBDIR=/usr/lib/fltk-${SLOT}
+
 DEPEND="virtual/x11
 	virtual/xft
 	media-libs/libpng
 	media-libs/jpeg
 	opengl? ( virtual/opengl )"
 
-S=${WORKDIR}/${P/_/}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -52,8 +57,8 @@ src_compile() {
 	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
 
 	econf \
-		--includedir=/usr/include/fltk-1.1 \
-		--libdir=/usr/lib/fltk-1.1 \
+		--includedir=${INCDIR}\
+		--libdir=${LIBDIR} \
 		${myconf} || die "Configuration Failed"
 
 	emake || die "Parallel Make Failed"
@@ -61,18 +66,19 @@ src_compile() {
 
 src_install() {
 	einstall \
-		includedir=${D}/usr/include/fltk-1.1 \
-		libdir=${D}/usr/lib/fltk-1.1 || die "Installation Failed"
+		includedir=${D}${INCDIR} \
+		libdir=${D}${LIBDIR} || die "Installation Failed"
 
-	ranlib ${D}/usr/lib/fltk-1.1/*.a
+	ranlib ${D}${LIBDIR}/*.a
 
 	dodoc CHANGES COPYING README
 
-	echo "LDPATH=/usr/lib/fltk-1.1" > 99fltk-1.1
+	echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
 
 	insinto /etc/env.d
-	doins 99fltk-1.1
+	doins 99fltk-${SLOT}
 
 	dodir /usr/share/doc/${P}/html
-	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/fltk/* ${D}/usr/share/doc/${PF}/html
+	rmdir ${D}/usr/share/doc/fltk
 }
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
new file mode 100644
index 000000000000..0bf23998bd0f
--- /dev/null
+++ b/x11-libs/fltk/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+  <email>desktop-misc@gentoo.org</email>
+</maintainer>
+<longdescription>C++ user interface toolkit for X and OpenGL.</longdescription> 
+</pkgmetadata>