diff options
| -rw-r--r-- | app-arch/rpm/rpm-4.0.4-r5.ebuild | 8 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.2.1.ebuild | 15 | ||||
| -rw-r--r-- | app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild | 52 |
3 files changed, 29 insertions, 46 deletions
diff --git a/app-arch/rpm/rpm-4.0.4-r5.ebuild b/app-arch/rpm/rpm-4.0.4-r5.ebuild index 4c99a081f69a..162471cef9f3 100644 --- a/app-arch/rpm/rpm-4.0.4-r5.ebuild +++ b/app-arch/rpm/rpm-4.0.4-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.8 2003/11/29 23:23:21 brad_mssw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.0.4-r5.ebuild,v 1.9 2004/01/25 23:50:12 vapier Exp $ inherit flag-o-matic eutils @@ -21,10 +21,6 @@ RDEPEND="=sys-libs/db-3.2* DEPEND="${RDEPEND} sys-devel/gettext" -filter-flags -fPIC - -export WANT_AUTOCONF_2_1=1 - src_unpack() { unpack ${A} cd ${S} @@ -36,6 +32,8 @@ src_unpack() { } src_compile() { + filter-flags -fPIC + export WANT_AUTOCONF=2.1 econf `use_enable nls` || die make || die } diff --git a/app-arch/rpm/rpm-4.2.1.ebuild b/app-arch/rpm/rpm-4.2.1.ebuild index 8f6fd058cc7d..87efe432dc95 100644 --- a/app-arch/rpm/rpm-4.2.1.ebuild +++ b/app-arch/rpm/rpm-4.2.1.ebuild @@ -1,16 +1,18 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.10 2004/01/25 12:38:02 liquidx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.2.1.ebuild,v 1.11 2004/01/25 23:50:12 vapier Exp $ inherit python flag-o-matic libtool eutils DESCRIPTION="Red Hat Package Management Utils" -SRC_URI="mirror://gentoo/rpm-4.2.1.tar.gz" HOMEPAGE="http://www.rpm.org/" -SLOT="0" +SRC_URI="mirror://gentoo/rpm-4.2.1.tar.gz" + LICENSE="GPL-2 LGPL-2" +SLOT="0" KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~amd64 ia64" IUSE="nls python doc" + RDEPEND="=sys-libs/db-3.2* >=sys-libs/zlib-1.1.3 >=app-arch/bzip2-1.0.1 @@ -22,20 +24,19 @@ RDEPEND="=sys-libs/db-3.2* python? ( >=dev-lang/python-2.2 ) !ia64? ( doc? ( app-doc/doxygen ) )" -strip-flags - src_unpack() { unpack ${A} epatch ${FILESDIR}/rpm-4.2-python2.3.diff } src_compile() { + strip-flags elibtoolize unset LD_ASSUME_KERNEL local myconf myconf="--enable-posixmutexes --without-javaglue" - + python_version use python \ && myconf="${myconf} --with-python=${PYVER}" \ @@ -83,7 +84,7 @@ pkg_postinst() { einfo "No RPM database found... Creating database..." ${ROOT}/usr/bin/rpm --initdb --root=${ROOT} fi - + python_version python_mod_optimize /usr/lib/python${PYVER}/site-packages/rpmdb } diff --git a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild index 06138feda723..edcbda89b153 100644 --- a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild +++ b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild @@ -1,20 +1,19 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.14 2003/11/29 05:08:22 brad_mssw Exp $ - -IUSE="nls esd gnome oss oggvorbis" +# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.15 2004/01/25 23:54:44 vapier Exp $ # Fix so that updating can only be done by 'cp old.ebuild new.ebuild' -MY_P="`echo ${P} |sed -e 's:-::' -e 's:_b:B:'`" -S=${WORKDIR}/${PN} +MY_P="${P/-} +MY_P="${MY_P/_b/B} DESCRIPTION="GTK+ Frontend for cdrecord" -SRC_URI="http://gnometoaster.rulez.org/archive/${MY_P}.tgz" HOMEPAGE="http://gnometoaster.rulez.org/" +SRC_URI="http://gnometoaster.rulez.org/archive/${MY_P}.tgz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="x86 ppc sparc amd64" +IUSE="nls esd gnome oss oggvorbis" DEPEND="=x11-libs/gtk+-1.2* gnome? ( >=gnome-base/gnome-libs-1.4.1.2 ) @@ -30,6 +29,8 @@ RDEPEND="=x11-libs/gtk+-1.2* oggvorbis? ( >=media-sound/vorbis-tools-1.0_rc2 >=media-sound/oggtst-0.0 )" +S=${WORKDIR}/${PN} + src_unpack() { unpack ${A} ; cd ${S} epatch ${FILESDIR}/scdtosr.diff @@ -37,50 +38,33 @@ src_unpack() { } src_compile() { - local myconf="" - - use nls || myconf="$myconf --disable-nls" - - use gnome \ - && myconf="$myconf --with-gnome --with-orbit" \ - || myconf="$myconf --without-gnome --without-orbit" - - use esd \ - && myconf="$myconf --with-esd" \ - || myconf="$myconf --without-esd" - - use oss \ - && myconf="$myconf --with-oss" \ - || myconf="$myconf --without-oss" - touch configure touch `find . -name \*.m4` touch `find . -name \*.in` + export WANT_AUTOCONF=2.5 + export WANT_AUTOMAKE=1.6 if [ "${ARCH}" = "amd64" ] then - export WANT_AUTOCONF_2_5=1 - export WANT_AUTOMAKE_1_6=1 - cd ${S} libtoolize -c -f aclocal autoheader automake -a -c autoconf - else - export WANT_AUTOCONF_2_5=1 - export WANT_AUTOMAKE_1_6=1 - fi - - econf ${myconf} - + econf \ + `use_enable nls` \ + `use_with gnome` \ + `use_with gnome orbit` \ + `use_with esd` \ + `use_with oss` \ + || die emake || die "parallel make failed" } src_install() { - einstall + einstall || die dodoc ABOUT-NLS AUTHORS ChangeLog* COPYING INSTALL NEWS README TODO # Install icon and .desktop for menu entry |