Version Bump, respecting CC

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

5 files changed, 332 insertions, 5 deletions

diff --git a/app-editors/mp/ChangeLog b/app-editors/mp/ChangeLog
index 207703574f1e..d36d06b3cd7f 100644
--- a/app-editors/mp/ChangeLog
+++ b/app-editors/mp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/mp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.72 2010/06/20 16:18:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/ChangeLog,v 1.73 2010/07/05 16:40:17 jlec Exp $
+
+*mp-5.1.3 (05 Jul 2010)
+
+  05 Jul 2010; Justin Lecher <jlec@gentoo.org> mp-5.1.1.ebuild,
+  +mp-5.1.3.ebuild, +files/mp-5.1.3-asneeded.patch:
+  Version BUmp, respecting CC
 
   20 Jun 2010; Markos Chandras <hwoarang@gentoo.org> mp-5.1.1.ebuild,
   +files/mp-5.1.1-asneeded.patch:
diff --git a/app-editors/mp/Manifest b/app-editors/mp/Manifest
index 6767c070e9b4..9f1bac507673 100644
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mp-5.1.1-asneeded.patch 7946 RMD160 41cbf06311efdfed99aec9dd6b94bd5fbe89eb85 SHA1 5ae8e4a4b28eb6f09adb4b199d6597db1aeb15a2 SHA256 7c045cf8ae121b819e0866c60dad304f5fed12eb28905b056aa5012fb1dc5140
+AUX mp-5.1.3-asneeded.patch 6953 RMD160 6935d9a0e82b9b12195fc6a30071fd149edf26c9 SHA1 b4299b9e0a0bae33761fd53113e5878b647b3bd8 SHA256 fccb6533b7c23b5691063f245398ad50982a587f09f0c916908fda5baa865c6f
 DIST mp-3.3.18b.tar.gz 295661 RMD160 37b52db182035243504cd49acd4ee5dc2668e744 SHA1 5233b6481e654c8a096412ba9dacc7ae7de5900f SHA256 dabe00cbe8f0cb18a42c46242659265507b73c6862030dd63a22ed26738f9649
 DIST mp-5.1.1.tar.gz 426154 RMD160 7a50eddd997f51baeaafb79d65fc1b0137d274e1 SHA1 75fa481518be29f63ef35b152ab18acb3bd445d2 SHA256 1357a22e11cb2b1a44081cdd43c402489169b6d98aec4f736f2e7fc7be1615ee
+DIST mp-5.1.3.tar.gz 486068 RMD160 f78bfa5986ce3c0e7d5070783ee60a2d03ddea88 SHA1 f05b760b09126fe624703b5d9d4c280803a0c313 SHA256 b9c2773408638eeddfa0eef912cc289b0b92df34ce621dc46eca47a2dc518986
 EBUILD mp-3.3.18b.ebuild 1574 RMD160 5b09b5a40af8d25c2344a02b363c5cae3430daca SHA1 f3c29c7c4eb23c6e41750501d557eef61dbc1834 SHA256 a7e6a7b3ae9d5b7cd52ff43da2b54acf257794a79747705ac95b753d14aad0d3
-EBUILD mp-5.1.1.ebuild 1863 RMD160 bec1bfc9132289bddccb41eb6ef23cf7b1d9423d SHA1 ee94e1cca66eaeb64384b98fc76cb261c68b6435 SHA256 45ebbec0028d9a6d721284ab7507bd3fc35318f0fe35a6f5d137a0f69cd9d774
-MISC ChangeLog 8871 RMD160 ca1764ff9b98a6113beb06f367687096195cdbd3 SHA1 cba91b9171bfb9139849730861e9d214d78058fa SHA256 91bb56fab7580bf32e5a1df674a10139e650bf5d356fb4f37ab2f397e2b6fec3
+EBUILD mp-5.1.1.ebuild 1889 RMD160 a18a0b0967ad11b69f8eb765dd2aeca374fac3ae SHA1 df975d51f5c17503e546ab02ddb5c749eaa8f0b5 SHA256 adc14dd7983e4d4a547c1a9b7ff559dbafb6fae63864dc30a7b8eca2eb7bfcf9
+EBUILD mp-5.1.3.ebuild 1993 RMD160 a479255bf8bf5fa2e7e8187eff028312b5709a13 SHA1 7744fa3569616eae170db5ecda550c03d9a1b6cc SHA256 c60cf6f7fa733309c587db2d012b60dac71c020a6575bdc3525da06bedd15fb7
+MISC ChangeLog 9039 RMD160 629d902553fc3402b7a1bd99a674be32d13c2c58 SHA1 0f04d2f99680d69736c7359899b779ce7423c363 SHA256 aaf2421d257b4a7dbef76aa9fbc94b5895e479bc649de346655fd7c6f5cab4c6
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwyCvcACgkQgAnW8HDreRaKRgCfYoETsOUDCvAxM2zqSSbAG2Zt
+ZSQAn2n7+13t1Z1eRwXLsxTrcuGvDvPa
+=LAAt
+-----END PGP SIGNATURE-----
diff --git a/app-editors/mp/files/mp-5.1.3-asneeded.patch b/app-editors/mp/files/mp-5.1.3-asneeded.patch
new file mode 100644
index 000000000000..7f60c2719023
--- /dev/null
+++ b/app-editors/mp/files/mp-5.1.3-asneeded.patch
@@ -0,0 +1,227 @@
+diff --git a/config.sh b/config.sh
+index 17ade83..643b07e 100755
+--- a/config.sh
++++ b/config.sh
+@@ -80,7 +80,7 @@ echo "Configuring..."
+ 
+ echo "/* automatically created by config.sh - do not modify */" > config.h
+ echo "# automatically created by config.sh - do not modify" > makefile.opts
+-> config.ldflags
++> config.libs
+ > config.cflags
+ > .config.log
+ 
+@@ -134,7 +134,7 @@ done
+ 
+ if [ "$MPDM" != "NOTFOUND" ] ; then
+ 	echo "-I$MPDM" >> config.cflags
+-	echo "-L$MPDM -lmpdm" >> config.ldflags
++	echo "-L$MPDM -lmpdm" >> config.libs
+ 	echo "OK ($MPDM)"
+ else
+ 	echo "No"
+@@ -146,7 +146,7 @@ if [ ! -f $MPDM/Makefile ] ; then
+ 	( echo ; cd $MPDM ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
+ fi
+ 
+-cat $MPDM/config.ldflags >> config.ldflags
++cat $MPDM/config.libs >> config.libs
+ echo "MPDM=$MPDM" >> makefile.opts
+ 
+ # MPSL
+@@ -160,7 +160,7 @@ done
+ 
+ if [ "$MPSL" != "NOTFOUND" ] ; then
+ 	echo "-I$MPSL" >> config.cflags
+-	echo "-L$MPSL -lmpsl" >> config.ldflags
++	echo "-L$MPSL -lmpsl" >> config.libs
+ 	echo "OK ($MPSL)"
+ else
+ 	echo "No"
+@@ -172,7 +172,7 @@ if [ ! -f $MPSL/Makefile ] ; then
+ 	( echo ; cd $MPSL ; ./config.sh --prefix=$PREFIX --docdir=$PREFIX/share/doc/$APPNAME $CONF_ARGS ; echo )
+ fi
+ 
+-cat $MPSL/config.ldflags >> config.ldflags
++cat $MPSL/config.libs >> config.libs
+ echo "MPSL=$MPSL" >> makefile.opts
+ 
+ # Win32
+@@ -184,7 +184,7 @@ else
+ 	grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null
+ 
+ 	if [ $? = 0 ] ; then
+-		echo "-mwindows -lcomctl32" >> config.ldflags
++		echo "-mwindows -lcomctl32" >> config.libs
+ 		echo "#define CONFOPT_WIN32 1" >> config.h
+ 		echo "OK"
+ 		DRIVERS="win32 $DRIVERS"
+@@ -279,7 +279,7 @@ else
+ 
+ 		if [ $? = 0 ] ; then
+ 			echo $TMP_CFLAGS >> config.cflags
+-			echo $TMP_LDFLAGS >> config.ldflags
++			echo $TMP_LDFLAGS >> config.libs
+ 
+ 			echo "#define CONFOPT_KDE4 1" >> config.h
+ 			echo "OK"
+@@ -357,7 +357,7 @@ else
+ 	if [ $? = 0 ] ; then
+ 		echo "#define CONFOPT_GTK 2" >> config.h
+ 		echo "$TMP_CFLAGS " >> config.cflags
+-		echo "$TMP_LDFLAGS " >> config.ldflags
++		echo "$TMP_LDFLAGS " >> config.libs
+ 		echo "OK (2.0)"
+ 		DRIVERS="gtk $DRIVERS"
+ 		DRV_OBJS="mpv_gtk.o $DRV_OBJS"
+diff --git a/makefile.in b/makefile.in
+index 704eb57..5714f62 100644
+--- a/makefile.in
++++ b/makefile.in
+@@ -36,7 +36,7 @@ dep:
+ 	gcc -MM *.c `cat config.cflags` > makefile.depend
+ 
+ $(APPNAME): $(OBJS) $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
+-	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` -o $@
++	$(CCLINK) $(CFLAGS) $(OBJS) `cat config.ldflags` `cat config.libs` -o $@
+ 
+ mpv_kde4.o: mpv_kde4.cpp mpv_kde4.moc
+ 	$(CPP) $(CFLAGS) -I. `cat config.cflags` -c $<
+@@ -54,7 +54,7 @@ mp_res.o: mp_res.rc
+ 	$(WINDRES) mp_res.rc mp_res.o
+ 
+ mp-5.exe: $(OBJS) mp_res.o $(MPDM)/libmpdm.a $(MPSL)/libmpsl.a
+-	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` -o $@
++	$(CC) $(CFLAGS) $(OBJS) mp_res.o `cat config.ldflags` `cat config.libs` -o $@
+ 
+ clean:
+ 	rm -f $(APPNAME) $(LIB) $(OBJS) *.o *.moc tags *.tar.gz *.exe *.zip .installer.c *.1
+@@ -62,7 +62,7 @@ clean:
+ 	(cd $(MPSL) ; make clean)
+ 
+ distclean: clean
+-	rm -f config.h config.cflags config.ldflags \
++	rm -f config.h config.cflags config.ldflags config.libs \
+ 		makefile.opts Makefile po/minimum-profit.pot
+ 
+ docsclean:
+diff --git a/mpdm/config.sh b/mpdm/config.sh
+index 9e4f2f8..16033d3 100755
+--- a/mpdm/config.sh
++++ b/mpdm/config.sh
+@@ -70,7 +70,7 @@ echo "Configuring MPDM..."
+ 
+ echo "/* automatically created by config.sh - do not modify */" > config.h
+ echo "# automatically created by config.sh - do not modify" > makefile.opts
+-> config.ldflags
++> config.libs
+ > config.cflags
+ > .config.log
+ 
+@@ -169,7 +169,7 @@ if [ "$WITH_PCRE" = 1 ] ; then
+ 		echo "OK (using pcre library)"
+ 		echo "#define CONFOPT_PCRE 1" >> config.h
+ 		echo "$TMP_CFLAGS " >> config.cflags
+-		echo "$TMP_LDFLAGS " >> config.ldflags
++		echo "$TMP_LDFLAGS " >> config.libs
+ 		REGEX_YET=1
+ 	fi
+ fi
+@@ -316,7 +316,7 @@ else
+ 		if [ $? = 0 ] ; then
+ 			echo "OK (libintl needed)"
+ 			echo "#define CONFOPT_GETTEXT 1" >> config.h
+-			echo "$TMP_LDFLAGS" >> config.ldflags
++			echo "$TMP_LDFLAGS" >> config.libs
+ 		else
+ 			echo "No"
+ 		fi
+@@ -349,7 +349,7 @@ else
+ 		if [ $? = 0 ] ; then
+ 			echo "OK (libiconv needed)"
+ 			echo "#define CONFOPT_ICONV 1" >> config.h
+-			echo "$TMP_LDFLAGS" >> config.ldflags
++			echo "$TMP_LDFLAGS" >> config.libs
+ 		else
+ 			echo "No"
+ 		fi
+diff --git a/mpdm/makefile.in b/mpdm/makefile.in
+index 17ee1a0..10c102d 100644
+--- a/mpdm/makefile.in
++++ b/mpdm/makefile.in
+@@ -32,7 +32,7 @@ $(LIB): $(OBJS)
+ 	$(AR) rv $(LIB) $(OBJS)
+ 
+ stress: stress.c $(LIB)
+-	$(CC) $(CFLAGS) `cat config.ldflags` stress.c -L. -lmpdm -o $@
++	$(CC) $(CFLAGS) `cat config.ldflags` `cat config.libs` stress.c -L. -lmpdm -o $@
+ 
+ .SUFFIXES: .txt .html
+ 
+@@ -54,7 +54,7 @@ clean:
+ 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
+ 
+ distclean: clean
+-	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
++	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
+ 
+ realclean: distclean docsclean
+ 
+diff --git a/mpsl/config.sh b/mpsl/config.sh
+index d325412..4f36b06 100755
+--- a/mpsl/config.sh
++++ b/mpsl/config.sh
+@@ -69,7 +69,7 @@ echo "Configuring MPSL..."
+ 
+ echo "/* automatically created by config.sh - do not modify */" > config.h
+ echo "# automatically created by config.sh - do not modify" > makefile.opts
+-> config.ldflags
++> config.libs
+ > config.cflags
+ > .config.log
+ 
+@@ -131,7 +131,7 @@ done
+ 
+ if [ "$MPDM" != "NOTFOUND" ] ; then
+ 	echo "-I$MPDM" >> config.cflags
+-	echo "-L$MPDM -lmpdm" >> config.ldflags
++	echo "-L$MPDM -lmpdm" >> config.libs
+ 	echo "OK ($MPDM)"
+ else
+ 	echo "No"
+@@ -143,7 +143,7 @@ if [ ! -f $MPDM/Makefile ] ; then
+ 	( echo ; cd $MPDM ; ./config.sh $CONF_ARGS ; echo )
+ fi
+ 
+-cat $MPDM/config.ldflags >> config.ldflags
++cat $MPDM/config.libs >> config.libs
+ 
+ # if win32, the interpreter is called mpsl.exe
+ grep CONFOPT_WIN32 ${MPDM}/config.h >/dev/null && TARGET=mpsl.exe
+diff --git a/mpsl/makefile.in b/mpsl/makefile.in
+index 14ed62d..253e278 100644
+--- a/mpsl/makefile.in
++++ b/mpsl/makefile.in
+@@ -49,11 +49,11 @@ $(LIB): $(OBJS)
+ 	$(AR) rv $(LIB) $(OBJS)
+ 
+ $(TARGET): $(LIB) $(MPDM)/libmpdm.a
+-	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` -o $@
++	$(CC) $(CFLAGS) -L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
+ 
+ stress: stress.c $(LIB) $(MPDM)/libmpdm.a
+ 	$(CC) $(CFLAGS) `cat config.cflags` stress.c \
+-		-L. -lmpsl `cat config.ldflags` -o $@
++		-L. -lmpsl `cat config.ldflags` `cat config.libs` -o $@
+ 
+ clean:
+ 	rm -f $(TARGET) $(LIB) $(OBJS) *.o tags *.tar.gz stress
+@@ -62,7 +62,7 @@ realclean: clean
+ 	rm -f y.tab.c y.tab.h lex.yy.c
+ 
+ distclean: clean y.tab.c y.tab.h lex.yy.c
+-	rm -f config.h config.cflags config.ldflags makefile.opts .config.log Makefile
++	rm -f config.h config.cflags config.ldflags config.libs makefile.opts .config.log Makefile
+ 
+ realclean: distclean docsclean
+ 
diff --git a/app-editors/mp/mp-5.1.1.ebuild b/app-editors/mp/mp-5.1.1.ebuild
index 3d25c60f4f00..e5738276b232 100644
--- a/app-editors/mp/mp-5.1.1.ebuild
+++ b/app-editors/mp/mp-5.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.6 2010/06/20 16:18:13 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.1.ebuild,v 1.7 2010/07/05 16:40:17 jlec Exp $
 
 EAPI="3"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Minimum Profit: A text editor for programmers"
 HOMEPAGE="http://www.triptico.com/software/mp.html"
@@ -53,6 +53,7 @@ src_configure() {
 		echo ${LDFLAGS} >> $i/config.ldflags
 	done
 
+	tc-export CC
 	sh config.sh ${myconf} || die "Configure failed"
 }
 
diff --git a/app-editors/mp/mp-5.1.3.ebuild b/app-editors/mp/mp-5.1.3.ebuild
new file mode 100644
index 000000000000..3a6c20b10dbe
--- /dev/null
+++ b/app-editors/mp/mp-5.1.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mp/mp-5.1.3.ebuild,v 1.1 2010/07/05 16:40:17 jlec Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Minimum Profit: A text editor for programmers"
+HOMEPAGE="http://www.triptico.com/software/mp.html"
+SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="gtk iconv kde ncurses nls pcre qt4"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses )
+	gtk? ( >=x11-libs/gtk+-2 >=x11-libs/pango-1.8.0 )
+	!gtk? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )
+	pcre? ( dev-libs/libpcre )
+	iconv? ( virtual/libiconv )
+	app-text/grutatxt"
+DEPEND="${RDEPEND}
+	app-text/grutatxt
+	dev-util/pkgconfig
+	dev-lang/perl"
+
+src_prepare() {
+	# fix force as-needed wrt bug #278086
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+}
+
+src_configure() {
+	local myconf="--prefix=${EPREFIX}/usr --without-win32"
+
+	if use gtk; then
+		! use ncurses && myconf="${myconf} --without-curses"
+	else
+		myconf="${myconf} --without-gtk2"
+	fi
+
+	use iconv || myconf="${myconf} --without-iconv"
+
+	use kde || myconf="${myconf} --without-kde4"
+
+	use nls || myconfig="${myconf} --without-gettext"
+
+	myconf="${myconf} $(use_with pcre)"
+	use pcre || myconf="${myconf} --with-included-regex"
+
+	use qt4 || myconf="${myconf} --without-qt4"
+
+	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
+		echo ${CFLAGS} >> $i/config.cflags
+		echo ${LDFLAGS} >> $i/config.ldflags
+	done
+
+	tc-export CC
+	sh config.sh ${myconf} || die "Configure failed"
+}
+
+src_install() {
+	dodir /usr/bin
+	sh config.sh --prefix="${EPREFIX}/usr"
+	make DESTDIR="${D}" install || die "Install Failed"
+#	use gtk && dosym mp-5 /usr/bin/gmp
+}
+
+pkg_postinst() {
+	if use gtk ; then
+		einfo
+		einfo "mp-5 is symlinked to gmp! Use"
+		einfo "$ DISPLAY=\"\" mp-5"
+		einfo "to use text mode!"
+		einfo
+	fi
+}