commit: 561b37f68e80a70747ead395c9a5312c522c174e Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Wed Dec 13 09:02:17 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Dec 13 09:03:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=561b37f6
dev-util/astyle: remove old Package-Manager: Portage-2.3.14, Repoman-2.3.6 dev-util/astyle/Manifest | 4 - dev-util/astyle/astyle-2.04-r1.ebuild | 66 ----------------- dev-util/astyle/astyle-2.05.1.ebuild | 64 ---------------- dev-util/astyle/astyle-2.06.ebuild | 64 ---------------- dev-util/astyle/astyle-3.0.ebuild | 85 ---------------------- .../astyle/files/astyle-2.02.1-build_system.patch | 54 -------------- .../astyle/files/astyle-2.05.1-build_system.patch | 56 -------------- 7 files changed, 393 deletions(-) diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest index 5ab5f61fc1e..7ac39e21069 100644 --- a/dev-util/astyle/Manifest +++ b/dev-util/astyle/Manifest @@ -1,5 +1 @@ -DIST astyle_2.04_linux.tar.gz 156974 BLAKE2B 44ecccf30c1d43f53fb8077477341eee19cf830c5abe373f6819e6f6732b4e0b1247cbcf38b74a4a8f73f839ea4c57501f5d5efee07e71585afa8596fc68cf4e SHA512 bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd -DIST astyle_2.05.1_linux.tar.gz 152765 BLAKE2B d69dc1ed854d122743e91516b74261a4ae2b9bc91ed5eb19fb1052694ea1f9cf02cb6d9aad2b0ebe354b47d2fdab2394728f7992bd6aa7db02cbfeb79faba7aa SHA512 853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495 -DIST astyle_2.06_linux.tar.gz 162037 BLAKE2B 73041aad20a1e919c7809711e2be06f671a001370835234fbd087d905a880be2c362cc767439eb5203d9f003df9c323dbd66cfe6fa525c0de3979ed569c114b8 SHA512 e2da96b45d06385b284ed3107309dfa4fad904910a729232bdb8554b40332a673d33e1f153ffb2ebb0342c73098b79980628678be9dde45a4d4d23237fe8a8c5 DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158 -DIST astyle_3.0_linux.tar.gz 172303 BLAKE2B a89cf52019fcdd8e7954533804c0fa9b9f63802e4e5cb610f539a0187c251680c6c0971293c3ea20b0b9ebb8d3548011ffefe307e281a215db0ea29aa7da6700 SHA512 77ef75139b08a91829373558753d78a3253f23a2a53a81f591d8877ba31b9a5163fbe8453894366aebbe287051259a568e725ee3b5e68d8ed4852a12d7798f9d diff --git a/dev-util/astyle/astyle-2.04-r1.ebuild b/dev-util/astyle/astyle-2.04-r1.ebuild deleted file mode 100644 index 0e5f5d5dfe7..00000000000 --- a/dev-util/astyle/astyle-2.04-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils java-pkg-opt-2 multilib toolchain-funcs - -DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code" -HOMEPAGE="http://astyle.sourceforge.net/"; -SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -IUSE="doc java static-libs" - -DEPEND="app-arch/xz-utils - java? ( >=virtual/jdk-1.6:= )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - tc-export CXX -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.02.1-build_system.patch - java-pkg-opt-2_src_prepare - sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \ - -e "s:ar crs:$(tc-getAR) crs:" \ - -i build/gcc/Makefile || die -} - -src_compile() { - emake -f ../build/gcc/Makefile -C src \ - ${PN} \ - shared \ - $(usex java java '') \ - $(usex static-libs static '') -} - -src_install() { - insinto /usr/include - doins src/${PN}.h - - pushd src/bin &> /dev/null - dobin ${PN} - - dolib.so lib${PN}.so.0.0.0 - dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0 - dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so - if use java ; then - dolib.so lib${PN}j.so.0.0.0 - dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0 - dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so - fi - if use static-libs ; then - dolib lib${PN}.a - fi - popd &> /dev/null - - use doc && dohtml doc/* -} diff --git a/dev-util/astyle/astyle-2.05.1.ebuild b/dev-util/astyle/astyle-2.05.1.ebuild deleted file mode 100644 index d0921eb8842..00000000000 --- a/dev-util/astyle/astyle-2.05.1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils java-pkg-opt-2 multilib toolchain-funcs - -DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code" -HOMEPAGE="http://astyle.sourceforge.net/"; -SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -IUSE="doc java static-libs" - -DEPEND="app-arch/xz-utils - java? ( >=virtual/jdk-1.6:= )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - tc-export CXX -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-build_system.patch - java-pkg-opt-2_src_prepare - sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \ - -e "s:ar crs:$(tc-getAR) crs:" \ - -i build/gcc/Makefile || die -} - -src_compile() { - emake -f ../build/gcc/Makefile -C src \ - ${PN} \ - shared \ - $(usex java java '') \ - $(usex static-libs static '') -} - -src_install() { - insinto /usr/include - doins src/${PN}.h - - pushd src/bin &> /dev/null - dobin ${PN} - - dolib.so lib${P}.so - dosym lib${P}.so /usr/$(get_libdir)/lib${PN}.so - if use java ; then - dolib.so lib${P}j.so - dosym lib${P}j.so /usr/$(get_libdir)/lib${PN}j.so - fi - if use static-libs ; then - dolib lib${PN}.a - fi - popd &> /dev/null - - use doc && dohtml doc/* -} diff --git a/dev-util/astyle/astyle-2.06.ebuild b/dev-util/astyle/astyle-2.06.ebuild deleted file mode 100644 index 70a8f8a5969..00000000000 --- a/dev-util/astyle/astyle-2.06.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils java-pkg-opt-2 multilib toolchain-funcs - -DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code" -HOMEPAGE="http://astyle.sourceforge.net/"; -SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" - -IUSE="doc java static-libs" - -DEPEND="app-arch/xz-utils - java? ( >=virtual/jdk-1.6:= )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${PN} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - tc-export CXX -} - -src_prepare() { - eapply_user - java-pkg-opt-2_src_prepare - sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \ - -e "s:ar crs:$(tc-getAR) crs:" \ - -i build/gcc/Makefile || die -} - -src_compile() { - emake -f ../build/gcc/Makefile -C src \ - ${PN} \ - shared \ - $(usex java java '') \ - $(usex static-libs static '') -} - -src_install() { - insinto /usr/include - doins src/${PN}.h - - pushd src/bin &> /dev/null - dobin ${PN} - - dolib.so lib${P}.so - dosym lib${P}.so /usr/$(get_libdir)/lib${PN}.so - if use java ; then - dolib.so lib${P}j.so - dosym lib${P}j.so /usr/$(get_libdir)/lib${PN}j.so - fi - if use static-libs ; then - dolib lib${PN}.a - fi - popd &> /dev/null - - use doc && dohtml doc/* -} diff --git a/dev-util/astyle/astyle-3.0.ebuild b/dev-util/astyle/astyle-3.0.ebuild deleted file mode 100644 index 85544bdc8bb..00000000000 --- a/dev-util/astyle/astyle-3.0.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic toolchain-funcs versionator java-pkg-opt-2 - -DESCRIPTION="Artistic Style is a re-indenter and reformatter for C++, C and Java source code" -HOMEPAGE="http://astyle.sourceforge.net/"; -SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="examples java static-libs" - -DEPEND="app-arch/xz-utils - java? ( >=virtual/jdk-1.6:= )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${PN}" - -src_prepare() { - if use java ; then - java-pkg-opt-2_src_prepare - sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \ - -e "s:ar crs:$(tc-getAR) crs:" \ - -i build/gcc/Makefile || die - else - default - fi -} - -src_configure() { - append-cxxflags -std=c++11 - tc-export CXX - default -} - -src_compile() { - # ../build/clang/Makefile is identical except for CXX line. - emake CXX="$(tc-getCXX)" -f ../build/gcc/Makefile -C src \ - ${PN} \ - shared \ - $(usev java) \ - $(usex static-libs static '') -} - -src_install() { - doheader src/${PN}.h - - pushd src/bin >/dev/null || die - dobin ${PN} - - # ex: libastyle.so.3.0.0 - dolib.so lib${PN}.so.${PV}.0 - # ex: libastyle.so.3 - dosym lib${PN}.so.${PV}.0 /usr/$(get_libdir)/lib${PN}.so.$(get_major_version) - if use java ; then - dolib.so lib${PN}j.so.${PV}.0 - dosym lib${PN}j.so.${PV}.0 /usr/$(get_libdir)/lib${PN}j.so.$(get_major_version) - fi - if use static-libs ; then - dolib lib${PN}.a - fi - popd >/dev/null || die - if use examples ; then - docinto examples - dodoc -r file/. - docompress -x /usr/share/doc/${PF}/examples - fi - local HTML_DOCS=( doc/. ) - einstalldocs -} - -pkg_postinst() { - if [[ -n "$REPLACING_VERSIONS" && "$(get_major_version $REPLACING_VERSIONS)" -lt 3 ]]; then - elog "Artistic Style 3.0 introduces new configuration verbiage more fitting" - elog "for modern use. Some options that were valid in 2.06 or older are now" - elog "deprecated. For more information, consult astyle's release notes at" - elog "http://astyle.sourceforge.net/news.html. To view offline, see:" - elog - elog "${ROOT}usr/share/doc/${P}/html" - fi -} diff --git a/dev-util/astyle/files/astyle-2.02.1-build_system.patch b/dev-util/astyle/files/astyle-2.02.1-build_system.patch deleted file mode 100644 index 1d63a512e9b..00000000000 --- a/dev-util/astyle/files/astyle-2.02.1-build_system.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/build/gcc/Makefile -+++ b/build/gcc/Makefile -@@ -34,25 +34,25 @@ - ipath=$(prefix)/bin - CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions - JAVAINCS = -I$(JAVA_HOME)/include --CXX = g++ -+CXX ?= g++ - INSTALL=install -o $(USER) -g $(USER) - - ################################################## - - # define compile options for each build --ifdef CFLAGS -- CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CFLAGS) -- CFLAGSd = -g $(CBASEFLAGS) $(CFLAGS) -+ifdef CXXFLAGS -+ CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CXXFLAGS) -+ CFLAGSd = -g $(CBASEFLAGS) $(CXXFLAGS) - else - CFLAGSr = -DNDEBUG -O3 $(CBASEFLAGS) - CFLAGSd = -g $(CBASEFLAGS) - endif --CFLAGSs = -DASTYLE_LIB -fpic $(CFLAGSr) --CFLAGSsd = -DASTYLE_LIB -fpic $(CFLAGSd) -+CFLAGSs = -DASTYLE_LIB -fPIC $(CFLAGSr) -+CFLAGSsd = -DASTYLE_LIB -fPIC $(CFLAGSd) - CFLAGSa = -DASTYLE_LIB $(CFLAGSr) - CFLAGSad = -DASTYLE_LIB $(CFLAGSd) --CFLAGSsj = -DASTYLE_JNI -fpic $(CFLAGSr) $(JAVAINCS) --CFLAGSsjd = -DASTYLE_JNI -fpic $(CFLAGSd) $(JAVAINCS) -+CFLAGSsj = -DASTYLE_JNI -fPIC $(CFLAGSr) $(JAVAINCS) -+CFLAGSsjd = -DASTYLE_JNI -fPIC $(CFLAGSd) $(JAVAINCS) - - # define link options - ifdef LDFLAGS -@@ -134,7 +134,7 @@ - shared: libastyle.so - libastyle.so: $(OBJs) - @ mkdir -p $(bindir) -- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ -+ $(CXX) -shared -Wl,-soname,[email protected] $(LDFLAGSr) -o $(bindir)/[email protected] $^ - @ echo - - shareddebug: libastyled.so -@@ -158,7 +158,7 @@ - java: libastylej.so - libastylej.so: $(OBJsj) - @ mkdir -p $(bindir) -- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ -+ $(CXX) -shared -Wl,-soname,[email protected] $(LDFLAGSr) -o $(bindir)/[email protected] $^ - @ echo - - javadebug: libastylejd.so diff --git a/dev-util/astyle/files/astyle-2.05.1-build_system.patch b/dev-util/astyle/files/astyle-2.05.1-build_system.patch deleted file mode 100644 index 23554499c79..00000000000 --- a/dev-util/astyle/files/astyle-2.05.1-build_system.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/build/gcc/Makefile b/build/gcc/Makefile -index b1af4c1..1dfa021 100755 ---- a/build/gcc/Makefile -+++ b/build/gcc/Makefile -@@ -34,15 +34,15 @@ objdir = obj - ipath=$(prefix)/bin - CBASEFLAGS = -W -Wall -fno-rtti -fno-exceptions - JAVAINCS = -I$(JAVA_HOME)/include --CXX = g++ -+CXX ?= g++ - INSTALL=install -o $(USER) -g $(USER) - - ################################################## - - # define compile options for each build --ifdef CFLAGS -- CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CFLAGS) -- CFLAGSd = -g $(CBASEFLAGS) $(CFLAGS) -+ifdef CXXFLAGS -+ CFLAGSr = -DNDEBUG $(CBASEFLAGS) $(CXXFLAGS) -+ CFLAGSd = -g $(CBASEFLAGS) $(CXXFLAGS) - else - CFLAGSr = -DNDEBUG -O3 $(CBASEFLAGS) - CFLAGSd = -g $(CBASEFLAGS) -@@ -134,13 +134,13 @@ astyled: $(OBJd) - shared: libastyle-2.05.1.so - libastyle-2.05.1.so: $(OBJs) - @ mkdir -p $(bindir) -- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ -+ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ - @ echo - - shareddebug: libastyle-2.05.1d.so - libastyle-2.05.1d.so: $(OBJsd) - @ mkdir -p $(bindir) -- $(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^ -+ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ - @ echo - - static: libastyle.a -@@ -158,13 +158,13 @@ libastyled.a: $(OBJad) - java: libastyle-2.05.1j.so - libastyle-2.05.1j.so: $(OBJsj) - @ mkdir -p $(bindir) -- $(CXX) -shared $(LDFLAGSr) -o $(bindir)/$@ $^ -+ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ - @ echo - - javadebug: libastyle-2.05.1jd.so - libastyle-2.05.1jd.so: $(OBJsjd) - @ mkdir -p $(bindir) -- $(CXX) -shared $(LDFLAGSd) -o $(bindir)/$@ $^ -+ $(CXX) -shared -Wl,-soname,$@ $(LDFLAGSr) -o $(bindir)/$@ $^ - @ echo - - all: release debug shared shareddebug static staticdebug
